Merge branch 'main' of https://github.com/taylorwilsdon/google_workspace_mcp into credential-provider
This commit is contained in:
@@ -30,7 +30,7 @@ logger = logging.getLogger(__name__)
|
||||
async def handle_oauth_authorize(request: Request):
|
||||
"""Common handler for OAuth authorization proxy."""
|
||||
origin = request.headers.get("origin")
|
||||
|
||||
|
||||
if request.method == "OPTIONS":
|
||||
cors_headers = get_development_cors_headers(origin)
|
||||
return JSONResponse(content={}, headers=cors_headers)
|
||||
@@ -69,7 +69,7 @@ async def handle_oauth_authorize(request: Request):
|
||||
async def handle_proxy_token_exchange(request: Request):
|
||||
"""Common handler for OAuth token exchange proxy with comprehensive error handling."""
|
||||
origin = request.headers.get("origin")
|
||||
|
||||
|
||||
if request.method == "OPTIONS":
|
||||
cors_headers = get_development_cors_headers(origin)
|
||||
return JSONResponse(content={}, headers=cors_headers)
|
||||
@@ -201,7 +201,7 @@ async def handle_proxy_token_exchange(request: Request):
|
||||
"Cache-Control": "no-store"
|
||||
}
|
||||
response_headers.update(cors_headers)
|
||||
|
||||
|
||||
return JSONResponse(
|
||||
status_code=response.status,
|
||||
content=response_data,
|
||||
@@ -228,7 +228,7 @@ async def handle_oauth_protected_resource(request: Request):
|
||||
Handle OAuth protected resource metadata requests.
|
||||
"""
|
||||
origin = request.headers.get("origin")
|
||||
|
||||
|
||||
# Handle preflight
|
||||
if request.method == "OPTIONS":
|
||||
cors_headers = get_development_cors_headers(origin)
|
||||
@@ -262,7 +262,7 @@ async def handle_oauth_protected_resource(request: Request):
|
||||
"Cache-Control": "public, max-age=3600"
|
||||
}
|
||||
response_headers.update(cors_headers)
|
||||
|
||||
|
||||
return JSONResponse(
|
||||
content=metadata,
|
||||
headers=response_headers
|
||||
@@ -274,13 +274,13 @@ async def handle_oauth_authorization_server(request: Request):
|
||||
Handle OAuth authorization server metadata.
|
||||
"""
|
||||
origin = request.headers.get("origin")
|
||||
|
||||
|
||||
if request.method == "OPTIONS":
|
||||
cors_headers = get_development_cors_headers(origin)
|
||||
return JSONResponse(content={}, headers=cors_headers)
|
||||
|
||||
config = get_oauth_config()
|
||||
|
||||
|
||||
# Get authorization server metadata from centralized config
|
||||
# Pass scopes directly to keep all metadata generation in one place
|
||||
metadata = config.get_authorization_server_metadata(scopes=get_current_scopes())
|
||||
@@ -294,7 +294,7 @@ async def handle_oauth_authorization_server(request: Request):
|
||||
"Cache-Control": "public, max-age=3600"
|
||||
}
|
||||
response_headers.update(cors_headers)
|
||||
|
||||
|
||||
return JSONResponse(
|
||||
content=metadata,
|
||||
headers=response_headers
|
||||
@@ -304,7 +304,7 @@ async def handle_oauth_authorization_server(request: Request):
|
||||
async def handle_oauth_client_config(request: Request):
|
||||
"""Common handler for OAuth client configuration."""
|
||||
origin = request.headers.get("origin")
|
||||
|
||||
|
||||
if request.method == "OPTIONS":
|
||||
cors_headers = get_development_cors_headers(origin)
|
||||
return JSONResponse(content={}, headers=cors_headers)
|
||||
@@ -328,7 +328,6 @@ async def handle_oauth_client_config(request: Request):
|
||||
"client_uri": config.base_url,
|
||||
"redirect_uris": [
|
||||
f"{config.base_url}/oauth2callback",
|
||||
"http://localhost:5173/auth/callback"
|
||||
],
|
||||
"grant_types": ["authorization_code", "refresh_token"],
|
||||
"response_types": ["code"],
|
||||
@@ -347,7 +346,7 @@ async def handle_oauth_client_config(request: Request):
|
||||
async def handle_oauth_register(request: Request):
|
||||
"""Common handler for OAuth dynamic client registration with comprehensive error handling."""
|
||||
origin = request.headers.get("origin")
|
||||
|
||||
|
||||
if request.method == "OPTIONS":
|
||||
cors_headers = get_development_cors_headers(origin)
|
||||
return JSONResponse(content={}, headers=cors_headers)
|
||||
|
||||
Reference in New Issue
Block a user