fix(auth): only block bootstrap login when admin users exist
The previous check counted ALL users (func.count(User.id)), which incorrectly blocked bootstrap login if any non-admin user (e.g., Google OAuth sign-in) already existed. The fix queries specifically for admin users using the legacy is_admin flag OR the admin role assignment in user_roles. Also add tests for the non-admin-user-only scenario and fix the stale test_non_admin_user_cannot_login_as_admin assertion (401 not 403 — bootstrap path is still active when no admin exists).
This commit is contained in:
@@ -115,6 +115,21 @@ async def db_with_non_admin_user():
|
||||
yield
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
async def db_with_google_user_only():
|
||||
"""Seed the DB with a non-admin Google OAuth user (no admin users)."""
|
||||
async with async_session() as session:
|
||||
user = User(
|
||||
email="john@gmail.com",
|
||||
display_name="John",
|
||||
auth_provider="google",
|
||||
is_admin=False,
|
||||
)
|
||||
session.add(user)
|
||||
await session.commit()
|
||||
yield
|
||||
|
||||
|
||||
class TestBootstrapLoginNoAdmins:
|
||||
"""Scenario 1: Login with hardcoded creds when NO admins exist → PASS."""
|
||||
|
||||
@@ -293,8 +308,8 @@ class TestEdgeCases:
|
||||
"/api/auth/login",
|
||||
json={"username": "regular", "password": "regularpass"},
|
||||
)
|
||||
# Non-admin users should be rejected
|
||||
assert resp.status_code == 403
|
||||
# Non-admin users should be rejected — bootstrap path is active since no admin exists
|
||||
assert resp.status_code == 401
|
||||
|
||||
async def test_user_lookup_by_display_name(self, db_with_admin_different_password):
|
||||
"""Login should work when username matches display_name."""
|
||||
@@ -353,6 +368,52 @@ class TestEdgeCases:
|
||||
assert verify_password("testpass123", user.password_hash)
|
||||
|
||||
|
||||
class TestBootstrapWithNonAdminUsers:
|
||||
"""Bootstrap login should still work when only non-admin users exist."""
|
||||
|
||||
async def test_bootstrap_login_works_when_google_users_exist(self, db_with_google_user_only):
|
||||
"""Bootstrap credentials should work even if non-admin Google users exist."""
|
||||
transport = ASGITransport(app=app)
|
||||
async with AsyncClient(transport=transport, base_url="http://test") as client:
|
||||
resp = await client.post(
|
||||
"/api/auth/login",
|
||||
json={"username": "testadmin", "password": "testpass123"},
|
||||
)
|
||||
assert resp.status_code == 200
|
||||
data = resp.json()
|
||||
assert "access_token" in data
|
||||
|
||||
async def test_bootstrap_creates_admin_when_google_users_exist(self, db_with_google_user_only):
|
||||
"""After bootstrap login with existing non-admin users, the admin user should exist."""
|
||||
transport = ASGITransport(app=app)
|
||||
async with AsyncClient(transport=transport, base_url="http://test") as client:
|
||||
await client.post(
|
||||
"/api/auth/login",
|
||||
json={"username": "testadmin", "password": "testpass123"},
|
||||
)
|
||||
|
||||
from sqlalchemy import select as sa_select
|
||||
async with async_session() as session:
|
||||
# Admin user should have been created
|
||||
result = await session.execute(
|
||||
sa_select(User).where(
|
||||
User.email == "testadmin@local",
|
||||
User.auth_provider == "local",
|
||||
)
|
||||
)
|
||||
user = result.scalar_one_or_none()
|
||||
assert user is not None
|
||||
assert user.is_admin is True
|
||||
|
||||
# The original Google user should still exist and not be admin
|
||||
result = await session.execute(
|
||||
sa_select(User).where(User.email == "john@gmail.com")
|
||||
)
|
||||
google_user = result.scalar_one_or_none()
|
||||
assert google_user is not None
|
||||
assert google_user.is_admin is False
|
||||
|
||||
|
||||
class TestPasswordHashing:
|
||||
"""Unit tests for password hashing utilities."""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user