include identity in auth api response

osuAkatsuki · Jul 6, 2024 · f767d23 · f767d23
1 parent a1be00c
commit f767d23
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/app/api/public/authentication.py b/app/api/public/authentication.py
@@ -30,7 +30,10 @@ async def authenticate(
     if isinstance(response, Error):
         return JSONResponse(content=response.model_dump(), status_code=401)
 
-    http_response = JSONResponse(content={}, status_code=200)
+    http_response = JSONResponse(
+        content=response.identity.model_dump(),
+        status_code=200,
+    )
     http_response.set_cookie(
         "X-Akatsuki-Access-Token",
         value=response.access_token,

diff --git a/app/usecases/authentication.py b/app/usecases/authentication.py
@@ -3,8 +3,6 @@
 
 from pydantic import BaseModel
 
-import app.state
-from app import logger
 from app import security
 from app.common_types import UserPrivileges
 from app.errors import Error
@@ -13,8 +11,15 @@
 from app.repositories import users
 
 
+class Identity(BaseModel):
+    user_id: int
+    username: str
+    privileges: UserPrivileges
+
+
 class AuthorizationGrant(BaseModel):
     access_token: str
+    identity: Identity
     privileges: UserPrivileges
     expires_at: datetime | None
 
@@ -72,4 +77,9 @@ async def authenticate(
         access_token=access_token.access_token,
         privileges=access_token.privileges,
         expires_at=None,
+        identity=Identity(
+            user_id=user.id,
+            username=user.username,
+            privileges=user.privileges,
+        ),
     )