7a7daf8100
- 10 models: tenants, users, user_tenants, roles, sessions, audit_log, deletion_log, notifications, password_reset_tokens, api_tokens - Session-based auth (Redis + PostgreSQL audit trail) - Multi-tenant with ORM-level filtering + PostgreSQL RLS (set_config) - RBAC with roles/permissions + field-level permissions - CSRF protection via Origin header validation - Auth rate limiting (Redis counters with TTL) - CORS with explicit origins (no wildcard) - Health endpoint (no auth required) - Notification service + audit log middleware - 29 tests, 26 ACs, all passing - Coverage: 62% (infrastructure modules pending coverage in later tasks)
154 lines
4.1 KiB
Python
154 lines
4.1 KiB
Python
"""User management service."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import uuid
|
|
from typing import Any
|
|
|
|
from sqlalchemy import select, func, or_
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.core.auth import hash_password
|
|
from app.models.user import User, UserTenant
|
|
|
|
|
|
class UserService:
|
|
"""Handles user CRUD operations."""
|
|
|
|
async def list_users(
|
|
self,
|
|
db: AsyncSession,
|
|
tenant_id: uuid.UUID,
|
|
page: int = 1,
|
|
page_size: int = 25,
|
|
search: str | None = None,
|
|
) -> dict[str, Any]:
|
|
"""List users in a tenant with pagination and search."""
|
|
offset = (page - 1) * page_size
|
|
|
|
q = select(User).where(User.tenant_id == tenant_id)
|
|
count_q = select(func.count()).select_from(User).where(User.tenant_id == tenant_id)
|
|
|
|
if search:
|
|
search_filter = or_(
|
|
User.name.ilike(f"%{search}%"),
|
|
User.email.ilike(f"%{search}%"),
|
|
)
|
|
q = q.where(search_filter)
|
|
count_q = count_q.where(search_filter)
|
|
|
|
total = (await db.execute(count_q)).scalar() or 0
|
|
|
|
q = q.offset(offset).limit(page_size).order_by(User.created_at.desc())
|
|
result = await db.execute(q)
|
|
users = result.scalars().all()
|
|
|
|
return {
|
|
"items": [self._user_to_dict(u) for u in users],
|
|
"total": total,
|
|
"page": page,
|
|
"page_size": page_size,
|
|
}
|
|
|
|
async def get_user(
|
|
self,
|
|
db: AsyncSession,
|
|
tenant_id: uuid.UUID,
|
|
user_id: uuid.UUID,
|
|
) -> User | None:
|
|
"""Get a single user by ID within tenant scope."""
|
|
q = select(User).where(User.id == user_id, User.tenant_id == tenant_id)
|
|
result = await db.execute(q)
|
|
return result.scalar_one_or_none()
|
|
|
|
async def create_user(
|
|
self,
|
|
db: AsyncSession,
|
|
tenant_id: uuid.UUID,
|
|
email: str,
|
|
name: str,
|
|
password: str,
|
|
role: str = "viewer",
|
|
is_active: bool = True,
|
|
) -> User:
|
|
"""Create a new user in a tenant."""
|
|
user = User(
|
|
tenant_id=tenant_id,
|
|
email=email,
|
|
name=name,
|
|
password_hash=hash_password(password),
|
|
role=role,
|
|
is_active=is_active,
|
|
preferences={},
|
|
)
|
|
db.add(user)
|
|
await db.flush()
|
|
|
|
# Add user-tenant membership
|
|
ut = UserTenant(
|
|
user_id=user.id,
|
|
tenant_id=tenant_id,
|
|
is_default=True,
|
|
)
|
|
db.add(ut)
|
|
await db.flush()
|
|
|
|
return user
|
|
|
|
async def update_user(
|
|
self,
|
|
db: AsyncSession,
|
|
tenant_id: uuid.UUID,
|
|
user_id: uuid.UUID,
|
|
name: str | None = None,
|
|
role: str | None = None,
|
|
is_active: bool | None = None,
|
|
) -> User | None:
|
|
"""Update a user."""
|
|
q = select(User).where(User.id == user_id, User.tenant_id == tenant_id)
|
|
result = await db.execute(q)
|
|
user = result.scalar_one_or_none()
|
|
if user is None:
|
|
return None
|
|
|
|
if name is not None:
|
|
user.name = name
|
|
if role is not None:
|
|
user.role = role
|
|
if is_active is not None:
|
|
user.is_active = is_active
|
|
|
|
await db.flush()
|
|
return user
|
|
|
|
async def delete_user(
|
|
self,
|
|
db: AsyncSession,
|
|
tenant_id: uuid.UUID,
|
|
user_id: uuid.UUID,
|
|
) -> bool:
|
|
"""Delete a user from a tenant."""
|
|
q = select(User).where(User.id == user_id, User.tenant_id == tenant_id)
|
|
result = await db.execute(q)
|
|
user = result.scalar_one_or_none()
|
|
if user is None:
|
|
return False
|
|
|
|
await db.delete(user)
|
|
await db.flush()
|
|
return True
|
|
|
|
def _user_to_dict(self, user: User) -> dict[str, Any]:
|
|
"""Convert user to response dict."""
|
|
return {
|
|
"id": str(user.id),
|
|
"email": user.email,
|
|
"name": user.name,
|
|
"role": user.role,
|
|
"is_active": user.is_active,
|
|
"tenant_id": str(user.tenant_id),
|
|
}
|
|
|
|
|
|
user_service = UserService()
|