Update utils/database_handler.py

utils/database_handler.py

@@ -40,13 +40,17 @@ def save_user(name, phone, email, password):
         "Authorization": f"Bearer {access_token}",
         "Content-Type": "application/json",
     }
-    query = f"SELECT Email__c FROM User_Login__c WHERE Email__c = '{email}'"
-    query_response = requests.get(f"{instance_url}/services/data/v53.0/query", headers=headers, params={"q": query})
+    query = f"SELECT Id, Email__c FROM User_Login__c WHERE Email__c = '{email}'"
+    query_response = requests.get(
+        f"{instance_url}/services/data/v53.0/query", headers=headers, params={"q": query}
+    )
     print("Query Response:", query_response.json())  # Log the query response
 
-    if query_response.status_code == 200 and query_response.json()["records"]:
-        print("Email already exists in Salesforce.")
-        return False  # User already exists
+    if query_response.status_code == 200:
+        records = query_response.json().get("records", [])
+        if records:
+            print(f"Email already exists in Salesforce: {email}")
+            return False  # Email already exists
 
     # Save new user with hashed password
     hashed_password = hashpw(password.encode(), gensalt()).decode()
@@ -56,12 +60,20 @@ def save_user(name, phone, email, password):
         "Email__c": email,
         "Password__c": hashed_password,
     }
-    response = requests.post(f"{instance_url}/services/data/v53.0/sobjects/User_Login__c", headers=headers, json=data)
+    response = requests.post(
+        f"{instance_url}/services/data/v53.0/sobjects/User_Login__c",
+        headers=headers,
+        json=data,
+    )
     print("Save Response:", response.status_code, response.json())  # Log the save response
-    return response.status_code == 201
+    if response.status_code == 201:
+        print("User created successfully in Salesforce.")
+        return True
+    else:
+        print("Failed to create user in Salesforce:", response.json())
+        return False
 
 
-# Check user credentials
 def check_credentials(email, password):
     """Check user credentials during login."""
     access_token, instance_url = get_salesforce_access_token()
@@ -74,12 +86,22 @@ def check_credentials(email, password):
         "Content-Type": "application/json",
     }
     query = f"SELECT Password__c FROM User_Login__c WHERE Email__c = '{email}'"
-    query_response = requests.get(f"{instance_url}/services/data/v53.0/query", headers=headers, params={"q": query})
+    query_response = requests.get(
+        f"{instance_url}/services/data/v53.0/query", headers=headers, params={"q": query}
+    )
     print("Query Response:", query_response.json())  # Log the query response
 
-    if query_response.status_code == 200 and query_response.json()["records"]:
-        stored_password = query_response.json()["records"][0]["Password__c"]
-        return checkpw(password.encode(), stored_password.encode())
-    print("No matching email found in Salesforce.")
+    if query_response.status_code == 200:
+        records = query_response.json().get("records", [])
+        if records:
+            stored_password = records[0]["Password__c"]
+            if checkpw(password.encode(), stored_password.encode()):
+                print("Login successful.")
+                return True
+            else:
+                print("Incorrect password.")
+        else:
+            print("Email not found in Salesforce.")
+    else:
+        print("Failed to query Salesforce:", query_response.json())
     return False
-