Enhanced Session Management better guardrails

2025-08-03 15:51:04 -04:00
parent ff9b7ecd07
commit 71e2f1ba3e
4 changed files with 493 additions and 71 deletions
--- a/auth/fastmcp_google_auth.py
+++ b/auth/fastmcp_google_auth.py
@@ -84,11 +84,23 @@ class GoogleWorkspaceAuthProvider(AuthProvider):
                    store = get_oauth21_session_store()
                    session_id = f"google_{access_token.claims.get('sub', 'unknown')}"
                    
+                    # Try to get FastMCP session ID for binding
+                    mcp_session_id = None
+                    try:
+                        from fastmcp.server.dependencies import get_context
+                        ctx = get_context()
+                        if ctx and hasattr(ctx, 'session_id'):
+                            mcp_session_id = ctx.session_id
+                            logger.debug(f"Binding MCP session {mcp_session_id} to user {user_email}")
+                    except Exception:
+                        pass
+                    
                    store.store_session(
                        user_email=user_email,
                        access_token=token,
                        scopes=access_token.scopes or [],
-                        session_id=session_id
+                        session_id=session_id,
+                        mcp_session_id=mcp_session_id
                    )
                
                logger.debug(f"Successfully verified Google token for user: {user_email}")