feat: user init & refactors

apps/api/src/security/auth.py

@@ -1,3 +1,7 @@
+from sqlmodel import Session
+from src.core.events.database import get_db_session
+from src.db.users import User, UserRead
+from src.services.users.users import security_get_user
 from config.config import get_learnhouse_config
 from pydantic import BaseModel
 from fastapi import Depends, HTTPException, Request, status
@@ -6,7 +10,7 @@ from jose import JWTError, jwt
 from datetime import datetime, timedelta
 from src.services.dev.dev import isDevModeEnabled
 from src.services.users.schemas.users import AnonymousUser, PublicUser
-from src.services.users.users import security_get_user, security_verify_password
+from src.services.users.users import security_verify_password
 from src.security.security import ALGORITHM, SECRET_KEY
 from fastapi_jwt_auth import AuthJWT
 
@@ -45,10 +49,13 @@ class TokenData(BaseModel):
 
 
 #### Classes ####################################################
-
-
-async def authenticate_user(request: Request, email: str, password: str):
-    user = await security_get_user(request, email)
+async def authenticate_user(
+    request: Request,
+    email: str,
+    password: str,
+    db_session: Session,
+) -> User | bool:
+    user = await security_get_user(request, db_session, email)
     if not user:
         return False
     if not await security_verify_password(password, user.password):
@@ -67,7 +74,11 @@ def create_access_token(data: dict, expires_delta: timedelta | None = None):
     return encoded_jwt
 
 
-async def get_current_user(request: Request, Authorize: AuthJWT = Depends()):
+async def get_current_user(
+    request: Request,
+    Authorize: AuthJWT = Depends(),
+    db_session: Session = Depends(get_db_session),
+):
     credentials_exception = HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED,
         detail="Could not validate credentials",
@@ -81,10 +92,10 @@ async def get_current_user(request: Request, Authorize: AuthJWT = Depends()):
     except JWTError:
         raise credentials_exception
     if username:
-        user = await security_get_user(request, email=token_data.username)  # type: ignore # treated as an email
+        user = await security_get_user(request, db_session, email=token_data.username)  # type: ignore # treated as an email
         if user is None:
             raise credentials_exception
-        return PublicUser(**user.dict())
+        return UserRead(**user.dict())
     else:
         return AnonymousUser()