Merge pull request #70 from auth0-samples/fix-ms-agent-framework-pyton-connected-account

Connected account fix for MS Agent Framework + Python sample project

Author: andychiare

call-apis-on-users-behalf/others-api/ms-agent-framework-vault-token-py/auth0.py

@@ -12,6 +12,7 @@
         "scope": "openid profile email offline_access",
         "prompt": "consent"
     },
+    mount_connected_account_routes=True,
     app_base_url=settings.app_base_url,
     secret=settings.SESSION_SECRET)
 

call-apis-on-users-behalf/others-api/ms-agent-framework-vault-token-py/main.py

@@ -1,10 +1,11 @@
-from fastapi import FastAPI, Request, Response, Depends
+from fastapi import FastAPI, Request, HTTPException, Response, Depends
 from fastapi.responses import FileResponse, RedirectResponse
 from fastapi.staticfiles import StaticFiles
 from pydantic import BaseModel
 from messenger_agent import create_and_send_message
 from starlette.middleware.sessions import SessionMiddleware
 from auth0_fastapi.server.routes import router, register_auth_routes
+from auth0_fastapi.errors import AccessTokenForConnectionError
 from auth0 import auth0_config, auth0_client
 from config import Settings
 import uvicorn
@@ -43,15 +44,33 @@ async def submit_prompt(
     response: Response,
     auth_session = Depends(auth0_client.require_session)
 ):
+    try:
+        store_options={"request": request, "response": response}
+        gmail_token = await auth0_client.client.get_access_token_for_connection(
+            {"connection": "google-oauth2"}, 
+            store_options=store_options
+        )
 
-    store_options={"request": request, "response": response}
-    gmail_token = await auth0_client.client.get_access_token_for_connection({"connection": "google-oauth2"}, store_options=store_options)
-
-    result = await create_and_send_message(
-        data.prompt,
-        gmail_token
-    )
-    return {"response": result}
+        result = await create_and_send_message(
+            data.prompt,
+            gmail_token
+        )
+        return {"response": result}
+    
+    except AccessTokenForConnectionError:
+        # User hasn't connected their Google account yet
+        # Instruct frontend to POST to /auth/connect to initiate Connected Accounts flow
+        raise HTTPException(
+            status_code=403,
+            detail={
+            "error": "google_account_not_connected",
+            "message": "Please connect your Google account first",
+            "connect_endpoint": "/auth/connect",
+            "connect_params": {
+                "connection": "google-oauth2"
+                }
+            }
+        )
 
 
 if __name__ == "__main__":

call-apis-on-users-behalf/others-api/ms-agent-framework-vault-token-py/messenger_agent.py

@@ -38,4 +38,4 @@ async def create_and_send_message(prompt: str, gmail_token: str) -> str:
 
     email_tool = create_email_sender(gmail_token)
     response = await agent.run(prompt, tools=[email_tool])
-    return response.messages[0].contents[0].text
+    return response.text

call-apis-on-users-behalf/others-api/ms-agent-framework-vault-token-py/requirements.txt

@@ -3,6 +3,6 @@ uvicorn>=0.15.0
 pydantic>=2.0.0
 pydantic-settings>=2.0.0
 agent-framework
-auth0-fastapi>=0.3.0
+auth0-fastapi>=1.0.0b5
 starlette
 itsdangerous

call-apis-on-users-behalf/others-api/ms-agent-framework-vault-token-py/static/app.js

@@ -16,7 +16,20 @@ async function sendMessage() {
         });
 
         const data = await response.json();
-        messagesContainer.innerHTML += `<div class="alert alert-secondary" style="max-width:80%">${data.response}</div>`;
+        
+        // Handle connected account error
+        if (response.status == 403 && data.detail?.error === 'google_account_not_connected') {
+            messagesContainer.innerHTML += `<div class="alert alert-warning" style="max-width:80%">${data.detail.message}</div>`;
+            
+            // Redirect to /auth/connect to initiate the Connected Accounts flow
+            const connection = data.detail.connect_params?.connection || 'google-oauth2';
+            window.location.href = `/auth/connect?connection=${connection}`;
+            return;
+        }
+        
+        // Display the response or error
+        const messageText = data.response || data.message || 'An error occurred';
+        messagesContainer.innerHTML += `<div class="alert alert-secondary" style="max-width:80%">${messageText}</div>`;
     }
 }