Created new schema projects_users.py to avoid circular imports

routers/me.py

@@ -5,10 +5,11 @@ import models
 
 from routers import auth
 import schemas.users as user_schemas
+import schemas.projects_users as projects_users_schemas
 
 router = APIRouter(prefix="/me", tags=["me"])
 
-@router.get("/", response_model=user_schemas.UserBase, tags=["me", "users"])
+@router.get("/", response_model=projects_users_schemas.ProjectUserBase, tags=["me", "users"])
 def get_me(request: Request, db: db_dependency):
     """Get current authenticated user"""
     token = request.cookies.get("access_token")
@@ -62,37 +63,8 @@ def logout(request: Request,response: Response):
 @router.delete("/delete-me", tags=["me", "auth", "users"])
 def delete_me(request: Request, db: db_dependency):
     """Delete current authenticated user"""
-    token = request.cookies.get("access_token")
-
-    if not token:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Not logged in"
-        )
-
-    try:
-        payload = jwt.decode(token, auth.SECRET_KEY, algorithms=[auth.ALGORITHM])
-        user_id: str = str(payload.get("sub"))
-        if user_id is None:
-            request.cookies.clear() ## removing invalid auth cookie
-            raise HTTPException(
-                status_code=status.HTTP_401_UNAUTHORIZED,
-                detail="Not logged in"
-            )
-    except JWTError:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Could not validate credentials"
-        )
-
-## User retrieval and deletion
-    user = db.query(models.User).filter(models.User.id == int(user_id)).first()
-    if user is None:
-        request.cookies.clear() ## removing invalid auth cookie
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="User not found"
-        )
+    
+    user = auth.get_user_from_jwt(request, db)
 
     db.delete(user)
     db.commit()