Merge pull request #1393 from argos-ci/fix-account-login-error

fix: handle update email
argos-ci · Oct 11, 2024 · c88f4b5 · c88f4b5
2 parents 87ecedc + 702692f
commit c88f4b5
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/apps/backend/src/database/services/account.ts b/apps/backend/src/database/services/account.ts
@@ -179,15 +179,24 @@ export const getOrCreateUserAccountFromGhAccount = async (
   if (existingAccount) {
     invariant(existingAccount.user, "user not fetched");
 
+    const updateData: PartialModelObject<User> = {};
+
     if (
-      (accessToken !== undefined &&
-        existingAccount.user.accessToken !== accessToken) ||
-      existingAccount.user.email !== email
+      accessToken !== undefined &&
+      existingAccount.user.accessToken !== accessToken
     ) {
-      await existingAccount.user.$query().patchAndFetch({
-        accessToken: accessToken ?? existingAccount.user.accessToken,
-        email,
-      });
+      updateData.accessToken = accessToken;
+    }
+
+    if (existingAccount.user.email !== email) {
+      const existingEmailUser = await User.query().findOne("email", email);
+      if (!existingEmailUser) {
+        updateData.email = email;
+      }
+    }
+
+    if (Object.keys(updateData).length > 0) {
+      await existingAccount.user.$query().patchAndFetch(updateData);
     }
 
     return existingAccount;