Update main.py

main.py

@@ -4,7 +4,6 @@ import logging
 from datetime import datetime, timedelta
 from flask import Flask, request, jsonify
 from flask_cors import CORS
-
 import firebase_admin
 from firebase_admin import credentials, auth, firestore
 
@@ -178,12 +177,16 @@ def get_user_profile():
     
     return jsonify({'uid': uid, **user_doc.to_dict()})
 
+# dashboard_server.py
+
+
+
 @app.route('/api/user/profile/phone', methods=['PUT'])
 def update_user_phone():
     """
     Allows a user to submit their WhatsApp phone number for admin approval.
-    **FIXED**: Returns the user object at the top level of the JSON response,
-    making it consistent with the GET /api/user/profile endpoint.
+    **DEFINITIVE FIX**: Correctly handles the `datetime` object returned from Firestore,
+    preventing the JSON serialization error that causes the MutationFn to fail.
     """
     uid = verify_token(request.headers.get('Authorization'))
     if not uid: return jsonify({'error': 'Invalid or expired token'}), 401
@@ -197,16 +200,13 @@ def update_user_phone():
     phone_number_stripped = phone_number.strip()
 
     try:
-        # Validate that the phone number is not already in use by another account
+        # Validate uniqueness
         existing_user_query = db.collection('users').where('phone', '==', phone_number_stripped).limit(1).stream()
-        
         conflicting_users = list(existing_user_query)
-        if len(conflicting_users) > 0:
-            if conflicting_users[0].id != uid:
-                logger.warning(f"User {uid} tried to claim phone number {phone_number_stripped}, but it's already in use.")
-                return jsonify({'error': 'This phone number is already registered to another account.'}), 409
+        if len(conflicting_users) > 0 and conflicting_users[0].id != uid:
+            return jsonify({'error': 'This phone number is already registered to another account.'}), 409
         
-        # If validation passes, update the user's profile
+        # Update the user's profile
         user_ref = db.collection('users').document(uid)
         user_ref.update({
             'phone': phone_number_stripped, 
@@ -216,17 +216,24 @@ def update_user_phone():
         logging.info(f"User {uid} submitted phone number {phone_number_stripped} for approval.")
         
         # --- THE FIX IS HERE ---
-        # Re-fetch the updated user document
+        # 1. Re-fetch the updated user document
         updated_user_doc = user_ref.get()
         if not updated_user_doc.exists:
              return jsonify({'error': 'Failed to retrieve updated profile.'}), 500
 
-        # Return the user data at the TOP LEVEL of the JSON response
+        # 2. Convert the document to a dictionary
+        user_data = updated_user_doc.to_dict()
+
+        # 3. IMPORTANT: Check for and convert any datetime objects to strings
+        if 'createdAt' in user_data and isinstance(user_data['createdAt'], datetime):
+            user_data['createdAt'] = user_data['createdAt'].isoformat() + "Z"
+
+        # 4. Return the now JSON-safe data, with the correct top-level structure
         return jsonify({
             'success': True, 
             'message': 'Phone number submitted for approval.',
             'uid': uid, 
-            **updated_user_doc.to_dict() # Un-nest the user data
+            **user_data
         }), 200
         # --- END OF FIX ---