Update main.py

main.py

@@ -66,31 +66,54 @@ def verify_admin_and_get_uid(auth_header):
 
 @app.route('/api/auth/signup', methods=['POST'])
 def signup():
-    """Handles new user sign-up."""
+    """Handles new user sign-up with email/password and creates their Firestore profile."""
     try:
         data = request.get_json()
         email, password, display_name = data.get('email'), data.get('password'), data.get('displayName')
 
-        if not all([email, password, display_name]):
+        if not email or not password or not display_name:
             return jsonify({'error': 'Email, password, and display name are required'}), 400
 
-        user = auth.create_user(email=email, password=password, display_name=display_name)
+        # Step 1: Create the user in Firebase Authentication
+        user = auth.create_user(
+            email=email,
+            password=password,
+            display_name=display_name
+        )
         
-        user_data = {
-            'uid': user.uid, 'email': email, 'displayName': display_name, 'isAdmin': False,
-            'phone': None, 'phoneStatus': 'unsubmitted', 'organizationId': None,
-            'createdAt': firestore.SERVER_TIMESTAMP
+        # Step 2: Create the data dictionary FOR THE DATABASE, using the special marker
+        user_data_for_db = {
+            'uid': user.uid,
+            'email': email,
+            'displayName': display_name,
+            'isAdmin': False,
+            'phone': None,
+            'phoneStatus': 'unsubmitted',
+            'organizationId': None,
+            'createdAt': firestore.SERVER_TIMESTAMP # This is for Firestore
         }
-        db.collection('users').document(user.uid).set(user_data)
+        db.collection('users').document(user.uid).set(user_data_for_db)
         
         logging.info(f"New user signed up: {user.uid}, Name: {display_name}")
-        return jsonify({'success': True, 'uid': user.uid, **user_data}), 201
+
+        # --- THE FIX IS HERE ---
+        # Step 3: Create a SEPARATE dictionary for the JSON response
+        # Replace the special marker with a JSON-friendly ISO date string.
+        response_data = user_data_for_db.copy()
+        response_data['createdAt'] = datetime.utcnow().isoformat() + "Z" # This is for the client
+
+        return jsonify({'success': True, **response_data}), 201
         
     except Exception as e:
-        logging.error(f"Signup failed: {e}")
+        logging.error(f"Signup failed: {e}", exc_info=True) # exc_info=True gives more detail
         if 'EMAIL_EXISTS' in str(e):
             return jsonify({'error': 'An account with this email already exists.'}), 409
-        return jsonify({'error': str(e)}), 500
+        # Check for the specific error text in the exception itself
+        if 'Object of type Sentinel is not JSON serializable' in str(e):
+             # This means the DB write likely succeeded but the return failed.
+             # In this specific case, we can arguably return success.
+             return jsonify({'success': True, 'uid': data.get('uid'), 'message': 'Account created, but response generation had a minor issue.'}), 201
+        return jsonify({'error': 'An internal server error occurred.'}), 500
 
 @app.route('/api/auth/social-signin', methods=['POST'])
 def social_signin():
@@ -102,22 +125,34 @@ def social_signin():
     user_doc = user_ref.get()
 
     if user_doc.exists:
+        # User already exists, this is safe to return.
         return jsonify({'uid': uid, **user_doc.to_dict()}), 200
     else:
+        # This is a new user (first social login), create their full profile in Firestore.
         logging.info(f"New social user detected: {uid}. Creating database profile.")
         try:
             firebase_user = auth.get_user(uid)
-            new_user_data = {
+            
+            # Data for the database, with the special marker
+            new_user_data_for_db = {
                 'uid': uid, 'email': firebase_user.email, 'displayName': firebase_user.display_name,
                 'isAdmin': False, 'phone': None, 'phoneStatus': 'unsubmitted', 'organizationId': None,
-                'createdAt': firestore.SERVER_TIMESTAMP
+                'createdAt': firestore.SERVER_TIMESTAMP # For Firestore
             }
-            user_ref.set(new_user_data)
-            return jsonify({'success': True, 'uid': uid, **new_user_data}), 201
+            user_ref.set(new_user_data_for_db)
+            
+            logging.info(f"Successfully created profile for new social user: {uid}")
+
+            # --- THE FIX IS HERE ---
+            # Create a clean copy for the JSON response
+            response_data = new_user_data_for_db.copy()
+            response_data['createdAt'] = datetime.utcnow().isoformat() + "Z" # For the client
+
+            return jsonify({'success': True, **response_data}), 201
+
         except Exception as e:
             logging.error(f"Error creating profile for new social user {uid}: {e}")
             return jsonify({'error': f'Failed to create user profile: {str(e)}'}), 500
-
 # -----------------------------------------------------------------------------
 # 4. LOGGED-IN USER ENDPOINTS
 # -----------------------------------------------------------------------------
@@ -301,17 +336,25 @@ def create_organization():
 
     try:
         org_ref = db.collection('organizations').document()
-        org_data = {
+        
+        # Data for the database, with the special marker
+        org_data_for_db = {
             'id': org_ref.id, 'name': org_name, 'ownerUid': uid,
-            'members': [uid], 'createdAt': firestore.SERVER_TIMESTAMP
+            'members': [uid], 'createdAt': firestore.SERVER_TIMESTAMP # For Firestore
         }
         
         batch = db.batch()
-        batch.set(org_ref, org_data)
+        batch.set(org_ref, org_data_for_db)
         batch.update(db.collection('users').document(uid), {'organizationId': org_ref.id})
         batch.commit()
         
-        return jsonify(org_data), 201
+        # --- THE FIX IS HERE ---
+        # Create a clean copy for the JSON response
+        response_data = org_data_for_db.copy()
+        response_data['createdAt'] = datetime.utcnow().isoformat() + "Z" # For the client
+        
+        return jsonify(response_data), 201
+        
     except Exception as e:
         logging.error(f"User {uid} failed to create organization: {e}")
         return jsonify({'error': 'An internal error occurred'}), 500