Update app.py

app.py

@@ -8,17 +8,8 @@ import os
 import gradio as gr
 import threading
 import time
-
-# Set essential OAuth environment variables
-os.environ["OAUTH_CLIENT_ID"] = "hf"
-os.environ["OAUTH_CLIENT_SECRET"] = "hf"
-os.environ["OAUTH_AUTHORIZATION_URL"] = "https://huggingface.co/oauth/authorize"
-os.environ["OAUTH_TOKEN_URL"] = "https://huggingface.co/oauth/token"
-os.environ["OAUTH_SCOPES"] = "inference"
-os.environ["OPENID_PROVIDER_URL"] = "https://huggingface.co"
-
 from database_schema import DynamicHighscoresDB
-from auth import HuggingFaceAuth, create_login_ui, setup_auth_handlers
+from auth import HuggingFaceAuth
 from benchmark_selection import BenchmarkSelector, create_benchmark_selection_ui
 from evaluation_queue import EvaluationQueue, create_model_submission_ui
 from leaderboard import Leaderboard, create_leaderboard_ui
@@ -139,19 +130,42 @@ input[type="text"], input[type="password"], textarea {
 }
 """
 
-# Check if the server is running in a HuggingFace Space
-def is_running_in_hf_space():
-    return 'SPACE_ID' in os.environ
-
-# Function to trigger HuggingFace OAuth login
-def trigger_hf_oauth():
-    return """
+# Function to generate a login URL
+def get_login_url():
+    # Get the space host from environment variable
+    space_host = os.environ.get("SPACE_HOST", "localhost:7860")
+    print(f"Space host: {space_host}")
+    
+    # Construct the full redirect URL
+    redirect_uri = f"https://{space_host}/auth/callback"
+    
+    # Create the complete authorization URL
+    auth_url = f"https://huggingface.co/oauth/authorize?client_id=hf&redirect_uri={redirect_uri}&scope=openid%20profile&response_type=code"
+    
+    # Return JavaScript to open the login page
+    return f"""
     <script>
-    // Redirect to HuggingFace Space login
-    window.location.href = window.location.origin + "?__space_auth_callback=true";
+    window.open("{auth_url}", "_blank");
     </script>
     """
 
+# Simple manual authentication check
+def check_user(request: gr.Request):
+    if request:
+        username = request.headers.get("HF-User")
+        if username:
+            # User is logged in via HF Spaces
+            print(f"User logged in: {username}")
+            user = db.get_user_by_username(username)
+            if not user:
+                # Create user if they don't exist
+                print(f"Creating new user: {username}")
+                is_admin = (username == "Quazim0t0")
+                db.add_user(username, username, is_admin)
+                user = db.get_user_by_username(username)
+            return f"Logged in as: {username}", username, gr.update(visible=False), gr.update(visible=True)
+    return "Not logged in", None, gr.update(visible=True), gr.update(visible=False)
+
 # Start evaluation queue worker
 def start_queue_worker():
     # Wait a moment to ensure app is initialized
@@ -162,16 +176,21 @@ def start_queue_worker():
     except Exception as e:
         print(f"Error starting queue worker: {e}")
 
-# Create Gradio app - without theme to avoid OAuth issues
+# Create Gradio app
 with gr.Blocks(css=css, title="Dynamic Highscores") as app:
-    login_info = gr.LoginButton(visible=True)
-    auth_status = gr.State(None)  # Store user auth state
+    # State to track user
+    user_state = gr.State(None)
     
-    # Add a prominent login section at the top
+    # Login section
     with gr.Row(visible=True, elem_classes=["login-section"]) as login_section:
         with gr.Column():
-            login_status = gr.Markdown("### 🔒 Not logged in", elem_id="login-status")
-            login_button = gr.Button("Login with HuggingFace", size="lg", variant="primary", elem_classes=["login-button"])
+            status_display = gr.Markdown("Checking login status...")
+            login_button = gr.Button("Login with HuggingFace", variant="primary", visible=True, elem_classes=["login-button"])
+    
+    # User info section
+    with gr.Row(visible=False, elem_classes=["login-section"]) as user_section:
+        with gr.Column():
+            user_info = gr.Markdown("User information")
     
     gr.Markdown("# 🏆 Dynamic Highscores", elem_classes=["header"])
     gr.Markdown("""
@@ -204,39 +223,14 @@ with gr.Blocks(css=css, title="Dynamic Highscores") as app:
     Created by Quazim0t0
     """, elem_classes=["footer"])
     
-    # Auth status check on page load
-    def check_auth_on_load(request: gr.Request):
-        # Check if running in HF Space with OAuth
-        if is_running_in_hf_space():
-            username = request.headers.get("HF-User")
-            if username:
-                print(f"Detected logged-in user via Space OAuth: {username}")
-                # Get or create user
-                user = db.get_user_by_username(username)
-                if not user:
-                    print(f"Creating new user: {username}")
-                    is_admin = (username == "Quazim0t0")  # Replace with your admin username
-                    db.add_user(username, username, is_admin)
-                    user = db.get_user_by_username(username)
-                
-                # Update UI for logged in state
-                return user, f"### ✅ Logged in as {username}", gr.update(visible=False)
-        
-        # Not logged in - make sure login section is visible
-        return None, "### 🔒 Not logged in", gr.update(visible=True)
-    
-    # Connect event handlers
-    login_button.click(
-        fn=trigger_hf_oauth,
-        inputs=[],
-        outputs=[gr.HTML()]
-    )
+    # Connect login handler
+    login_button.click(fn=get_login_url, inputs=[], outputs=[gr.HTML()])
     
-    # Check auth on load
+    # Check login on page load
     app.load(
-        fn=check_auth_on_load, 
+        fn=check_user,
         inputs=[],
-        outputs=[auth_status, login_status, login_section]
+        outputs=[status_display, user_state, login_section, user_section]
     )
 
 # Launch the app