fix some typing issues and remove with provider when using fastapi_sso

Author: jonasrenault

backend/app/auth/auth.py

@@ -75,12 +75,14 @@ def verify_password(password: str, hashed_pass: str) -> bool:
     return password_context.verify(password, hashed_pass)
 
 
-async def authenticate_user(email: str, password: str):
+async def authenticate_user(email: str, password: str) -> models.User | None:
     user = await models.User.find_one({"email": email})
     if not user:
-        return False
-    if not verify_password(password, user.hashed_password):
-        return False
+        return None
+    if user.hashed_password is None or not verify_password(
+        password, user.hashed_password
+    ):
+        return None
     return user
 
 
@@ -112,7 +114,7 @@ async def _get_current_user(token):
     )
     try:
         payload = jwt.decode(token, settings.SECRET_KEY, algorithms=[ALGORITHM])
-        userid: UUID = payload.get("sub")
+        userid: UUID | None = payload.get("sub")
         if userid is None:
             raise credentials_exception
         token_data = schemas.TokenPayload(uuid=userid)

backend/app/routers/login.py

@@ -35,7 +35,7 @@ async def login_access_token(form_data: OAuth2PasswordRequestForm = Depends()) -
     OAuth2 compatible token login, get an access token for future requests
     """
     user = await authenticate_user(form_data.username, form_data.password)
-    if not user:
+    if user is None:
         raise HTTPException(status_code=400, detail="Incorrect email or password")
     elif not user.is_active:
         raise HTTPException(status_code=400, detail="Inactive user")
@@ -79,8 +79,7 @@ async def google_login(google_sso: GoogleSSO = Depends(get_google_sso)):
     """
     Generate login url and redirect
     """
-    with google_sso:
-        return await google_sso.get_login_redirect()
+    return await google_sso.get_login_redirect()
 
 
 @router.get("/google/callback")
@@ -97,8 +96,7 @@ async def google_callback(
         )
 
     # Get user details from Google
-    with google_sso:
-        google_user = await google_sso.verify_and_process(request)
+    google_user = await google_sso.verify_and_process(request)
 
     if google_user is None:
         raise HTTPException(