Merge pull request #78 from MicroClub-USTHB/feat/onboarding-gate-and-audit-fixes

feat: gate mobile endpoints behind face enrollment, fix jsonb round-trip

Author: wailbentafat

app/core/config.py

@@ -54,6 +54,9 @@ class Settings(BaseSettings):
     # Rate Limit Settings
     RATE_LIMIT_LOGIN_MAX_ATTEMPTS: int = 5
     RATE_LIMIT_LOGIN_WINDOW_SECONDS: int = 60
+    # In dev env, registration OTPs are fixed to this value and the email/NATS
+    # send is skipped, so mobile devs can verify without a real inbox.
+    DEV_OTP_BYPASS_CODE: str = "000000"
     TRUST_PROXY_HEADERS: bool = True
     # Admin list defaults
     ADMIN_USERS_DEFAULT_LIMIT: int = 20

app/deps/token_auth.py

@@ -114,3 +114,24 @@ async def get_current_mobile_user(
         email=user.email or "",
         session_id=session.id,
     )
+
+
+async def require_onboarded_mobile_user(
+    current_user: Annotated[MobileUserSchema, Depends(get_current_mobile_user)],
+    container: Annotated[Container, Depends(get_container)],
+) -> MobileUserSchema:
+    """Gate for endpoints that require a completed face enrollment.
+    Auth (login/me/devices/etc.), /enroll, and /event/join stay reachable
+    via plain get_current_mobile_user so a new user can always finish
+    onboarding; everything else (photos, notifications, audits, /event/me)
+    depends on this instead.
+    """
+    user = await container.auth_service.user_querier.get_user_by_id(id=current_user.user_id)
+    if user is None:
+        raise HTTPException(status_code=401, detail="User not found")
+    if user.face_embedding is None:
+        raise HTTPException(
+            status_code=403,
+            detail="Complete face enrollment before accessing this resource",
+        )
+    return current_user

app/infra/database.py

@@ -1,5 +1,8 @@
-from typing import AsyncGenerator
+import json
+from typing import Any, AsyncGenerator
+
 import sqlalchemy.ext.asyncio
+from sqlalchemy import event
 from app.core.config import settings
 
 
@@ -13,6 +16,27 @@
 )
 
 
+@event.listens_for(engine.sync_engine, "connect")
+def _register_jsonb_codec(dbapi_connection: Any, connection_record: Any) -> None:
+    # SQLAlchemy's asyncpg dialect doesn't forward connect_args={"init": ...}
+    # to asyncpg (it raises TypeError: unexpected keyword argument 'init'),
+    # so codec registration has to go through the wrapped connection's
+    # run_async bridge instead. Without this, asyncpg neither accepts a
+    # Python dict as a jsonb bind param (raises DataError) nor decodes a
+    # jsonb column back into one (returns raw JSON text) — every jsonb
+    # column in the schema (audit metadata, notification payloads) needs
+    # both directions to work.
+    dbapi_connection.run_async(
+        lambda conn: conn.set_type_codec(
+            "jsonb",
+            encoder=json.dumps,
+            decoder=json.loads,
+            schema="pg_catalog",
+            format="text",
+        )
+    )
+
+
 async def get_db() -> AsyncGenerator[sqlalchemy.ext.asyncio.AsyncConnection, None]:
     async with engine.begin() as conn:
         yield conn

app/router/mobile/audit.py

@@ -7,7 +7,7 @@
 
 from app.container import Container, get_container
 from app.core.constant import AuditEventType
-from app.deps.token_auth import MobileUserSchema, get_current_mobile_user
+from app.deps.token_auth import MobileUserSchema, require_onboarded_mobile_user
 from app.schema.response.mobile.audit import AuditEventListResponse, AuditEventSchema
 
 router = APIRouter(prefix="/audits", tags=["audits"])
@@ -22,7 +22,7 @@ async def list_audits(
     limit: int = Query(50, ge=1, le=200),
     offset: int = Query(0, ge=0),
     container: Container = Depends(get_container),
-    _: MobileUserSchema = Depends(get_current_mobile_user),
+    _: MobileUserSchema = Depends(require_onboarded_mobile_user),
 ) -> AuditEventListResponse:
     events = await container.audit_service.list_audit_events(
         event_type=event_type,

app/router/mobile/auth.py

@@ -206,6 +206,7 @@ async def get_me(
             email=user.email,
             name=user.display_name,
             avatar_url="/user/auth/me/avatar/image" if user.avatar_key else None,
+            is_onboarded=user.face_embedding is not None,
         ),
         devices=device_list,
         sessions=session_schema,
@@ -239,6 +240,7 @@ async def upload_avatar(
         email=user.email,
         name=user.display_name,
         avatar_url="/user/auth/me/avatar/image",
+        is_onboarded=user.face_embedding is not None,
     )
 
 

app/router/mobile/event.py

@@ -3,7 +3,7 @@
 from fastapi import APIRouter, Depends
 
 from app.container import Container, get_container
-from app.deps.token_auth import MobileUserSchema, get_current_mobile_user
+from app.deps.token_auth import MobileUserSchema, require_onboarded_mobile_user
 from app.schema.request.web.event import JoinEventRequest
 from app.schema.response.web.event import JoinEventResponse, UserEventResponse
 
@@ -13,7 +13,7 @@
 async def join_event(
     req: JoinEventRequest,
     container: Container = Depends(get_container),
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
 )-> JoinEventResponse:
     return await container.event_service.join_event_by_code(
         user_id=current_user.user_id,
@@ -24,6 +24,6 @@ async def join_event(
 @router.get("/me", response_model=List[UserEventResponse])
 async def get_my_joined_events(
     container: Container = Depends(get_container),
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
 )-> List[UserEventResponse]:
     return await container.event_service.get_my_events(current_user.user_id)

app/router/mobile/notifications.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends
 
 from app.container import Container, get_container
-from app.deps.token_auth import MobileUserSchema, get_current_mobile_user
+from app.deps.token_auth import MobileUserSchema, require_onboarded_mobile_user
 from app.schema.request.mobile.notifications import MarkUserNotificationsReadRequest
 from app.schema.response.mobile.notifications import UserNotificationListResponse
 
@@ -12,7 +12,7 @@
 @router.get("", response_model=UserNotificationListResponse)
 async def get_all_notifications(
     container: Container = Depends(get_container),
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
 ) -> UserNotificationListResponse:
     notifications = await container.user_notifications_service.get_all_notifications(
         user_id=current_user.user_id,
@@ -24,7 +24,7 @@ async def get_all_notifications(
 async def mark_as_read(
     req: MarkUserNotificationsReadRequest,
     container: Container = Depends(get_container),
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
 ) -> UserNotificationListResponse:
     notifications = await container.user_notifications_service.mark_notifications_as_read(
         notification_ids=req.notification_ids,

app/router/mobile/photo_approval.py

@@ -4,7 +4,7 @@
 from fastapi import APIRouter, Depends, Query
 
 from app.container import Container, get_container
-from app.deps.token_auth import MobileUserSchema, get_current_mobile_user
+from app.deps.token_auth import MobileUserSchema, require_onboarded_mobile_user
 from app.schema.request.mobile.photo_approval import PhotoApprovalRequest
 
 router = APIRouter(prefix="/photos")
@@ -15,7 +15,7 @@ async def list_my_approvals(
     status: Literal["pending", "approved", "rejected"] | None = Query(default=None),
     limit: int = Query(default=50, ge=1, le=100),
     offset: int = Query(default=0, ge=0),
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
     container: Container = Depends(get_container),
 ) -> list[dict[str, object]]:
     approvals: list[dict[str, object]] = []
@@ -39,7 +39,7 @@ async def list_my_approvals(
 async def decide_photo_approval(
     photo_id: UUID,
     req: PhotoApprovalRequest,
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
     container: Container = Depends(get_container),
 ) -> dict[str, str]:
     photo_status = await container.photo_approval_service.decide(

app/router/mobile/photos.py

@@ -5,7 +5,7 @@
 from fastapi.responses import Response
 
 from app.container import Container, get_container
-from app.deps.token_auth import MobileUserSchema, get_current_mobile_user
+from app.deps.token_auth import MobileUserSchema, require_onboarded_mobile_user
 from app.deps.rate_limit import RateLimiter
 
 router = APIRouter(prefix="/photos")
@@ -17,7 +17,7 @@ async def list_my_photos(
     sort: Literal["asc", "desc"] = Query(default="desc"),
     limit: int = Query(default=50, ge=1, le=100),
     offset: int = Query(default=0, ge=0),
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
     container: Container = Depends(get_container),
 ) -> list[dict[str, object]]:
     photos = await container.user_photo_service.list_photos(
@@ -47,7 +47,7 @@ async def list_event_photos(
     sort: Literal["asc", "desc"] = Query(default="desc"),
     limit: int = Query(default=50, ge=1, le=100),
     offset: int = Query(default=0, ge=0),
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
     container: Container = Depends(get_container),
 ) -> dict[str, object]:
     photos = await container.user_photo_service.list_event_photos(
@@ -81,7 +81,7 @@ async def list_event_photos(
 @router.get("/{photo_id}/image")
 async def get_photo_image(
     photo_id: UUID,
-    current_user: MobileUserSchema = Depends(get_current_mobile_user),
+    current_user: MobileUserSchema = Depends(require_onboarded_mobile_user),
     container: Container = Depends(get_container),
 ) -> Response:
     data, filename, content_type = await container.user_photo_service.get_photo_bytes(

app/schema/response/mobile/auth.py

@@ -26,6 +26,7 @@ class UserSchema(BaseModel):
     email: str
     name: str | None
     avatar_url: str | None
+    is_onboarded: bool
 
 class MeResponse(BaseModel):
     user: UserSchema