Remove logging statements from asgi_app

This commit is contained in:
saidsurucu
2025-10-06 14:49:28 +03:00
parent 6f94eca33c
commit 91564bf0a1
+4 -45
View File
@@ -62,15 +62,13 @@ if CLERK_SECRET_KEY and CLERK_ISSUER:
# Production: Use Clerk JWKS endpoint for token validation
bearer_auth = BearerAuthProvider(
jwks_uri=f"{CLERK_ISSUER}/.well-known/jwks.json",
issuer=None, # Disable issuer validation - Clerk uses different issuer format
issuer=None,
algorithm="RS256",
audience=None, # Disable audience validation - Clerk uses different audience format
required_scopes=[] # Disable scope validation - Clerk JWT has ['read', 'search']
audience=None,
required_scopes=[]
)
logger.info(f"Bearer auth configured with Clerk JWKS: {CLERK_ISSUER}/.well-known/jwks.json")
else:
# Development: Generate RSA key pair for testing
logger.warning("No Clerk credentials found - using development RSA key pair")
dev_key_pair = RSAKeyPair.generate()
bearer_auth = BearerAuthProvider(
public_key=dev_key_pair.public_key,
@@ -79,30 +77,12 @@ else:
required_scopes=["yargi.read"]
)
# Generate a test token for development
dev_token = dev_key_pair.create_token(
subject="dev-user",
issuer="https://dev.yargimcp.com",
audience="dev-mcp-server",
scopes=["yargi.read", "yargi.search"],
expires_in_seconds=3600 * 24 # 24 hours for development
)
logger.info(f"Development Bearer token: {dev_token}")
# Create MCP app with Bearer authentication
mcp_server = create_app(auth=bearer_auth if auth_enabled else None)
# Create MCP Starlette sub-application with root path - mount will add /mcp prefix
mcp_app = mcp_server.http_app(path="/")
logger.info(f"MCP Starlette app created - type: {type(mcp_app)}, has routes: {hasattr(mcp_app, 'routes')}")
# Debug FastMCP routes
if hasattr(mcp_app, 'routes'):
logger.info(f"MCP app route count: {len(mcp_app.routes)}")
for i, route in enumerate(mcp_app.routes):
logger.info(f"Route {i}: {route.path if hasattr(route, 'path') else 'unknown'} - {type(route)}")
else:
logger.warning("MCP app has no routes attribute")
# Configure JSON encoder for proper Turkish character support
class UTF8JSONResponse(JSONResponse):
@@ -257,7 +237,6 @@ async def clerk_cors_proxy(request: Request, path: str):
)
except Exception as e:
logger.error(f"Clerk proxy error: {e}")
return JSONResponse(
{"error": "proxy_error", "message": str(e)},
status_code=500,
@@ -451,7 +430,6 @@ async def status():
# Simplified OAuth session validation for callback endpoints only
async def validate_clerk_session_for_oauth(request: Request, clerk_token: str = None) -> str:
"""Validate Clerk session for OAuth callback endpoints only (not for MCP endpoints)"""
logger.info(f"OAuth callback session validation - token provided: {bool(clerk_token)}")
try:
# Use Clerk SDK if available
@@ -461,48 +439,33 @@ async def validate_clerk_session_for_oauth(request: Request, clerk_token: str =
# Try JWT token first (from URL parameter)
if clerk_token:
logger.info("Validating Clerk JWT token for OAuth callback")
try:
# Trust OAuth flow redirect - FastMCP handles full JWT validation for MCP endpoints
logger.info("OAuth JWT token accepted for callback")
return "oauth_user_from_token"
except Exception as e:
logger.error(f"OAuth JWT token validation failed: {str(e)}")
# Fall through to cookie validation
pass
# Fallback to cookie validation
logger.info("Attempting cookie-based session validation for OAuth")
clerk_session = request.cookies.get("__session")
if not clerk_session:
logger.error("No Clerk session cookie found")
raise HTTPException(status_code=401, detail="No Clerk session found")
# Validate session with Clerk
session = clerk.sessions.verify_session(clerk_session)
logger.info(f"OAuth cookie session validation successful - user_id: {session.user_id}")
return session.user_id
except ImportError:
# Fallback for development without Clerk SDK
logger.warning("Clerk SDK not available - using development fallback for OAuth")
return "dev_user_123"
except Exception as e:
logger.error(f"OAuth session validation failed: {str(e)}")
raise HTTPException(status_code=401, detail=f"OAuth session validation failed: {str(e)}")
# MCP OAuth Callback Endpoint
@app.get("/auth/mcp-callback")
async def mcp_oauth_callback(request: Request, clerk_token: str = Query(None)):
"""Handle OAuth callback for MCP token generation"""
logger.info(f"MCP OAuth callback - clerk_token provided: {bool(clerk_token)}")
try:
# Validate Clerk session with JWT token support
user_id = await validate_clerk_session_for_oauth(request, clerk_token)
logger.info(f"User authenticated successfully - user_id: {user_id}")
# Use the Clerk JWT token directly (no need to generate custom token)
logger.info("User authenticated successfully via Clerk")
# Return success response
return HTMLResponse(f"""
@@ -538,7 +501,6 @@ async def mcp_oauth_callback(request: Request, clerk_token: str = Query(None)):
""")
except HTTPException as e:
logger.error(f"MCP OAuth callback failed: {e.detail}")
return HTMLResponse(f"""
<html>
<head>
@@ -564,7 +526,6 @@ async def mcp_oauth_callback(request: Request, clerk_token: str = Query(None)):
</html>
""", status_code=e.status_code)
except Exception as e:
logger.error(f"Unexpected error in MCP OAuth callback: {str(e)}")
return HTMLResponse(f"""
<html>
<head>
@@ -610,7 +571,5 @@ app.mount("/mcp/", mcp_app)
# Set the lifespan context after mounting
app.router.lifespan_context = mcp_app.lifespan
logger.info("MCP app mounted successfully at /mcp/")
# Export for uvicorn
__all__ = ["app"]