Update auth.py

auth.py

@@ -132,22 +132,12 @@ async def get_user_data(
     email: Optional[str] = Query(None, description="User email")
 ):
     # Determine if Authorization header is provided
-    auth: str = request.headers.get("Authorization", "")
+    auth_header = request.headers.get("Authorization", "")
     user = None
-    if auth.startswith("Bearer "):
-        token = auth.split(" ", 1)[1]
+    if auth_header.startswith("Bearer "):
+        token = auth_header.split(" ", 1)[1]
         # Authenticated path
-        try:
-            payload = jwt.decode(token, SECRET_KEY, algorithms=["HS256"])
-            user_email: str = payload.get("sub")
-            if not user_email:
-                raise HTTPException(status_code=401, detail="Invalid token payload")
-            user = get_user(user_email)
-            if not user:
-                raise HTTPException(status_code=404, detail="User not found")
-        except JWTError as e:
-            logger.error(f"[USER DATA] JWT decode failed: {e}")
-            raise HTTPException(status_code=401, detail="Invalid token")
+        user = get_current_user(token)
     elif email:
         # Public path
         user = get_user(email)
@@ -165,18 +155,20 @@ async def get_user_data(
         "chat_histories": user.get('chat_histories', [])
     }
 
-@router.put("/user/update")("/user/update")
+@router.put("/user/update")
 async def update_user(
     request: Request,
     name: Optional[str] = Form(None),
     email: Optional[str] = Form(None),
     password: Optional[str] = Form(None),
     avatar: Optional[UploadFile] = File(None),
-    current_user: dict = Depends(oauth2_scheme)
+    current_user: dict = Depends(get_current_user)
 ):
     update_data = {}
-    if name: update_data['name'] = name
-    if email: update_data['email'] = email
+    if name:
+        update_data['name'] = name
+    if email:
+        update_data['email'] = email
     if password:
         try:
             _ = User(name=current_user['name'], email=current_user['email'], password=password)
@@ -194,7 +186,7 @@ async def update_user(
     return {"message": "User updated successfully"}
 
 @router.post("/logout")
-async def logout(request: Request, current_user: dict = Depends(oauth2_scheme)):
+async def logout(request: Request, current_user: dict = Depends(get_current_user)):
     logger.info(f"User logged out: {current_user['email']}")
     return {"message": "User logged out successfully"}