Update main.py

main.py

@@ -235,10 +235,10 @@ def get_or_create_profile(uid: str) -> dict:
     user_data = ref.get()
 
     fb_user = auth.get_user(uid)
-    email = fb_user.email or ""
+    email = (fb_user.email or "").lower()
     
     # Check Admin Injection
-    is_hardcoded_admin = email in HARDCODED_ADMIN_EMAILS
+    is_hardcoded_admin = email in [e.lower() for e in HARDCODED_ADMIN_EMAILS]
 
     # If user exists, update Admin status if needed
     if user_data:
@@ -247,7 +247,15 @@ def get_or_create_profile(uid: str) -> dict:
         if is_hardcoded_admin and not user_data.get("is_admin"):
             patch["is_admin"] = True
             patch["role"] = "admin" # Force role update
+            patch["onboardingComplete"] = True
+            patch["roleSetAt"] = user_data.get("roleSetAt") or now_iso()
         
+        # FIX: Ensure onboardingComplete is true if role is already set
+        if user_data.get("role") and not user_data.get("onboardingComplete"):
+            patch["onboardingComplete"] = True
+            if not user_data.get("roleSetAt"):
+                patch["roleSetAt"] = user_data.get("createdAt") or now_iso()
+
         # Social signin patch for display name
         if not user_data.get("displayName") and fb_user.display_name:
             patch["displayName"] = fb_user.display_name
@@ -258,15 +266,18 @@ def get_or_create_profile(uid: str) -> dict:
         return user_data
 
     # Create new profile
-    role = "admin" if is_hardcoded_admin else "customer" # Default to customer unless on list
+    role = "admin" if is_hardcoded_admin else "" # Empty role triggers onboarding for non-admins
+    onboarding_complete = True if is_hardcoded_admin else False
     
     new_user_data = {
         "email": email,
         "displayName": fb_user.display_name or "",
-        "phone": "",
+        "phone_number": "",
         "city": "",
         "role": role,
         "is_admin": is_hardcoded_admin,
+        "onboardingComplete": onboarding_complete,
+        "roleSetAt": now_iso() if is_hardcoded_admin else None,
         "verificationStatus": "unverified", # unverified | pending | verified | rejected
         "createdAt": now_iso()
     }
@@ -358,17 +369,19 @@ def signup():
 
         # Admin Injection logic for Signup
         is_admin = False
-        if email in HARDCODED_ADMIN_EMAILS:
+        if email.lower() in [e.lower() for e in HARDCODED_ADMIN_EMAILS]:
             role = "admin"
             is_admin = True
 
         user_data = {
             "email": email,
             "displayName": display_name,
-            "phone": phone,
+            "phone_number": phone,
             "city": city,
             "role": role,
             "is_admin": is_admin,
+            "onboardingComplete": True,
+            "roleSetAt": now_iso(),
             "verificationStatus": "unverified",
             "createdAt": now_iso()
         }
@@ -420,20 +433,23 @@ def set_role_after_social_signin():
 
         # IF ADMIN via injection, LOCK role changes
         if user_data.get("is_admin"):
-            return jsonify({"success": True, "uid": uid, "profile": user_data, "note": "User is Admin, role locked."}), 200
+            patch = {
+                "onboardingComplete": True,
+                "roleSetAt": user_data.get("roleSetAt") or now_iso(),
+                "updatedAt": now_iso()
+            }
+            user_ref.update(patch)
+            updated = user_ref.get()
+            return jsonify({"success": True, "uid": uid, "profile": updated, "note": "User is Admin, role locked."}), 200
 
         current_role = (user_data.get("role") or "").lower().strip()
 
-        # Idempotent: already same role
-        if current_role and current_role == requested_role:
-            updated = user_ref.get() or {}
-            return jsonify({"success": True, "uid": uid, "profile": updated, "note": "role unchanged"}), 200
-
-        # If role is empty/missing -> allow setting
-        if not current_role:
+        # Idempotent: already same role OR role was empty (first selection)
+        if not current_role or current_role == requested_role:
             patch = {
                 "role": requested_role,
-                "roleSetAt": now_iso(),
+                "roleSetAt": user_data.get("roleSetAt") or now_iso(),
+                "onboardingComplete": True,
                 "updatedAt": now_iso(),
             }
             user_ref.update(patch)
@@ -451,6 +467,7 @@ def set_role_after_social_signin():
             patch = {
                 "role": "tasker",
                 "roleUpgradedAt": now_iso(),
+                "onboardingComplete": True,
                 "updatedAt": now_iso(),
             }
             user_ref.update(patch)
@@ -500,7 +517,7 @@ def update_user_profile():
     allowed = {}
 
     # Common fields
-    for key in ["displayName", "phone", "city"]:
+    for key in ["displayName", "phone_number", "city"]:
         if key in data:
             allowed[key] = data.get(key)
 
@@ -1190,9 +1207,9 @@ def submit_bid(task_id):
             return jsonify({"error": "Task not open for bids"}), 400
 
         data = request.get_json() or {}
-        price = (data.get("price") or "").strip()
-        timeline = (data.get("timeline") or "").strip()
-        message = (data.get("message") or "").strip()
+        price = str(data.get("price") or "").strip()
+        timeline = str(data.get("timeline") or "").strip()
+        message = str(data.get("message") or "").strip()
 
         if not price or not timeline:
             return jsonify({"error": "price and timeline are required"}), 400
@@ -1670,4 +1687,4 @@ def admin_verify_user(target_uid):
 # -----------------------------------------------------------------------------
 
 if __name__ == "__main__":
-    app.run(debug=True, host="0.0.0.0", port=int(os.environ.get("PORT", 7860)))
+    app.run(debug=True, host="0.0.0.0", port=int(os.environ.get("PORT", 7860)))