fix: resolve all ruff lint errors and type checker warnings
- Use Annotated[str, Form()] for FastAPI dependencies (FAST002) - Add missing type annotations across src/ and tests/ (ANN001/003/201/202) - Reduce function arguments via request.form() reads (PLR0913) - Combine return paths to reduce return statements (PLR0911) - Use anyio.Path for async-safe filesystem operations (ASYNC240) - Extract constants, helpers, and dict comprehensions for clarity - Move inline imports to top-level (PLC0415) - Use raw strings for regex match patterns (RUF043) - Fix redundant get_session_user call in delete_user (not-iterable) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Johan Lundberg
parent
2b652ff603
commit
01e3382aaf
23 changed files with 258 additions and 214 deletions
|
|
@ -24,6 +24,107 @@ from porchlight.store.sqlite.repositories import (
|
|||
)
|
||||
|
||||
|
||||
async def _create_user_with_password(
|
||||
user_repo: SQLiteUserRepository,
|
||||
cred_repo: SQLiteCredentialRepository,
|
||||
password_service: PasswordService,
|
||||
user: User,
|
||||
password: str,
|
||||
) -> None:
|
||||
"""Helper to create a user and set their password credential."""
|
||||
await user_repo.create(user)
|
||||
password_hash = password_service.hash(password)
|
||||
await cred_repo.create_password(PasswordCredential(user_id=user.userid, password_hash=password_hash))
|
||||
|
||||
|
||||
async def _seed_test_users(
|
||||
user_repo: SQLiteUserRepository,
|
||||
cred_repo: SQLiteCredentialRepository,
|
||||
password_service: PasswordService,
|
||||
result: dict[str, str],
|
||||
) -> None:
|
||||
"""Create all test users with passwords."""
|
||||
# Login test user
|
||||
await _create_user_with_password(
|
||||
user_repo,
|
||||
cred_repo,
|
||||
password_service,
|
||||
User(userid="test-user-01", username="testuser", groups=["users"]),
|
||||
"testpassword123",
|
||||
)
|
||||
result["login_username"] = "testuser"
|
||||
result["login_password"] = "testpassword123"
|
||||
|
||||
# Credentials management test user
|
||||
await _create_user_with_password(
|
||||
user_repo,
|
||||
cred_repo,
|
||||
password_service,
|
||||
User(userid="test-user-02", username="creduser", groups=["users"]),
|
||||
"credpassword123",
|
||||
)
|
||||
result["cred_username"] = "creduser"
|
||||
result["cred_password"] = "credpassword123"
|
||||
|
||||
# WebAuthn registration test user
|
||||
await _create_user_with_password(
|
||||
user_repo,
|
||||
cred_repo,
|
||||
password_service,
|
||||
User(userid="test-user-03", username="webauthnuser", groups=["users"]),
|
||||
"webauthnpass123",
|
||||
)
|
||||
result["webauthn_username"] = "webauthnuser"
|
||||
result["webauthn_password"] = "webauthnpass123"
|
||||
result["webauthn_userid"] = "test-user-03"
|
||||
|
||||
# Profile management test user
|
||||
await _create_user_with_password(
|
||||
user_repo,
|
||||
cred_repo,
|
||||
password_service,
|
||||
User(
|
||||
userid="test-user-04",
|
||||
username="profileuser",
|
||||
given_name="Alice",
|
||||
family_name="Smith",
|
||||
preferred_username="asmith",
|
||||
email="alice@example.com",
|
||||
phone_number="+12025551234",
|
||||
picture="https://example.com/alice.jpg",
|
||||
locale="en",
|
||||
groups=["users"],
|
||||
),
|
||||
"profilepass123",
|
||||
)
|
||||
result["profile_username"] = "profileuser"
|
||||
result["profile_password"] = "profilepass123"
|
||||
|
||||
# Admin user for admin page tests
|
||||
await _create_user_with_password(
|
||||
user_repo,
|
||||
cred_repo,
|
||||
password_service,
|
||||
User(
|
||||
userid="test-user-05",
|
||||
username="adminuser",
|
||||
given_name="Admin",
|
||||
family_name="User",
|
||||
email="admin@example.com",
|
||||
groups=["admin", "users"],
|
||||
),
|
||||
"adminpass123",
|
||||
)
|
||||
result["admin_username"] = "adminuser"
|
||||
result["admin_password"] = "adminpass123"
|
||||
result["admin_userid"] = "test-user-05"
|
||||
|
||||
# Disposable user for admin delete test
|
||||
await user_repo.create(User(userid="test-user-06", username="disposableuser", groups=["users"]))
|
||||
result["disposable_userid"] = "test-user-06"
|
||||
result["disposable_username"] = "disposableuser"
|
||||
|
||||
|
||||
async def seed() -> None:
|
||||
db_path = os.environ.get("OIDC_OP_SQLITE_PATH")
|
||||
if not db_path:
|
||||
|
|
@ -39,89 +140,21 @@ async def seed() -> None:
|
|||
password_service = PasswordService()
|
||||
magic_link_service = MagicLinkService(repo=magic_link_repo)
|
||||
|
||||
result = {}
|
||||
result: dict[str, str] = {}
|
||||
|
||||
# 1. Create a magic link for registration test
|
||||
# Create magic link for registration test
|
||||
link = await magic_link_service.create(username="newuser")
|
||||
result["register_token"] = link.token
|
||||
result["register_username"] = "newuser"
|
||||
|
||||
# 2. Create a user with a password for login test
|
||||
user = User(userid="test-user-01", username="testuser", groups=["users"])
|
||||
await user_repo.create(user)
|
||||
password_hash = password_service.hash("testpassword123")
|
||||
await cred_repo.create_password(PasswordCredential(user_id=user.userid, password_hash=password_hash))
|
||||
result["login_username"] = "testuser"
|
||||
result["login_password"] = "testpassword123"
|
||||
# Create all test users
|
||||
await _seed_test_users(user_repo, cred_repo, password_service, result)
|
||||
|
||||
# 3. Create a separate user for credentials management test
|
||||
cred_user = User(userid="test-user-02", username="creduser", groups=["users"])
|
||||
await user_repo.create(cred_user)
|
||||
cred_password_hash = password_service.hash("credpassword123")
|
||||
await cred_repo.create_password(PasswordCredential(user_id=cred_user.userid, password_hash=cred_password_hash))
|
||||
result["cred_username"] = "creduser"
|
||||
result["cred_password"] = "credpassword123"
|
||||
|
||||
# 5. Create a user with password for WebAuthn registration tests
|
||||
# (login with password first, then register a passkey)
|
||||
webauthn_user = User(userid="test-user-03", username="webauthnuser", groups=["users"])
|
||||
await user_repo.create(webauthn_user)
|
||||
webauthn_password_hash = password_service.hash("webauthnpass123")
|
||||
await cred_repo.create_password(
|
||||
PasswordCredential(user_id=webauthn_user.userid, password_hash=webauthn_password_hash)
|
||||
)
|
||||
result["webauthn_username"] = "webauthnuser"
|
||||
result["webauthn_password"] = "webauthnpass123"
|
||||
result["webauthn_userid"] = "test-user-03"
|
||||
|
||||
# 4. Create an expired/used magic link for negative test
|
||||
# Create an expired/used magic link for negative test
|
||||
expired_link = await magic_link_service.create(username="expired")
|
||||
await magic_link_service.mark_used(expired_link.token)
|
||||
result["used_token"] = expired_link.token
|
||||
|
||||
# 5. Create a user with profile data for profile management tests
|
||||
profile_user = User(
|
||||
userid="test-user-04",
|
||||
username="profileuser",
|
||||
given_name="Alice",
|
||||
family_name="Smith",
|
||||
preferred_username="asmith",
|
||||
email="alice@example.com",
|
||||
phone_number="+12025551234",
|
||||
picture="https://example.com/alice.jpg",
|
||||
locale="en",
|
||||
groups=["users"],
|
||||
)
|
||||
await user_repo.create(profile_user)
|
||||
profile_password_hash = password_service.hash("profilepass123")
|
||||
await cred_repo.create_password(
|
||||
PasswordCredential(user_id=profile_user.userid, password_hash=profile_password_hash)
|
||||
)
|
||||
result["profile_username"] = "profileuser"
|
||||
result["profile_password"] = "profilepass123"
|
||||
|
||||
# 6. Admin user for admin page tests
|
||||
admin_user = User(
|
||||
userid="test-user-05",
|
||||
username="adminuser",
|
||||
given_name="Admin",
|
||||
family_name="User",
|
||||
email="admin@example.com",
|
||||
groups=["admin", "users"],
|
||||
)
|
||||
await user_repo.create(admin_user)
|
||||
admin_password_hash = password_service.hash("adminpass123")
|
||||
await cred_repo.create_password(PasswordCredential(user_id=admin_user.userid, password_hash=admin_password_hash))
|
||||
result["admin_username"] = "adminuser"
|
||||
result["admin_password"] = "adminpass123"
|
||||
result["admin_userid"] = "test-user-05"
|
||||
|
||||
# 7. Disposable user for admin delete test (not used by any other tests)
|
||||
disposable_user = User(userid="test-user-06", username="disposableuser", groups=["users"])
|
||||
await user_repo.create(disposable_user)
|
||||
result["disposable_userid"] = "test-user-06"
|
||||
result["disposable_username"] = "disposableuser"
|
||||
|
||||
await db.commit()
|
||||
await db.close()
|
||||
print(json.dumps(result))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue