Merge branch 'dev' into phonepe

Co-authored-by: AllenTJ7 <163137620+AllenTJ7@users.noreply.github.com>
Reviewed-on: #61

.gitea/workflows/deploy.yaml

@@ -28,7 +28,7 @@ jobs:
       - name: Create private key file
         run: |
           mkdir -p functions/assets/keys
-          echo "${{ secrets.FITLIEN_PRIVATEKEY_DEV }}" > functions/assets/keys/fitLien_private.pem
+          echo "${{ secrets.FITLIEN_PRIVATEKEY }}" > functions/assets/keys/fitLien_private.pem
           chmod 600 functions/assets/keys/fitLien_private.pem
 
       - name: Replace variables in .env

functions/src/users/clientRegistration.ts

@@ -36,27 +36,21 @@ export const registerClient = onRequest({
                     return res.status(403).json({ error: 'Forbidden. Only gym owners can register clients.' });
                 }
                 const gymUser = req.body;
-                if (!gymUser.phoneNumber) {
+                if (!gymUser.fields["phone-number"]) {
                     return res.status(400).json({ error: 'Phone number is required' });
                 }
 
-                const isdCode = gymUser.isdCode || '91';
-                const formattedPhoneNumber = gymUser.phoneNumber.startsWith('+')
-                    ? gymUser.phoneNumber
-                    : `${isdCode}${gymUser.phoneNumber}`;
-
                 let clientUid;
                 try {
-                    const userRecord = await admin.auth().getUserByPhoneNumber(formattedPhoneNumber)
+                    const userRecord = await admin.auth().getUserByPhoneNumber(gymUser.fields["phone-number"])
                         .catch(() => null);
 
                     if (userRecord) {
                         clientUid = userRecord.uid;
                     } else {
                         const newUser = await admin.auth().createUser({
-                            phoneNumber: formattedPhoneNumber,
-                            displayName: gymUser.name || '',
-                            email: gymUser.email || null,
+                            phoneNumber: gymUser.fields["phone-number"],
+                            displayName: gymUser.fields["first-name"] || '',
                         });
                         clientUid = newUser.uid;
                     }
@@ -82,7 +76,6 @@ export const registerClient = onRequest({
 
                     const clientData = {
                         ...gymUser,
-                        phoneNumber: formattedPhoneNumber,
                     };
 
                     await admin.firestore().collection('client_profiles').doc(clientUid).set(clientData);