Private
Public Access
ksmithandClaude Sonnet 5
4aa8ef89c5
Adds is_site_admin-gated site administration: user management (list, deactivate/reactivate, reset password, promote/demote), room management (list all rooms including private ones, archive/unarchive, force-transfer ownership), and an audit log of every admin action. Backend: User.is_active (deactivation) and Room.is_archived (archive) are new columns; AdminAuditLog is a new table matching ARCHITECTURE.md's admin_audit_log design, written to in the same transaction as every mutating admin action. require_site_admin (dependencies.py) gates all /api/admin/* routes. get_current_user now rechecks is_active on every request, so deactivating a user kills their already-open session immediately, not just future logins. An admin can't deactivate or demote their own account (the one self-lockout guard included). Archived rooms drop out of the open-room browse list but stay readable for existing members. Frontend: new /admin route (AdminRoute guard, redirects non-admins to /rooms) with a tabbed Users / Rooms / Audit log / Settings page, plus an "Admin" link in the account menu for site admins. Bot/integration management and system settings -- both listed in the original issue -- are intentionally not here: bot management has nothing to manage until Phase 7 builds the actual bot data model, and there's no settings storage or concrete setting to configure yet. Settings has an empty placeholder tab; bot management is deferred entirely to Phase 7. Confirmed this scope cut with the repo owner before implementing. New tests/test_admin.py (14 tests, full suite now 58/58) covers every admin endpoint's permission gate, the self-action guards, deactivation's immediate effect on an already-open session, and that every mutating action produces exactly one audit log row. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
53 lines
1.3 KiB
Python
53 lines
1.3 KiB
Python
from sqlalchemy import or_, select
|
|
from sqlalchemy.exc import IntegrityError
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.models import User
|
|
from app.schemas.user import UserCreate
|
|
from app.security import hash_password, verify_password
|
|
|
|
|
|
class DuplicateUserError(Exception):
|
|
pass
|
|
|
|
|
|
class InvalidCredentialsError(Exception):
|
|
pass
|
|
|
|
|
|
class AccountDeactivatedError(Exception):
|
|
pass
|
|
|
|
|
|
async def register_user(db: AsyncSession, data: UserCreate) -> User:
|
|
user = User(
|
|
username=data.username,
|
|
email=data.email,
|
|
password_hash=hash_password(data.password),
|
|
)
|
|
db.add(user)
|
|
try:
|
|
await db.commit()
|
|
except IntegrityError as exc:
|
|
await db.rollback()
|
|
raise DuplicateUserError() from exc
|
|
|
|
await db.refresh(user)
|
|
return user
|
|
|
|
|
|
async def authenticate_user(
|
|
db: AsyncSession, username_or_email: str, password: str
|
|
) -> User:
|
|
result = await db.execute(
|
|
select(User).where(
|
|
or_(User.username == username_or_email, User.email == username_or_email)
|
|
)
|
|
)
|
|
user = result.scalar_one_or_none()
|
|
if user is None or not verify_password(password, user.password_hash):
|
|
raise InvalidCredentialsError()
|
|
if not user.is_active:
|
|
raise AccountDeactivatedError()
|
|
return user
|