jason/google-mcp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3 auth middleware fix

Browse Source
This commit is contained in:
Taylor Wilsdon
2026-02-13 10:20:39 -05:00
parent a3107e900b
commit 0075e8338f
7 changed files with 1086 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
auth/service_decorator.py
View File

@@ -59,7 +59,7 @@ logger = logging.getLogger(__name__)
# Authentication helper functions
def _get_auth_context(
async def _get_auth_context(
tool_name: str,
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
"""
@@ -73,8 +73,8 @@ def _get_auth_context(
if not ctx:
return None, None, None
authenticated_user = ctx.get_state("authenticated_user_email")
auth_method = ctx.get_state("authenticated_via")
authenticated_user = await ctx.get_state("authenticated_user_email")
auth_method = await ctx.get_state("authenticated_via")
mcp_session_id = ctx.session_id if hasattr(ctx, "session_id") else None
if mcp_session_id:
@@ -604,7 +604,7 @@ def require_google_service(
# which does not include 'service'.
# Get authentication context early to determine OAuth mode
authenticated_user, auth_method, mcp_session_id = _get_auth_context(
authenticated_user, auth_method, mcp_session_id = await _get_auth_context(
func.__name__
)
@@ -751,7 +751,7 @@ def require_multiple_services(service_configs: List[Dict[str, Any]]):
async def wrapper(*args, **kwargs):
# Get authentication context early
tool_name = func.__name__
authenticated_user, _, mcp_session_id = _get_auth_context(tool_name)
authenticated_user, _, mcp_session_id = await _get_auth_context(tool_name)
# Extract user_google_email based on OAuth mode
if is_oauth21_enabled():