solace-agent-mesh 1.3.3__py3-none-any.whl → 1.4.1__py3-none-any.whl

solace_agent_mesh/gateway/http_sse/main.py

@@ -30,8 +30,6 @@ from ...gateway.http_sse.routers import (
     tasks,
     visualization,
 )
-
-# Import persistence-aware controllers
 from .routers.sessions import router as session_router
 from .routers.tasks import router as task_router
 from .routers.users import router as user_router
@@ -46,90 +44,132 @@ app = FastAPI(
 )
 
 
-def setup_dependencies(component: "WebUIBackendComponent", database_url: str = None):
-    """
-    This function initializes the simplified architecture while maintaining full
-    backward compatibility with existing API contracts.
+def _extract_access_token(request: FastAPIRequest) -> str:
+    auth_header = request.headers.get("Authorization")
+    if auth_header and auth_header.startswith("Bearer "):
+        return auth_header[7:]
 
-    If database_url is None, runs in compatibility mode with in-memory sessions.
-    """
+    try:
+        if "access_token" in request.session:
+            log.debug("AuthMiddleware: Found token in session.")
+            return request.session["access_token"]
+    except AssertionError:
+        log.debug("AuthMiddleware: Could not access request.session.")
 
-    dependencies.set_component_instance(component)
+    if "token" in request.query_params:
+        return request.query_params["token"]
 
-    if database_url:
-        dependencies.init_database(database_url)
-        log.info("Persistence enabled - sessions will be stored in database")
-        
-        log.info("Checking database migrations...")
-        try:
-            from sqlalchemy import create_engine
-            engine = create_engine(database_url)
-            inspector = sa.inspect(engine)
-            existing_tables = inspector.get_table_names()
-
-            if not existing_tables or "sessions" not in existing_tables:
-                log.info("Running database migrations...")
-                alembic_cfg = Config()
-                alembic_cfg.set_main_option(
-                    "script_location",
-                    os.path.join(os.path.dirname(__file__), "alembic"),
-                )
-                alembic_cfg.set_main_option("sqlalchemy.url", database_url)
-                command.upgrade(alembic_cfg, "head")
-                log.info("Database migrations complete.")
-            else:
-                log.info("Database tables already exist, skipping migrations.")
-        except Exception as e:
-            log.warning(
-                f"Migration check failed, attempting to run migrations anyway: {e}"
-            )
-            try:
-                alembic_cfg = Config()
-                alembic_cfg.set_main_option(
-                    "script_location",
-                    os.path.join(os.path.dirname(__file__), "alembic"),
-                )
-                alembic_cfg.set_main_option("sqlalchemy.url", database_url)
-                command.upgrade(alembic_cfg, "head")
-                log.info("Database migrations complete.")
-            except Exception as migration_error:
-                log.warning(f"Migration failed but continuing: {migration_error}")
-    else:
-        log.warning(
-            "No database URL provided - using in-memory session storage (data not persisted across restarts)"
+    return None
+
+
+async def _validate_token(auth_service_url: str, auth_provider: str, access_token: str) -> bool:
+    async with httpx.AsyncClient() as client:
+        validation_response = await client.post(
+            f"{auth_service_url}/is_token_valid",
+            json={"provider": auth_provider},
+            headers={"Authorization": f"Bearer {access_token}"},
         )
-        log.info("This maintains backward compatibility for existing SAM installations")
+    return validation_response.status_code == 200
 
-    webui_app = component.get_app()
-    app_config = {}
-    if webui_app:
-        app_config = getattr(webui_app, "app_config", {})
-        if app_config is None:
-            log.warning("webui_app.app_config is None, using empty dict.")
-            app_config = {}
-    else:
-        log.warning("Could not get webui_app from component. Using empty app_config.")
 
-    api_config_dict = {
-        "external_auth_service_url": app_config.get(
-            "external_auth_service_url", "http://localhost:8080"
-        ),
-        "external_auth_callback_uri": app_config.get(
-            "external_auth_callback_uri", "http://localhost:8000/api/v1/auth/callback"
-        ),
-        "external_auth_provider": app_config.get("external_auth_provider", "azure"),
-        "frontend_use_authorization": app_config.get(
-            "frontend_use_authorization", False
-        ),
-        "frontend_redirect_url": app_config.get(
-            "frontend_redirect_url", "http://localhost:3000"
-        ),
-        "persistence_enabled": database_url is not None,
+async def _get_user_info(auth_service_url: str, auth_provider: str, access_token: str) -> dict:
+    async with httpx.AsyncClient() as client:
+        userinfo_response = await client.get(
+            f"{auth_service_url}/user_info?provider={auth_provider}",
+            headers={"Authorization": f"Bearer {access_token}"},
+        )
+
+    if userinfo_response.status_code != 200:
+        return None
+
+    return userinfo_response.json()
+
+
+def _extract_user_identifier(user_info: dict) -> str:
+    user_identifier = (
+        user_info.get("sub")
+        or user_info.get("client_id")
+        or user_info.get("username")
+        or user_info.get("oid")
+        or user_info.get("preferred_username")
+        or user_info.get("upn")
+        or user_info.get("unique_name")
+        or user_info.get("email")
+        or user_info.get("name")
+        or user_info.get("azp")
+    )
+
+    if user_identifier and user_identifier.lower() == "unknown":
+        log.warning("AuthMiddleware: IDP returned 'Unknown' as user identifier. Using fallback.")
+        return "sam_dev_user"
+
+    return user_identifier
+
+
+def _extract_user_details(user_info: dict, user_identifier: str) -> tuple:
+    email_from_auth = (
+        user_info.get("email")
+        or user_info.get("preferred_username")
+        or user_info.get("upn")
+        or user_identifier
+    )
+
+    display_name = (
+        user_info.get("name")
+        or user_info.get("given_name", "") + " " + user_info.get("family_name", "")
+        or user_info.get("preferred_username")
+        or user_identifier
+    ).strip()
+
+    return email_from_auth, display_name
+
+
+async def _create_user_state_without_identity_service(user_identifier: str, email_from_auth: str, display_name: str) -> dict:
+    final_user_id = user_identifier or email_from_auth or "sam_dev_user"
+    if not final_user_id or final_user_id.lower() in ["unknown", "null", "none", ""]:
+        final_user_id = "sam_dev_user"
+        log.warning(
+            "AuthMiddleware: Had to use fallback user ID due to invalid identifier: %s",
+            user_identifier,
+        )
+
+    log.error(
+        "AuthMiddleware: Internal IdentityService not configured on component. Using user ID: %s",
+        final_user_id,
+    )
+    return {
+        "id": final_user_id,
+        "email": email_from_auth or final_user_id,
+        "name": display_name or final_user_id,
+        "authenticated": True,
+        "auth_method": "oidc",
     }
 
-    dependencies.set_api_config(api_config_dict)
-    log.info("API configuration extracted and stored.")
 
+async def _create_user_state_with_identity_service(identity_service, user_identifier: str, email_from_auth: str, display_name: str, user_info: dict) -> dict:
+    lookup_value = email_from_auth if "@" in email_from_auth else user_identifier
+    user_profile = await identity_service.get_user_profile(
+        {identity_service.lookup_key: lookup_value},
+        user_info=user_info
+    )
+
+    if not user_profile:
+        return None
+
+    user_state = user_profile.copy()
+    if not user_state.get("id"):
+        user_state["id"] = user_identifier
+    if not user_state.get("email"):
+        user_state["email"] = email_from_auth
+    if not user_state.get("name"):
+        user_state["name"] = display_name
+    user_state["authenticated"] = True
+    user_state["auth_method"] = "oidc"
+
+    return user_state
+
+
+def _create_auth_middleware(component):
     class AuthMiddleware:
         def __init__(self, app, component):
             self.app = app
@@ -147,304 +187,247 @@ def setup_dependencies(component: "WebUIBackendComponent", database_url: str = N
                 return
 
             skip_paths = [
-                "/api/v1/config",
-                "/api/v1/auth/callback",
-                "/api/v1/auth/login",
-                "/api/v1/auth/refresh",
-                "/api/v1/csrf-token",
-                "/health",
+                "/api/v1/config", "/api/v1/auth/callback", "/api/v1/auth/login",
+                "/api/v1/auth/refresh", "/api/v1/csrf-token", "/health",
             ]
 
             if any(request.url.path.startswith(path) for path in skip_paths):
                 await self.app(scope, receive, send)
                 return
 
-            use_auth = dependencies.api_config and dependencies.api_config.get(
-                "frontend_use_authorization"
-            )
+            use_auth = dependencies.api_config and dependencies.api_config.get("frontend_use_authorization")
 
             if use_auth:
-                access_token = None
-                auth_header = request.headers.get("Authorization")
-                if auth_header and auth_header.startswith("Bearer "):
-                    access_token = auth_header[7:]
-
-                if not access_token:
-                    try:
-                        if "access_token" in request.session:
-                            access_token = request.session["access_token"]
-                            log.debug("AuthMiddleware: Found token in session.")
-                    except AssertionError:
-                        log.debug("AuthMiddleware: Could not access request.session.")
-                        pass
-
-                if not access_token:
-                    if "token" in request.query_params:
-                        access_token = request.query_params["token"]
-
-                if not access_token:
-                    log.warning("AuthMiddleware: No access token found. Returning 401.")
+                await self._handle_authenticated_request(request, scope, receive, send)
+            else:
+                request.state.user = {
+                    "id": "sam_dev_user", "name": "Sam Dev User", "email": "sam@dev.local",
+                    "authenticated": True, "auth_method": "development",
+                }
+                log.debug("AuthMiddleware: Set development user state with id: sam_dev_user")
+
+            await self.app(scope, receive, send)
+
+        async def _handle_authenticated_request(self, request, scope, receive, send):
+            access_token = _extract_access_token(request)
+
+            if not access_token:
+                log.warning("AuthMiddleware: No access token found. Returning 401.")
+                response = JSONResponse(
+                    status_code=status.HTTP_401_UNAUTHORIZED,
+                    content={"detail": "Not authenticated", "error_type": "authentication_required"},
+                )
+                await response(scope, receive, send)
+                return
+
+            try:
+                auth_service_url = dependencies.api_config.get("external_auth_service_url")
+                auth_provider = dependencies.api_config.get("external_auth_provider")
+
+                if not auth_service_url:
+                    log.error("Auth service URL not configured.")
+                    response = JSONResponse(
+                        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                        content={"detail": "Auth service not configured"},
+                    )
+                    await response(scope, receive, send)
+                    return
+
+                if not await _validate_token(auth_service_url, auth_provider, access_token):
+                    log.warning("AuthMiddleware: Token validation failed")
                     response = JSONResponse(
                         status_code=status.HTTP_401_UNAUTHORIZED,
-                        content={
-                            "detail": "Not authenticated",
-                            "error_type": "authentication_required",
-                        },
+                        content={"detail": "Invalid token", "error_type": "invalid_token"},
                     )
                     await response(scope, receive, send)
                     return
 
-                try:
-                    auth_service_url = dependencies.api_config.get(
-                        "external_auth_service_url"
+                user_info = await _get_user_info(auth_service_url, auth_provider, access_token)
+                if not user_info:
+                    log.warning("AuthMiddleware: Failed to get user info from external auth service")
+                    response = JSONResponse(
+                        status_code=status.HTTP_401_UNAUTHORIZED,
+                        content={"detail": "Could not retrieve user info from auth provider", "error_type": "user_info_failed"},
                     )
-                    auth_provider = dependencies.api_config.get(
-                        "external_auth_provider"
+                    await response(scope, receive, send)
+                    return
+
+                user_identifier = _extract_user_identifier(user_info)
+                if not user_identifier or user_identifier.lower() in ["null", "none", ""]:
+                    log.error("AuthMiddleware: No valid user identifier from OAuth provider")
+                    response = JSONResponse(
+                        status_code=status.HTTP_401_UNAUTHORIZED,
+                        content={"detail": "OAuth provider returned no valid user identifier", "error_type": "invalid_user_identifier_from_provider"},
                     )
+                    await response(scope, receive, send)
+                    return
+
+                email_from_auth, display_name = _extract_user_details(user_info, user_identifier)
 
-                    if not auth_service_url:
-                        log.error("Auth service URL not configured.")
+                identity_service = self.component.identity_service
+                if not identity_service:
+                    request.state.user = await _create_user_state_without_identity_service(user_identifier, email_from_auth, display_name)
+                else:
+                    user_state = await _create_user_state_with_identity_service(identity_service, user_identifier, email_from_auth, display_name, user_info)
+                    if not user_state:
+                        log.error("AuthMiddleware: User authenticated but not found in internal IdentityService")
                         response = JSONResponse(
-                            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                            content={"detail": "Auth service not configured"},
+                            status_code=status.HTTP_403_FORBIDDEN,
+                            content={"detail": "User not authorized for this application", "error_type": "not_authorized"},
                         )
                         await response(scope, receive, send)
                         return
+                    request.state.user = user_state
 
-                    async with httpx.AsyncClient() as client:
-                        validation_response = await client.post(
-                            f"{auth_service_url}/is_token_valid",
-                            json={"provider": auth_provider},
-                            headers={"Authorization": f"Bearer {access_token}"},
-                        )
+            except httpx.RequestError as exc:
+                log.error("Error calling auth service: %s", exc)
+                response = JSONResponse(
+                    status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
+                    content={"detail": "Auth service is unavailable"},
+                )
+                await response(scope, receive, send)
+                return
+            except Exception as exc:
+                log.error("An unexpected error occurred during token validation: %s", exc)
+                response = JSONResponse(
+                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                    content={"detail": "An internal error occurred during authentication"},
+                )
+                await response(scope, receive, send)
+                return
 
-                    if validation_response.status_code != 200:
-                        log.warning(
-                            "AuthMiddleware: Token validation failed with status %s: %s",
-                            validation_response.status_code,
-                            validation_response.text,
-                        )
-                        response = JSONResponse(
-                            status_code=status.HTTP_401_UNAUTHORIZED,
-                            content={
-                                "detail": "Invalid token",
-                                "error_type": "invalid_token",
-                            },
-                        )
-                        await response(scope, receive, send)
-                        return
+    return AuthMiddleware
 
-                    async with httpx.AsyncClient() as client:
-                        userinfo_response = await client.get(
-                            f"{auth_service_url}/user_info?provider={auth_provider}",
-                            headers={"Authorization": f"Bearer {access_token}"},
-                        )
 
-                    if userinfo_response.status_code != 200:
-                        log.warning(
-                            "AuthMiddleware: Failed to get user info from external auth service: %s",
-                            userinfo_response.status_code,
-                        )
-                        response = JSONResponse(
-                            status_code=status.HTTP_401_UNAUTHORIZED,
-                            content={
-                                "detail": "Could not retrieve user info from auth provider",
-                                "error_type": "user_info_failed",
-                            },
-                        )
-                        await response(scope, receive, send)
-                        return
+def _setup_alembic_config(database_url: str) -> Config:
+    alembic_cfg = Config()
+    alembic_cfg.set_main_option(
+        "script_location",
+        os.path.join(os.path.dirname(__file__), "alembic"),
+    )
+    alembic_cfg.set_main_option("sqlalchemy.url", database_url)
+    return alembic_cfg
 
-                    user_info = userinfo_response.json()
-                    log.info(
-                        "AuthMiddleware: Raw user info from OAuth provider: %s",
-                        user_info,
-                    )
 
-                    # Priority order for user identifier (most specific to least specific)
-                    user_identifier = (
-                        user_info.get("sub")  # Standard OIDC subject claim
-                        or user_info.get("client_id")  # Mini IDP and some custom IDPs
-                        or user_info.get("username")  # Mini IDP returns username field
-                        or user_info.get("oid")  # Azure AD object ID
-                        or user_info.get(
-                            "preferred_username"
-                        )  # Common in enterprise IDPs
-                        or user_info.get("upn")  # Azure AD User Principal Name
-                        or user_info.get("unique_name")  # Some Azure configurations
-                        or user_info.get("email")  # Fallback to email
-                        or user_info.get("name")  # Last resort
-                        or user_info.get("azp")  # Authorized party (rare but possible)
-                    )
+def _run_community_migrations(database_url: str) -> None:
+    try:
+        from sqlalchemy import create_engine
 
-                    # IMPORTANT: If the extracted identifier is "Unknown", it means the IDP
-                    # didn't properly authenticate or is misconfigured. Use a fallback.
-                    if user_identifier and user_identifier.lower() == "unknown":
-                        log.warning(
-                            "AuthMiddleware: IDP returned 'Unknown' as user identifier. This indicates misconfiguration. Using fallback."
-                        )
-                        # In development mode with mini IDP, default to sam_dev_user
-                        # This is a workaround for the OAuth2 proxy service returning "Unknown"
-                        user_identifier = "sam_dev_user"  # Fallback for development
-                        log.info(
-                            "AuthMiddleware: Using development fallback user: sam_dev_user"
-                        )
+        engine = create_engine(database_url)
+        inspector = sa.inspect(engine)
+        existing_tables = inspector.get_table_names()
 
-                    # Extract email separately (may be different from user identifier)
-                    email_from_auth = (
-                        user_info.get("email")
-                        or user_info.get("preferred_username")
-                        or user_info.get("upn")
-                        or user_identifier
-                    )
+        if not existing_tables or "sessions" not in existing_tables:
+            log.info("Running community database migrations...")
+            alembic_cfg = _setup_alembic_config(database_url)
+            command.upgrade(alembic_cfg, "head")
+            log.info("Community database migrations complete.")
+        else:
+            log.info(
+                "Community database tables already exist, skipping community migrations."
+            )
+    except Exception as e:
+        log.warning(
+            "Community migration check failed, attempting to run migrations anyway: %s",
+            e,
+        )
+        try:
+            alembic_cfg = _setup_alembic_config(database_url)
+            command.upgrade(alembic_cfg, "head")
+            log.info("Community database migrations complete.")
+        except Exception as migration_error:
+            log.warning(
+                "Community migration failed but continuing: %s", migration_error
+            )
 
-                    # Extract display name
-                    display_name = (
-                        user_info.get("name")
-                        or user_info.get("given_name", "")
-                        + " "
-                        + user_info.get("family_name", "")
-                        or user_info.get("preferred_username")
-                        or user_identifier
-                    ).strip()
-
-                    log.info(
-                        "AuthMiddleware: Extracted user identifier: %s, email: %s, name: %s",
-                        user_identifier,
-                        email_from_auth,
-                        display_name,
-                    )
 
-                    if not user_identifier or user_identifier.lower() in [
-                        "null",
-                        "none",
-                        "",
-                    ]:
-                        log.error(
-                            "AuthMiddleware: No valid user identifier from OAuth provider. Full user info: %s. Expected valid user identifier.",
-                            user_info,
-                        )
-                        response = JSONResponse(
-                            status_code=status.HTTP_401_UNAUTHORIZED,
-                            content={
-                                "detail": "OAuth provider returned no valid user identifier. Provider must return at least one of: sub, username, client_id, preferred_username, email, or name field.",
-                                "error_type": "invalid_user_identifier_from_provider",
-                                "received_user_info": user_info,
-                            },
-                        )
-                        await response(scope, receive, send)
-                        return
+def _run_enterprise_migrations(component: "WebUIBackendComponent", database_url: str) -> None:
+    try:
+        from solace_agent_mesh_enterprise.webui_backend.migration_runner import (
+            run_migrations,
+        )
 
-                    identity_service = self.component.identity_service
-                    if not identity_service:
-                        # Make absolutely sure we have a valid user ID - never "Unknown"
-                        final_user_id = (
-                            user_identifier or email_from_auth or "sam_dev_user"
-                        )
-                        if not final_user_id or final_user_id.lower() in [
-                            "unknown",
-                            "null",
-                            "none",
-                            "",
-                        ]:
-                            final_user_id = "sam_dev_user"
-                            log.warning(
-                                "AuthMiddleware: Had to use fallback user ID due to invalid identifier: %s",
-                                user_identifier,
-                            )
-
-                        log.error(
-                            "AuthMiddleware: Internal IdentityService not configured on component. Using user ID: %s",
-                            final_user_id,
-                        )
-                        request.state.user = {
-                            "id": final_user_id,
-                            "email": email_from_auth or final_user_id,
-                            "name": display_name or final_user_id,
-                            "authenticated": True,
-                            "auth_method": "oidc",
-                        }
-                        log.info(
-                            "AuthMiddleware: Set fallback user state with id: %s",
-                            final_user_id,
-                        )
-                    else:
-                        # Try to look up user profile using the email or user identifier
-                        lookup_value = (
-                            email_from_auth
-                            if "@" in email_from_auth
-                            else user_identifier
-                        )
-                        user_profile = await identity_service.get_user_profile(
-                            {identity_service.lookup_key: lookup_value}
-                        )
-                        if not user_profile:
-                            log.error(
-                                "AuthMiddleware: User '%s' authenticated but not found in internal IdentityService.",
-                                lookup_value,
-                            )
-                            response = JSONResponse(
-                                status_code=status.HTTP_403_FORBIDDEN,
-                                content={
-                                    "detail": "User not authorized for this application",
-                                    "error_type": "not_authorized",
-                                },
-                            )
-                            await response(scope, receive, send)
-                            return
-
-                        request.state.user = user_profile.copy()
-                        # Ensure the ID is set from the OAuth provider if not present in the profile
-                        if not request.state.user.get("id"):
-                            request.state.user["id"] = user_identifier
-                        # Also ensure email and name are set if not in profile
-                        if not request.state.user.get("email"):
-                            request.state.user["email"] = email_from_auth
-                        if not request.state.user.get("name"):
-                            request.state.user["name"] = display_name
-                        request.state.user["authenticated"] = True
-                        request.state.user["auth_method"] = "oidc"
-                        log.info(
-                            "AuthMiddleware: Set enriched user profile with id: %s",
-                            request.state.user.get("id"),
-                        )
+        webui_app = component.get_app()
+        app_config = getattr(webui_app, "app_config", {}) if webui_app else {}
+        log.info("Running enterprise migrations...")
+        run_migrations(database_url, app_config)
+        log.info("Enterprise migrations completed")
+    except (ImportError, ModuleNotFoundError):
+        log.debug("Enterprise module not found - skipping enterprise migrations")
+    except Exception as e:
+        log.warning("Enterprise migration failed but continuing: %s", e)
 
-                except httpx.RequestError as exc:
-                    log.error("Error calling auth service: %s", exc)
-                    response = JSONResponse(
-                        status_code=status.HTTP_503_SERVICE_UNAVAILABLE,
-                        content={"detail": "Auth service is unavailable"},
-                    )
-                    await response(scope, receive, send)
-                    return
-                except Exception as exc:
-                    log.error(
-                        "An unexpected error occurred during token validation: %s", exc
-                    )
-                    response = JSONResponse(
-                        status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                        content={
-                            "detail": "An internal error occurred during authentication"
-                        },
-                    )
-                    await response(scope, receive, send)
-                    return
-            else:
-                # If auth is not used, set a default user
-                request.state.user = {
-                    "id": "sam_dev_user",
-                    "name": "Sam Dev User",
-                    "email": "sam@dev.local",
-                    "authenticated": True,
-                    "auth_method": "development",
-                }
-                log.debug(
-                    "AuthMiddleware: Set development user state with id: sam_dev_user"
-                )
 
-            await self.app(scope, receive, send)
+def _setup_database(component: "WebUIBackendComponent", database_url: str) -> None:
+    dependencies.init_database(database_url)
+    log.info("Persistence enabled - sessions will be stored in database")
+    log.info("Checking database migrations...")
+
+    _run_community_migrations(database_url)
+    _run_enterprise_migrations(component, database_url)
+
+
+def _get_app_config(component: "WebUIBackendComponent") -> dict:
+    webui_app = component.get_app()
+    app_config = {}
+    if webui_app:
+        app_config = getattr(webui_app, "app_config", {})
+        if app_config is None:
+            log.warning("webui_app.app_config is None, using empty dict.")
+            app_config = {}
+    else:
+        log.warning("Could not get webui_app from component. Using empty app_config.")
+    return app_config
+
+
+def _create_api_config(app_config: dict, database_url: str) -> dict:
+    return {
+        "external_auth_service_url": app_config.get(
+            "external_auth_service_url", "http://localhost:8080"
+        ),
+        "external_auth_callback_uri": app_config.get(
+            "external_auth_callback_uri", "http://localhost:8000/api/v1/auth/callback"
+        ),
+        "external_auth_provider": app_config.get("external_auth_provider", "azure"),
+        "frontend_use_authorization": app_config.get(
+            "frontend_use_authorization", False
+        ),
+        "frontend_redirect_url": app_config.get(
+            "frontend_redirect_url", "http://localhost:3000"
+        ),
+        "persistence_enabled": database_url is not None,
+    }
+
+
+def setup_dependencies(component: "WebUIBackendComponent", database_url: str = None):
+    """
+    This function initializes the simplified architecture while maintaining full
+    backward compatibility with existing API contracts.
+
+    If database_url is None, runs in compatibility mode with in-memory sessions.
+    """
+    dependencies.set_component_instance(component)
 
-    # Add middleware
+    if database_url:
+        _setup_database(component, database_url)
+    else:
+        log.warning(
+            "No database URL provided - using in-memory session storage (data not persisted across restarts)"
+        )
+        log.info("This maintains backward compatibility for existing SAM installations")
+
+    app_config = _get_app_config(component)
+    api_config_dict = _create_api_config(app_config, database_url)
+
+    dependencies.set_api_config(api_config_dict)
+    log.info("API configuration extracted and stored.")
+
+    _setup_middleware(component)
+    _setup_routers()
+    _setup_static_files()
+
+
+def _setup_middleware(component: "WebUIBackendComponent") -> None:
     allowed_origins = component.get_cors_origins()
     app.add_middleware(
         CORSMiddleware,
@@ -459,54 +442,33 @@ def setup_dependencies(component: "WebUIBackendComponent", database_url: str = N
     app.add_middleware(SessionMiddleware, secret_key=session_manager.secret_key)
     log.info("SessionMiddleware added.")
 
-    app.add_middleware(AuthMiddleware, component=component)
+    auth_middleware_class = _create_auth_middleware(component)
+    app.add_middleware(auth_middleware_class, component=component)
     log.info("AuthMiddleware added.")
 
-    # Mount API routers
+
+def _setup_routers() -> None:
     api_prefix = "/api/v1"
 
-    # Mount persistence-aware controllers (your original controllers with full functionality)
-    # These provide the complete API surface with database persistence
-    app.include_router(
-        session_router, prefix=api_prefix, tags=["Sessions"]
-    )  # Provides /api/v1/sessions/* endpoints
-    app.include_router(
-        user_router, prefix=f"{api_prefix}/users", tags=["Users"]
-    )  # Provides /api/v1/users/me
-    app.include_router(
-        task_router, prefix=f"{api_prefix}/tasks", tags=["Tasks"]
-    )  # Provides /api/v1/tasks/send, /subscribe, /cancel
-
-    # Mount new A2A SDK routers with different paths to avoid conflicts
+    app.include_router(session_router, prefix=api_prefix, tags=["Sessions"])
+    app.include_router(user_router, prefix=f"{api_prefix}/users", tags=["Users"])
+    app.include_router(task_router, prefix=f"{api_prefix}/tasks", tags=["Tasks"])
     app.include_router(config.router, prefix=api_prefix, tags=["Config"])
     app.include_router(agent_cards.router, prefix=api_prefix, tags=["Agent Cards"])
-    # New A2A message endpoints (non-conflicting paths)
-    app.include_router(
-        tasks.router, prefix=api_prefix, tags=["A2A Messages"]
-    )  # Provides /api/v1/message:send, /message:stream
-    # Note: We only use the full-featured session_router (from api/controllers/session_controller.py)
-    # which provides complete session management with database persistence
+    app.include_router(tasks.router, prefix=api_prefix, tags=["A2A Messages"])
     app.include_router(sse.router, prefix=f"{api_prefix}/sse", tags=["SSE"])
-    app.include_router(
-        artifacts.router, prefix=f"{api_prefix}/artifacts", tags=["Artifacts"]
-    )
-    app.include_router(
-        visualization.router,
-        prefix=f"{api_prefix}/visualization",
-        tags=["Visualization"],
-    )
-    app.include_router(
-        people.router,
-        prefix=api_prefix,
-        tags=["People"],
-    )
+    app.include_router(artifacts.router, prefix=f"{api_prefix}/artifacts", tags=["Artifacts"])
+    app.include_router(visualization.router, prefix=f"{api_prefix}/visualization", tags=["Visualization"])
+    app.include_router(people.router, prefix=api_prefix, tags=["People"])
     app.include_router(auth.router, prefix=api_prefix, tags=["Auth"])
     log.info("Legacy routers mounted for endpoints not yet migrated")
 
-    # Mount static files
+
+def _setup_static_files() -> None:
     current_dir = os.path.dirname(os.path.abspath(__file__))
     root_dir = Path(os.path.normpath(os.path.join(current_dir, "..", "..")))
     static_files_dir = Path.joinpath(root_dir, "client", "webui", "frontend", "static")
+
     if not os.path.isdir(static_files_dir):
         log.warning(
             "Static files directory '%s' not found. Frontend may not be served.",