Update core/security.py

core/security.py

@@ -4,7 +4,6 @@ from fastapi import Depends, HTTPException
 from datetime import timedelta, datetime
 from jose import JWTError, jwt
 from core.config import get_settings
-from users.services import get_user_by_email
 from sqlalchemy.orm import Session
 from core.database import get_db
 
@@ -46,28 +45,31 @@ def get_token_payload(token:str):
     except JWTError:
         return None
     
-async def get_current_user(token:str = Depends(oauth2scheme), db:Session = Depends(get_db)):
+async def get_current_user(token: str = Depends(oauth2scheme), db: Session = Depends(get_db)):
+    from users.services import get_user_by_email  # Local import
+
     try:
         payload = get_token_payload(token)
         email = payload.get("sub")
         if email is None:
-            return HTTPException(status_code=401,
-                                 detail="Invalid Token",
-                                 headers={"WWW-Authenticate": "Bearer"})
+            raise HTTPException(status_code=401,
+                                detail="Invalid Token",
+                                headers={"WWW-Authenticate": "Bearer"})
     except JWTError:
-        return HTTPException(status_code=401,
-                             detail="Invalid Token",
-                             headers={"WWW-Authenticate": "Bearer"}
-                             )
+        raise HTTPException(status_code=401,
+                            detail="Invalid Token",
+                            headers={"WWW-Authenticate": "Bearer"}
+                            )
     
     user = get_user_by_email(email, db=db)
     if user is None:
-        return HTTPException(status_code=401,
-                             detail="Invalid Token",
-                             headers={"WWW-Authenticate": "Bearer"}
-                             )
+        raise HTTPException(status_code=401,
+                            detail="User not found",
+                            headers={"WWW-Authenticate": "Bearer"}
+                            )
     return user
 
 
 
+