Update components/auth.py

components/auth.py

@@ -3,34 +3,31 @@
 from utils.db import sign_up_user, login_user, supabase
 import gradio as gr
 
-# The function now accepts 'gender' as a third argument
-def register(email, password, gender):
-    """Handler for the signup process, now including gender."""
-    # Check if all three inputs are provided
-    if not all([email, password, gender]):
-        # Return a no-op for all 4 output components on failure
-        return "❌ Email, password, and gender are required.", gr.update(), gr.update(), gr.update()
+def register(email, password, gender, username):
+    """Handler for the signup process, now including username."""
+    if not all([email, password, gender, username]):
+        return "❌ All fields are required.", gr.update(), gr.update(), gr.update(), gr.update()
     
-    # The 'gender' is passed to the sign_up_user utility function
-    result = sign_up_user(email, password, gender)
+    result = sign_up_user(email, password, gender, username)
 
     if result and result.user:
         message = "✅ Signup successful! You can now log in."
         if result.user and not result.session:
              message = "✅ Signup successful! Please check your email to confirm your account."
-        # On success, clear all three signup fields
-        return message, "", "", None # Clear email, password, and gender radio
+        # On success, clear all four signup fields
+        return message, "", "", None, ""
     
     if hasattr(result, 'error') and result.error:
-        # On failure, don't clear the fields
-        return f"❌ Signup Failed: {result.error.message}", gr.update(), gr.update(), gr.update()
+        # Check for unique constraint violation on username
+        if 'duplicate key value violates unique constraint "users_username_key"' in result.error.message:
+            return "❌ Signup Failed: This username is already taken.", gr.update(), gr.update(), gr.update(), gr.update()
+        return f"❌ Signup Failed: {result.error.message}", gr.update(), gr.update(), gr.update(), gr.update()
     
-    # On unknown failure, don't clear the fields
-    return "❌ Signup failed. An unknown error occurred.", gr.update(), gr.update(), gr.update()
+    return "❌ Signup failed. An unknown error occurred.", gr.update(), gr.update(), gr.update(), gr.update()
 
 
 def login(email, password, current_user_state):
-    """Handler for login. Now fetches the user's gender from the public.users table."""
+    """Handler for login. Now fetches username and gender from the database."""
     if not email or not password:
         return "❌ Email and password cannot be empty.", current_user_state, gr.update()
 
@@ -38,14 +35,18 @@ def login(email, password, current_user_state):
     
     if result and result.session:
         try:
-            profile = supabase.table("users").select("gender").eq("id", result.user.id).single().execute()
+            # Fetch username and gender in a single query for efficiency
+            profile = supabase.table("users").select("gender, username").eq("id", result.user.id).single().execute()
             user_gender = profile.data.get("gender") if profile.data else None
+            user_name = profile.data.get("username") if profile.data else "User"
         except Exception as e:
             print(f"Could not fetch user profile: {e}")
             user_gender = None
+            user_name = "User"
 
-        new_user_state = {"email": email, "id": result.user.id, "logged_in": True, "gender": user_gender}
-        return f"✅ Login successful! Redirecting...", new_user_state, gr.Tabs(selected="prediction_tab")
+        # Add username to the user's session state
+        new_user_state = {"email": email, "id": result.user.id, "logged_in": True, "gender": user_gender, "username": user_name}
+        return f"✅ Welcome, {user_name}! Redirecting...", new_user_state, gr.Tabs(selected="prediction_tab")
     
     if hasattr(result, 'error') and result.error:
         return f"❌ Login Failed: {result.error.message}", current_user_state, gr.update()
@@ -54,12 +55,10 @@ def login(email, password, current_user_state):
 
 
 def logout(current_user_state):
-    """Handler for logout. Now clears all state and form fields, including the pregnancies row visibility."""
-    new_user_state = {"email": None, "id": None, "logged_in": False, "gender": None}
+    """Handler for logout. Clears all state and form fields."""
+    new_user_state = {"email": None, "id": None, "logged_in": False, "gender": None, "username": None}
     
-    # The return order must match the outputs list in app.py exactly
     return (
         "👋 Logged out successfully.", new_user_state, gr.Tabs(selected="home_tab"),
-        "", "", None, None, None, None, None, None, "", # Clear forms
-        gr.update(visible=False) # Hide pregnancies row
+        "", "", None, None, None, None, None, None, "", gr.update(visible=False)
     )