Staging

api/app_factory.py

@@ -2,7 +2,6 @@
 
 import logging
 import os
-import secrets
 
 from dotenv import load_dotenv
 from fastapi import FastAPI, Request, HTTPException
@@ -12,6 +11,7 @@
 from starlette.middleware.base import BaseHTTPMiddleware
 
 from api.auth.oauth_handlers import setup_oauth_handlers
+from api.auth.user_management import SECRET_KEY
 from api.routes.auth import auth_router, init_auth
 from api.routes.graphs import graphs_router
 from api.routes.database import database_router
@@ -20,7 +20,6 @@
 load_dotenv()
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
 
-
 class SecurityMiddleware(BaseHTTPMiddleware):
     """Middleware for security checks including static file access"""
 
@@ -52,16 +51,10 @@ def create_app():
         ),
     )
 
-    # Get secret key for sessions
-    secret_key = os.getenv("FASTAPI_SECRET_KEY")
-    if not secret_key:
-        secret_key = secrets.token_hex(32)
-        logging.warning("FASTAPI_SECRET_KEY not set, using generated key. Set this in production!")
-
     # Add session middleware with explicit settings to ensure OAuth state persists
     app.add_middleware(
         SessionMiddleware,
-        secret_key=secret_key,
+        secret_key=SECRET_KEY,
         session_cookie="qw_session",
         same_site="lax",  # allow top-level OAuth GET redirects to send cookies
         https_only=False,  # allow http on localhost in development
@@ -90,9 +83,9 @@ def create_app():
     async def handle_oauth_error(request: Request, exc: Exception):
         """Handle OAuth-related errors gracefully"""
         # Check if it's an OAuth-related error
+        # TODO check this scenario
         if "token" in str(exc).lower() or "oauth" in str(exc).lower():
             logging.warning("OAuth error occurred: %s", exc)
-            request.session.clear()
             return RedirectResponse(url="/", status_code=302)
 
         # If it's an HTTPException, re-raise so FastAPI handles it properly

api/auth/__init__.py

@@ -7,15 +7,15 @@
 from .user_management import (
     ensure_user_in_organizations,
     update_identity_last_login,
-    validate_and_cache_user,
+    validate_user,
     token_required,
 )
 from .oauth_handlers import setup_oauth_handlers
 
 __all__ = [
     "ensure_user_in_organizations",
     "update_identity_last_login",
-    "validate_and_cache_user",
+    "validate_user",
     "token_required",
     "setup_oauth_handlers",
 ]

api/auth/oauth_handlers.py

@@ -7,7 +7,7 @@
 import logging
 from typing import Dict, Any
 
-from fastapi import FastAPI, Request
+from fastapi import FastAPI
 from authlib.integrations.starlette_client import OAuth
 
 from .user_management import ensure_user_in_organizations
@@ -19,62 +19,32 @@ def setup_oauth_handlers(app: FastAPI, oauth: OAuth):
     # Store oauth in app state for access in routes
     app.state.oauth = oauth
 
-    async def handle_google_callback(_request: Request,
-                                     _token: Dict[str, Any],
-                                     user_info: Dict[str, Any]):
-        """Handle Google OAuth callback processing"""
+    async def handle_callback(provider: str, user_info: Dict[str, Any], api_token: str):
+        """Handle Provider OAuth callback processing"""
         try:
             user_id = user_info.get("id")
             email = user_info.get("email")
             name = user_info.get("name")
 
             # Validate required fields
             if not user_id or not email:
-                logging.error("Missing required fields from Google OAuth response")
+                logging.error("Missing required fields from %s OAuth response", provider)
                 return False
 
             # Check if identity exists in Organizations graph, create if new
             _, _ = await ensure_user_in_organizations(
                 user_id,
                 email,
                 name,
-                "google",
+                provider,
+                api_token,
                 user_info.get("picture"),
             )
 
             return True
         except Exception as exc:  # capture exception for logging
-            logging.error("Error handling Google OAuth callback: %s", exc)
-            return False
-
-    async def handle_github_callback(_request: Request,
-                                     _token: Dict[str, Any],
-                                     user_info: Dict[str, Any]):
-        """Handle GitHub OAuth callback processing"""
-        try:
-            user_id = user_info.get("id")
-            email = user_info.get("email")
-            name = user_info.get("name") or user_info.get("login")
-
-            # Validate required fields
-            if not user_id or not email:
-                logging.error("Missing required fields from GitHub OAuth response")
-                return False
-
-            # Check if identity exists in Organizations graph, create if new
-            _, _ = await ensure_user_in_organizations(
-                user_id,
-                email,
-                name,
-                "github",
-                user_info.get("picture"),
-            )
-
-            return True
-        except Exception as exc:  # capture exception for logging
-            logging.error("Error handling GitHub OAuth callback: %s", exc)
+            logging.error("Error handling %s OAuth callback: %s", provider, exc)
             return False
 
     # Store handlers in app state for use in route callbacks
-    app.state.google_callback_handler = handle_google_callback
-    app.state.github_callback_handler = handle_github_callback
+    app.state.callback_handler = handle_callback