diff --git a/src/porchlight/admin/routes.py b/src/porchlight/admin/routes.py index 931dc6e..ef445c9 100644 --- a/src/porchlight/admin/routes.py +++ b/src/porchlight/admin/routes.py @@ -116,9 +116,7 @@ async def create_invite( magic_link_service = request.app.state.magic_link_service settings = request.app.state.settings - link = await magic_link_service.create( - username=validated.username, created_by=admin.username, note="admin invite" - ) + link = await magic_link_service.create(username=validated.username, created_by=admin.username, note="admin invite") url = f"{settings.issuer}/register/{link.token}" return HTMLResponse( diff --git a/src/porchlight/app.py b/src/porchlight/app.py index 82fc285..f0fb27e 100644 --- a/src/porchlight/app.py +++ b/src/porchlight/app.py @@ -20,10 +20,10 @@ from porchlight.authn.webauthn import WebAuthnService from porchlight.config import Settings, StorageBackend from porchlight.csrf import CSRFMiddleware, generate_csrf_token from porchlight.invite.service import MagicLinkService -from porchlight.rate_limit import limiter from porchlight.manage.routes import router as manage_router from porchlight.oidc.endpoints import router as oidc_router from porchlight.oidc.provider import create_oidc_server +from porchlight.rate_limit import limiter from porchlight.store.sqlite.db import open_db from porchlight.store.sqlite.repositories import ( SQLiteConsentRepository, diff --git a/tests/test_admin_groups_validation.py b/tests/test_admin_groups_validation.py index 9d4a602..ff662e9 100644 --- a/tests/test_admin_groups_validation.py +++ b/tests/test_admin_groups_validation.py @@ -5,7 +5,6 @@ from httpx import AsyncClient from porchlight.authn.password import PasswordHasher, PasswordService from porchlight.models import PasswordCredential, User - from tests.conftest import get_csrf_token @@ -34,9 +33,7 @@ async def _setup_admin_and_target(client: AsyncClient) -> tuple[str, str]: await user_repo.create(target) svc = PasswordService(hasher=PasswordHasher(time_cost=1, memory_cost=8192)) - await cred_repo.create_password( - PasswordCredential(user_id=admin.userid, password_hash=svc.hash("AdminPass123!")) - ) + await cred_repo.create_password(PasswordCredential(user_id=admin.userid, password_hash=svc.hash("AdminPass123!"))) token = await get_csrf_token(client) await client.post( diff --git a/tests/test_admin_invite_validation.py b/tests/test_admin_invite_validation.py index 16cb5e6..6bf1b68 100644 --- a/tests/test_admin_invite_validation.py +++ b/tests/test_admin_invite_validation.py @@ -5,7 +5,6 @@ from httpx import AsyncClient from porchlight.authn.password import PasswordHasher, PasswordService from porchlight.models import PasswordCredential, User - from tests.conftest import get_csrf_token @@ -25,9 +24,7 @@ async def _login_admin(client: AsyncClient) -> str: await user_repo.create(user) svc = PasswordService(hasher=PasswordHasher(time_cost=1, memory_cost=8192)) - await cred_repo.create_password( - PasswordCredential(user_id=user.userid, password_hash=svc.hash("AdminPass123!")) - ) + await cred_repo.create_password(PasswordCredential(user_id=user.userid, password_hash=svc.hash("AdminPass123!"))) token = await get_csrf_token(client) await client.post( diff --git a/tests/test_authn_active.py b/tests/test_authn_active.py index 71329b8..3564bb5 100644 --- a/tests/test_authn_active.py +++ b/tests/test_authn_active.py @@ -5,7 +5,6 @@ from httpx import AsyncClient from porchlight.authn.password import PasswordHasher, PasswordService from porchlight.models import PasswordCredential, User - from tests.conftest import get_csrf_token @@ -60,9 +59,7 @@ async def test_inactive_user_cannot_register_magic_link(client: AsyncClient) -> ) await user_repo.create(user) - link = await magic_link_service.create( - username="deactivated", created_by="admin", note="test" - ) + link = await magic_link_service.create(username="deactivated", created_by="admin", note="test") response = await client.get(f"/register/{link.token}", follow_redirects=False) diff --git a/tests/test_password_change.py b/tests/test_password_change.py index d887b75..ea8b672 100644 --- a/tests/test_password_change.py +++ b/tests/test_password_change.py @@ -5,7 +5,6 @@ from httpx import AsyncClient from porchlight.authn.password import PasswordHasher, PasswordService from porchlight.models import PasswordCredential, User - from tests.conftest import get_csrf_token @@ -24,9 +23,7 @@ async def _login_user_with_password(client: AsyncClient) -> str: await user_repo.create(user) svc = PasswordService(hasher=PasswordHasher(time_cost=1, memory_cost=8192)) - await cred_repo.create_password( - PasswordCredential(user_id=user.userid, password_hash=svc.hash("OldPass123!ok")) - ) + await cred_repo.create_password(PasswordCredential(user_id=user.userid, password_hash=svc.hash("OldPass123!ok"))) token = await get_csrf_token(client) await client.post(