11

app/api/v1/auth.py

@@ -1,7 +1,14 @@
 from fastapi import APIRouter, Header
 
 from app.dependencies import CurrentUser, DbSession, RedisClient
-from app.schemas.auth import LoginRequest, RegisterRequest, TokenResponse, UserPublic
+from app.schemas.auth import (
+    HeartbeatRequest,
+    HeartbeatResponse,
+    LoginRequest,
+    RegisterRequest,
+    TokenResponse,
+    UserPublic,
+)
 from app.schemas.common import ApiResponse
 from app.services import auth as auth_service
 
@@ -13,12 +20,14 @@ async def register(
     body: RegisterRequest,
     db: DbSession,
     redis: RedisClient,
+    device_serial: str | None = Header(default=None, convert_underscores=False),
 ) -> ApiResponse[TokenResponse]:
     try:
         result = await auth_service.register_user(
             db,
             username=body.username,
             password=body.password,
+            device_serial=device_serial,
         )
     except auth_service.AuthError as exc:
         return ApiResponse(ok=False, message=exc.message)
@@ -32,12 +41,14 @@ async def login(
     body: LoginRequest,
     db: DbSession,
     redis: RedisClient,
+    device_serial: str | None = Header(default=None, convert_underscores=False),
 ) -> ApiResponse[TokenResponse]:
     try:
         result = await auth_service.login_user(
             db,
             username=body.username,
             password=body.password,
+            device_serial=device_serial,
         )
     except auth_service.AuthError as exc:
         return ApiResponse(ok=False, message=exc.message)
@@ -46,6 +57,25 @@ async def login(
     return ApiResponse(ok=True, message="登录成功", data=result)
 
 
+@router.post("/heartbeat", response_model=ApiResponse[HeartbeatResponse])
+async def heartbeat(
+    body: HeartbeatRequest,
+    current_user: CurrentUser,
+    db: DbSession,
+    device_serial: str | None = Header(default=None, convert_underscores=False),
+) -> ApiResponse[HeartbeatResponse]:
+    try:
+        data = await auth_service.process_heartbeat(
+            db,
+            current_user,
+            device_serial,
+            body.verify_code,
+        )
+    except auth_service.AuthError as exc:
+        return ApiResponse(ok=False, message=exc.message)
+    return ApiResponse(ok=True, message="", data=data)
+
+
 @router.post("/logout", response_model=ApiResponse[None])
 async def logout(
     redis: RedisClient,

app/api/v1/oem_oem_branding.py

@@ -16,9 +16,7 @@ async def get_oem_branding(
     db: DbSession,
 ) -> ApiResponse[OemBrandingOut]:
     try:
-        oem = await branding_service.get_default_oem_branding(
-            db, oem_id=1,user_id=admin.id
-        )
+        oem = await branding_service.get_default_oem_branding(db, user_id=admin.id)
     except branding_service.AdminOemBrandingError as exc:
         return ApiResponse(ok=False, message=exc.message)
 
@@ -36,9 +34,7 @@ async def update_oem_branding(
     db: DbSession,
 ) -> ApiResponse[OemBrandingOut]:
     try:
-        oem = await branding_service.update_default_oem_branding(
-            db, body, oem_id=admin.id,user_id=admin.id
-        )
+        oem = await branding_service.update_default_oem_branding(db, body, user_id=admin.id)
     except branding_service.AdminOemBrandingError as exc:
         return ApiResponse(ok=False, message=exc.message)