update server logs

2026-05-02 05:30:21 +00:00 · 2025-10-16 21:05:09 +05:30 · 2025-10-16 21:05:09 +05:30 · 40779bf1e5
commit 40779bf1e5
parent 6eed287dcb
43 changed files with 2354 additions and 1808 deletions
--- a/server/app/controller/oauth/oauth_controller.py
+++ b/server/app/controller/oauth/oauth_controller.py
@ -1,58 +1,81 @@
-from fastapi import APIRouter, Request, HTTPException
-from fastapi.responses import RedirectResponse, JSONResponse, HTMLResponse
-from app.component.environment import env
-from app.component.oauth_adapter import OauthCallbackPayload, get_oauth_adapter
-from typing import Optional
-
-router = APIRouter(prefix="/oauth", tags=["Oauth Servers"])
-
-
-@router.get("/{app}/login", name="OAuth Login Redirect")
-def oauth_login(app: str, request: Request, state: Optional[str] = None):
-    try:
-        callback_url = str(request.url_for("OAuth Callback", app=app))
-        if callback_url.startswith("http://"):
-            callback_url = "https://" + callback_url[len("http://") :]
-        adapter = get_oauth_adapter(app, callback_url)
-        url = adapter.get_authorize_url(state)
-        if not url:
-            raise HTTPException(status_code=400, detail="Failed to generate authorization URL")
-        return RedirectResponse(str(url))
-    except Exception as e:
-        raise HTTPException(status_code=400, detail=str(e))
-
-
-@router.get("/{app}/callback", name="OAuth Callback")
-def oauth_callback(app: str, request: Request, code: Optional[str] = None, state: Optional[str] = None):
-    if not code:
-        raise HTTPException(status_code=400, detail="Missing code parameter")
-    redirect_url = f"eigent://callback/oauth?provider={app}&code={code}&state={state}"
-    html_content = f"""
-    <html>
-        <head>
-            <title>OAuth Callback</title>
-        </head>
-        <body>
-            <script type='text/javascript'>
-                window.location.href = '{redirect_url}';
-            </script>
-            <p>Redirecting, please wait...</p>
-            <button onclick='window.close()'>Close this window</button>
-        </body>
-    </html>
-    """
-    return HTMLResponse(content=html_content)
-
-
-@router.post("/{app}/token", name="OAuth Fetch Token")
-def fetch_token(app: str, request: Request, data: OauthCallbackPayload):
-    try:
-        callback_url = str(request.url_for("OAuth Callback", app=app))
-        if callback_url.startswith("http://"):
-            callback_url = "https://" + callback_url[len("http://") :]
-
-        adapter = get_oauth_adapter(app, callback_url)
-        token_data = adapter.fetch_token(data.code)
-        return JSONResponse(token_data)
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=str(e))
+from fastapi import APIRouter, Request, HTTPException
+from fastapi.responses import RedirectResponse, JSONResponse, HTMLResponse
+from app.component.environment import env
+from app.component.oauth_adapter import OauthCallbackPayload, get_oauth_adapter
+from typing import Optional
+from utils import traceroot_wrapper as traceroot
+
+logger = traceroot.get_logger("server_oauth_controller")
+
+router = APIRouter(prefix="/oauth", tags=["Oauth Servers"])
+
+
+@router.get("/{app}/login", name="OAuth Login Redirect")
+@traceroot.trace()
+def oauth_login(app: str, request: Request, state: Optional[str] = None):
+    """Redirect user to OAuth provider's authorization endpoint."""
+    try:
+        callback_url = str(request.url_for("OAuth Callback", app=app))
+        if callback_url.startswith("http://"):
+            callback_url = "https://" + callback_url[len("http://") :]
+        
+        adapter = get_oauth_adapter(app, callback_url)
+        url = adapter.get_authorize_url(state)
+        
+        if not url:
+            logger.error("Failed to generate authorization URL", extra={"provider": app, "callback_url": callback_url})
+            raise HTTPException(status_code=400, detail="Failed to generate authorization URL")
+        
+        logger.info("OAuth login initiated", extra={"provider": app})
+        return RedirectResponse(str(url))
+    except HTTPException:
+        raise
+    except Exception as e:
+        logger.error("OAuth login failed", extra={"provider": app, "error": str(e)}, exc_info=True)
+        raise HTTPException(status_code=400, detail=str(e))
+
+
+@router.get("/{app}/callback", name="OAuth Callback")
+@traceroot.trace()
+def oauth_callback(app: str, request: Request, code: Optional[str] = None, state: Optional[str] = None):
+    """Handle OAuth provider callback and redirect to client app."""
+    if not code:
+        logger.warning("OAuth callback missing code", extra={"provider": app})
+        raise HTTPException(status_code=400, detail="Missing code parameter")
+    
+    logger.info("OAuth callback received", extra={"provider": app, "has_state": state is not None})
+    
+    redirect_url = f"eigent://callback/oauth?provider={app}&code={code}&state={state}"
+    html_content = f"""
+    <html>
+        <head>
+            <title>OAuth Callback</title>
+        </head>
+        <body>
+            <script type='text/javascript'>
+                window.location.href = '{redirect_url}';
+            </script>
+            <p>Redirecting, please wait...</p>
+            <button onclick='window.close()'>Close this window</button>
+        </body>
+    </html>
+    """
+    return HTMLResponse(content=html_content)
+
+
+@router.post("/{app}/token", name="OAuth Fetch Token")
+@traceroot.trace()
+def fetch_token(app: str, request: Request, data: OauthCallbackPayload):
+    """Exchange authorization code for access token."""
+    try:
+        callback_url = str(request.url_for("OAuth Callback", app=app))
+        if callback_url.startswith("http://"):
+            callback_url = "https://" + callback_url[len("http://") :]
+
+        adapter = get_oauth_adapter(app, callback_url)
+        token_data = adapter.fetch_token(data.code)
+        logger.info("OAuth token fetched", extra={"provider": app})
+        return JSONResponse(token_data)
+    except Exception as e:
+        logger.error("OAuth token fetch failed", extra={"provider": app, "error": str(e)}, exc_info=True)
+        raise HTTPException(status_code=500, detail=str(e))