Update pages/oauth_callback.py

pages/oauth_callback.py

@@ -1,4 +1,4 @@
-# pages/oauth_callback.py - WORKING VERSION
+# pages/oauth_callback.py - UPDATED FOR Streamlit 1.28+
 import streamlit as st
 import requests
 import os
@@ -6,64 +6,104 @@ from datetime import datetime
 
 st.set_page_config(page_title="Authenticating...", page_icon="⏳")
 
-# Get Google credentials from environment
+# Get credentials from environment
 GOOGLE_CLIENT_ID = os.getenv("GOOGLE_CLIENT_ID")
 GOOGLE_CLIENT_SECRET = os.getenv("GOOGLE_CLIENT_SECRET")
 
-st.title("🔐 Authenticating...")
-st.write("Please wait while we log you in with Google.")
+# Show loading screen
+st.markdown("""
+<style>
+    .spinner {
+        border: 4px solid #f3f3f3;
+        border-top: 4px solid #4285F4;
+        border-radius: 50%;
+        width: 40px;
+        height: 40px;
+        animation: spin 2s linear infinite;
+        margin: 20px auto;
+    }
+    @keyframes spin {
+        0% { transform: rotate(0deg); }
+        100% { transform: rotate(360deg); }
+    }
+</style>
+<div style="text-align: center; padding: 50px;">
+    <h1>🔐 Authenticating...</h1>
+    <p>Please wait while we log you in with Google.</p>
+    <div class="spinner"></div>
+</div>
+""", unsafe_allow_html=True)
 
-# Get the authorization code from URL
+# Process the OAuth callback
 try:
-    query_params = st.experimental_get_query_params()
+    # Get the authorization code from URL - USING NEW METHOD
+    # Try new method first, fallback to old
+    try:
+        query_params = st.query_params
+    except AttributeError:
+        query_params = st.experimental_get_query_params()
     
-    if "code" in query_params:
-        code = query_params["code"][0]
+    if "code" in query_params and GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET:
+        # Extract code (different format in old vs new)
+        if isinstance(query_params, dict) and "get" in dir(query_params):
+            # New method returns dict
+            code = query_params.get("code", "")
+        else:
+            # Old method returns dict with lists
+            code_list = query_params.get("code", [])
+            code = code_list[0] if code_list else ""
         
-        with st.spinner("Exchanging code for token..."):
-            # Exchange code for access token
-            token_url = "https://oauth2.googleapis.com/token"
-            data = {
-                "client_id": GOOGLE_CLIENT_ID,
-                "client_secret": GOOGLE_CLIENT_SECRET,
-                "code": code,
-                "redirect_uri": "https://refat81-social-media-data-extractor-chatbot.hf.space/oauth_callback",
-                "grant_type": "authorization_code"
-            }
+        if not code:
+            st.error("❌ No authorization code received")
+            st.stop()
+        
+        # Exchange code for token
+        token_url = "https://oauth2.googleapis.com/token"
+        data = {
+            "client_id": GOOGLE_CLIENT_ID,
+            "client_secret": GOOGLE_CLIENT_SECRET,
+            "code": code,
+            "redirect_uri": "https://refat81-social-media-data-extractor-chatbot.hf.space/oauth_callback",
+            "grant_type": "authorization_code"
+        }
+        
+        response = requests.post(token_url, data=data)
+        tokens = response.json()
+        
+        if "access_token" in tokens:
+            # Get user info
+            userinfo_url = "https://www.googleapis.com/oauth2/v3/userinfo"
+            headers = {"Authorization": f"Bearer {tokens['access_token']}"}
+            user_response = requests.get(userinfo_url, headers=headers)
+            user_info = user_response.json()
+            
+            # Store in session
+            st.session_state.user_info = user_info
+            st.session_state.authenticated = True
+            st.session_state.login_time = datetime.now()
             
-            response = requests.post(token_url, data=data)
-            tokens = response.json()
+            # Show success message
+            st.success(f"✅ Login successful! Welcome, {user_info.get('name', 'User')}!")
             
-            if "access_token" in tokens:
-                # Get user info from Google
-                userinfo_url = "https://www.googleapis.com/oauth2/v3/userinfo"
-                headers = {"Authorization": f"Bearer {tokens['access_token']}"}
-                user_response = requests.get(userinfo_url, headers=headers)
-                user_info = user_response.json()
-                
-                # Store user info in session
-                st.session_state.user_info = user_info
-                st.session_state.authenticated = True
-                st.session_state.login_time = datetime.now()
-                
-                st.success("✅ Login successful!")
-                st.write(f"Welcome, {user_info.get('name', 'User')}!")
-                
-                # Redirect to main app
-                st.markdown("""
-                <script>
-                    setTimeout(function() {
-                        window.location.href = "/";
-                    }, 2000);
-                </script>
-                """, unsafe_allow_html=True)
-                
-            else:
-                st.error("❌ Authentication failed")
-                st.write("Error details:", tokens)
+            # Auto-redirect to main page
+            st.markdown("""
+            <script>
+                setTimeout(function() {
+                    window.location.href = "/";
+                }, 2000);
+            </script>
+            """, unsafe_allow_html=True)
+            
+        else:
+            st.error("❌ Authentication failed. Please try again.")
+            st.write("Error details:", tokens)
+            
+    elif not GOOGLE_CLIENT_ID or not GOOGLE_CLIENT_SECRET:
+        st.error("❌ Server configuration error. Contact administrator.")
+        
     else:
-        st.error("No authorization code received")
+        st.error("❌ No authorization code received. Please try logging in again.")
         
 except Exception as e:
-    st.error(f"Error during authentication: {str(e)}")
+    st.error(f"❌ Error: {str(e)}")
     st.write("Please try logging in again.")