fix(api): update sign up flow for sws pocket

sws2apps · Dec 5, 2022 · 81b2d4a · 81b2d4a
1 parent 3f9e6ad
commit 81b2d4a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/classes/User.js b/src/classes/User.js
@@ -227,6 +227,8 @@ export class User {
 
       this.pocket_oCode = secureCode;
 
+      await Users.loadAll();
+
       return code;
     } catch (error) {
       throw new Error(error.message);
@@ -282,8 +284,8 @@ export class User {
   assignCongregation = async (congInfo) => {
     try {
       await db.collection("users").doc(this.id).set(congInfo, { merge: true });
-      
-      await Users.loadAll()
+
+      await Users.loadAll();
       await Congregations.loadAll();
     } catch (err) {
       throw new Error(err.message);
@@ -368,9 +370,9 @@ export class User {
       ...filteredDevices,
     ];
 
-    await db.collection("users").doc(this.id).update({ "congregation.devices": updatedDevices });
+    await db.collection("users").doc(this.id).update({ "congregation.devices": updatedDevices, "congregation.oCode": FieldValue.delete() });
 
-    await Users.loadAll()
+    await Users.loadAll();
     await Congregations.loadAll();
   };
 

diff --git a/src/classes/Users.js b/src/classes/Users.js
@@ -51,24 +51,21 @@ class clsUsers {
   };
 
   findUserByOTPCode = (code) => {
-    try {
-      let user;
-      for (let i = 0; i < this.list.length; i++) {
-        const item = this.list[i];
-        const otpCode = item.pocket_oCode;
-
+    let user;
+    for (let i = 0; i < this.list.length; i++) {
+      const item = this.list[i];
+      const otpCode = item.pocket_oCode;
+      if (otpCode !== "") {
         const pocket_oCode = decryptData(otpCode);
 
         if (code === pocket_oCode) {
           user = item;
           break;
         }
       }
-
-      return user;
-    } catch (error) {
-      throw new Error(error.message);
     }
+
+    return user;
   };
 
   findPocketUser = (pocketId) => {