Update main.py

main.py

@@ -243,16 +243,23 @@ def get_or_create_profile(uid: str) -> dict:
     # If user exists, update Admin status if needed
     if user_data:
         patch = {}
-        # If they are on the list but not marked admin yet
-        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()
+        # If they are on the list, ensure they are admin
+        if is_hardcoded_admin:
+            if not user_data.get("is_admin") or user_data.get("role") != "admin":
+                patch["is_admin"] = True
+                patch["role"] = "admin"
+                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
+            # Admins always complete onboarding
+            if user_data.get("role") == "admin" or is_hardcoded_admin:
+                 patch["onboardingComplete"] = True
+            else:
+                 # For others, only if they have a non-empty role
+                 patch["onboardingComplete"] = True
+
             if not user_data.get("roleSetAt"):
                 patch["roleSetAt"] = user_data.get("createdAt") or now_iso()
 
@@ -282,7 +289,7 @@ def get_or_create_profile(uid: str) -> dict:
         "createdAt": now_iso()
     }
     ref.set(new_user_data)
-    return new_user_data    
+    return new_user_data
 
 
 def push_notification(to_uid: str, notif_type: str, title: str, body: str, meta: dict | None = None):
@@ -444,41 +451,45 @@ def set_role_after_social_signin():
 
         current_role = (user_data.get("role") or "").lower().strip()
 
-        # Idempotent: already same role OR role was empty (first selection)
-        if not current_role or current_role == requested_role:
+        # Allow switching to customer anytime
+        if requested_role == "customer":
             patch = {
-                "role": requested_role,
-                "roleSetAt": user_data.get("roleSetAt") or now_iso(),
+                "role": "customer",
                 "onboardingComplete": True,
                 "updatedAt": now_iso(),
             }
+            if not user_data.get("roleSetAt"):
+                patch["roleSetAt"] = now_iso()
+
             user_ref.update(patch)
             updated = user_ref.get() or {}
             return jsonify({"success": True, "uid": uid, "profile": updated}), 200
 
-        # One-way upgrade: customer -> tasker (allow ONCE)
-        if current_role == "customer" and requested_role == "tasker":
-            if (user_data.get("roleUpgradedAt") or "").strip():
-                return jsonify({
-                    "error": "Role change blocked",
-                    "reason": "Customer -> Tasker upgrade already used.",
-                }), 409
-
+        # Allow switching to tasker
+        if requested_role == "tasker":
+            # If they are already verified, just let them switch
+            # If not, they can still switch but the UI will show them as pending/restricted
             patch = {
                 "role": "tasker",
-                "roleUpgradedAt": now_iso(),
                 "onboardingComplete": True,
                 "updatedAt": now_iso(),
             }
+            if not user_data.get("roleSetAt"):
+                patch["roleSetAt"] = now_iso()
+
+            # Record when they first became/requested to be a tasker
+            if current_role != "tasker" and not user_data.get("roleUpgradedAt"):
+                patch["roleUpgradedAt"] = now_iso()
+
             user_ref.update(patch)
             updated = user_ref.get() or {}
-            return jsonify({"success": True, "uid": uid, "profile": updated, "note": "upgraded customer -> tasker"}), 200
+            return jsonify({"success": True, "uid": uid, "profile": updated}), 200
 
-        # Block any other change
+        # Block any other change (like trying to set role to admin)
         return jsonify({
             "error": "Role change blocked",
-            "reason": "Role flipping is not allowed.",
-        }), 409
+            "reason": "Invalid role requested.",
+        }), 400
 
     except Exception as e:
         logger.error(f"[SET ROLE] failed: {e}")
@@ -1687,4 +1698,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)))