gmail auth with URI callback

scoutLLM.py

@@ -342,17 +342,22 @@ from google.auth.transport.requests import Request
 import os
 import json
 
+
 def get_gmail_credentials():
+    global oauth_flow
+    
     creds = None
-    token_path = "token.json"
     
     # Fetch client secrets from environment variables
-    client_id = os.environ.get("HF_GMAIL_EMAIL")  # Your client ID
-    client_secret = os.environ.get("HF_GMAIL_PASSWORD")  # Your client secret
+    client_id = os.environ.get("HF_GOOGLE_CLIENT_ID")
+    client_secret = os.environ.get("HF_GOOGLE_CLIENT_SECRET")
     
     if not client_id or not client_secret:
         raise ValueError("Missing Gmail OAuth credentials in environment variables.")
     
+    # Define the redirect URI for your Hugging Face space
+    redirect_uri = "https://huggingface.co/spaces/alx-d/scout/oauth2callback"
+    
     # Load credentials from token.json if available
     if os.path.exists(token_path):
         creds = Credentials.from_authorized_user_file(token_path)
@@ -360,40 +365,30 @@ def get_gmail_credentials():
     # If no valid credentials, log in via OAuth
     if not creds or not creds.valid:
         if creds and creds.expired and creds.refresh_token:
-            creds.refresh(Request())  # Refresh token if expired
+            creds.refresh(Request())
         else:
             client_config = {
-                "installed": {
+                "web": {
                     "client_id": client_id,
-                    "project_id": "pendulum-8172e",
+                    "project_id": "your_project_id",
                     "auth_uri": "https://accounts.google.com/o/oauth2/auth",
                     "token_uri": "https://oauth2.googleapis.com/token",
                     "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
                     "client_secret": client_secret,
-                    "redirect_uris": ["urn:ietf:wg:oauth:2.0:oob"]
+                    "redirect_uris": [redirect_uri]
                 }
             }
-            flow = InstalledAppFlow.from_client_config(client_config, SCOPES)
-
-            # Manually construct the URL with redirect_uri
-            auth_url, _ = flow.authorization_url(
+            
+            oauth_flow = Flow.from_client_config(client_config, SCOPES, redirect_uri=redirect_uri)
+            auth_url, _ = oauth_flow.authorization_url(
                 prompt='consent',
                 access_type='offline',
                 include_granted_scopes='true'
             )
-            auth_url += "&redirect_uri=urn:ietf:wg:oauth:2.0:oob"  # Explicitly add redirect_uri
             
-            print("Go to the following URL in your browser:\n", auth_url)
-            code = input("Enter the authorization code: ").strip()
-            flow.fetch_token(code=code)
-            creds = flow.credentials
-        
-        # Save the credentials for later use
-        with open(token_path, "w") as token_file:
-            token_file.write(creds.to_json())
-
-    return creds
-
+            return None, auth_url
+    
+    return creds, None
 
 # Add email sending function  
 def send_email(email_address, content, is_formatted=True):
@@ -613,4 +608,27 @@ with gr.Blocks() as app:
 
 if __name__ == "__main__":
     debug_print("Launching Gradio UI...")
-    app.queue().launch(share=False)
+    app.queue().launch(share=False)
+    
+
+@app.route("/oauth2callback")
+def oauth2callback(request):
+    global oauth_flow
+    
+    # Get the authorization code from the request
+    code = request.query_params.get("code")
+    if not code:
+        return "Authorization code missing"
+    
+    try:
+        # Exchange the authorization code for credentials
+        oauth_flow.fetch_token(code=code)
+        creds = oauth_flow.credentials
+        
+        # Save the credentials
+        with open(token_path, "w") as token_file:
+            token_file.write(creds.to_json())
+            
+        return "Authentication successful! You can close this window and return to the application."
+    except Exception as e:
+        return f"Error during authentication: {str(e)}"