deployed google auth

agentic_implementation/email_mcp_server_oauth.py

@@ -12,7 +12,9 @@ import os
 from typing import Dict, List
 from datetime import datetime, timedelta
 from dotenv import load_dotenv
-
+from fastapi.responses import HTMLResponse
+from fastapi import FastAPI,Request
+from fastapi.routing import APIRoute
 # Import OAuth-enabled modules
 # from tools import extract_query_info, analyze_emails
 from gmail_api_scraper import GmailAPIScraper
@@ -22,6 +24,7 @@ from logger import logger
 load_dotenv()
 
 if not oauth_manager.client_secrets_file.exists():
+    print("Setupy")
     oauth_manager.setup_client_secrets(
         os.environ["GOOGLE_CLIENT_ID"],
         os.environ["GOOGLE_CLIENT_SECRET"]
@@ -168,7 +171,7 @@ def authenticate_user() -> str:
                     "instructions": [
                         "Authentication URL has been generated",
                         "Please click the link below to authenticate:",
-                        "1. Click the authentication URL",
+                        "1. Open the authentication URL(auth_url) in a new browser tab",
                         "2. Sign in with your Google account", 
                         "3. Grant Gmail access permissions",
                         "4. You'll be redirected back automatically",
@@ -183,17 +186,6 @@ def authenticate_user() -> str:
                     "message": "Could not start authentication process. Check your OAuth configuration."
                 }
             
-            # result = {
-            #     "success": False,
-            #     "error": "Authentication failed",
-            #     "message": "Please try again or check your internet connection.",
-            #     "instructions": [
-            #         "Make sure you have internet connection",
-            #         "Ensure you complete the authentication in the browser",
-            #         "Try running 'python setup_oauth.py' if problems persist"
-            #     ]
-            # }
-        
         return json.dumps(result, indent=2)
         
     except Exception as e:
@@ -227,7 +219,7 @@ def handle_oauth_callback(auth_code: str) -> str:
             </body>
             </html>
             """
-        
+        print(f"Received OAuth callback with code: {auth_code}")
         success = oauth_manager.complete_hf_spaces_auth(auth_code)
         
         if success:
@@ -779,31 +771,16 @@ demo = gr.TabbedInterface(
     title="📧 Gmail Assistant MCP Server (Multi-Account OAuth)"
 )
 
+app = FastAPI()
+# Add your OAuth callback route
+@app.get("/oauth2callback")
+async def google_oauth_cb(request: Request):
+    code = request.query_params.get("code")
+    print("code:", code)
+    return HTMLResponse(handle_oauth_callback(code))
+
+app = gr.mount_gradio_app(app, demo, path="/")
+
 if __name__ == "__main__":
-    # Set environment variable to enable MCP server
-    import os
-    os.environ["GRADIO_MCP_SERVER"] = "True"
-    
-    # Check authentication status on startup
-    current_account = oauth_manager.get_current_account()
-    all_accounts = oauth_manager.list_accounts()
-    
-    if current_account and oauth_manager.is_authenticated():
-        print(f"✅ Currently authenticated as: {current_account}")
-        if len(all_accounts) > 1:
-            print(f"📱 {len(all_accounts)} total accounts available: {list(all_accounts.keys())}")
-    elif all_accounts:
-        print(f"📱 {len(all_accounts)} stored accounts found: {list(all_accounts.keys())}")
-        print("⚠️  No current account selected. Use the web interface or Claude to switch accounts.")
-    else:
-        print("❌ No authenticated accounts. Users will need to authenticate through the web interface.")
-        print("💡 Or run 'python setup_oauth.py' for initial setup.")
-    
-    # Launch the server
-    demo.launch(share=False)
-    
-    print("\n🚀 MCP Server is running!")
-    print("📍 MCP Endpoint: http://localhost:7860/gradio_api/mcp/sse")
-    print("📖 Copy this URL to your Claude Desktop MCP configuration")
-    print("\n🔗 Web Interface: http://localhost:7860")
-    print("📝 Use the web interface to authenticate and test the tools") 
+    import uvicorn
+    uvicorn.run(app, host="0.0.0.0", port=7860)

agentic_implementation/oauth_manager.py

@@ -195,7 +195,7 @@ class GmailOAuthManager:
             scopes=self.SCOPES
         )
         flow.redirect_uri = self.redirect_uri
-        
+        print("👉 redirect_uri being sent to Google:", self.redirect_uri, flush=True)
         auth_url, _ = flow.authorization_url(
             access_type='offline',
             include_granted_scopes='true',
@@ -236,7 +236,7 @@ class GmailOAuthManager:
             
             # Wait for a reasonable time to see if auth completes
             # This allows the callback to potentially complete the auth
-            timeout = 60  # 1 minute for manual completion
+            timeout = 10  # 1 minute for manual completion
             start_time = time.time()
             
             while (time.time() - start_time) < timeout:
@@ -336,11 +336,12 @@ class GmailOAuthManager:
         
         Returns:
             Redirect URI string
-        """
-        space_id = os.getenv('SPACE_ID')
-        space_author = os.getenv('SPACE_AUTHOR', 'username')
-        return f"https://{space_author}-{space_id}.hf.space/oauth/callback"
+        # """
+        # space_id = os.getenv('SPACE_ID')
+        # space_author = os.getenv('SPACE_AUTHOR', 'username')
+        return redirect_uri
 
+    # For running in a local machine, use this method instead
         
     # def authenticate_interactive(self) -> bool:
     #     """Interactive authentication flow that opens browser
@@ -627,4 +628,4 @@ class GmailOAuthManager:
         return self.current_account_email
 
 # Global OAuth manager instance
-oauth_manager = GmailOAuthManager() 
+oauth_manager = GmailOAuthManager(credentials_dir="secure_data") 

requirements.txt

@@ -9,6 +9,8 @@ requests
 loguru
 python-dateutil
 
+uvicorn
+
 # MCP server support
 mcp