Merge branch 'main' into fix/user-stuck-on-invited

2026-10-14 11:29:42 +00:00 · 2025-06-06 11:50:03 -04:00
parent d2b0ca94d8 b4f37193ac
commit e4abac91b4
81 changed files with 1859 additions and 801 deletions
@@ -837,16 +837,22 @@ export const orgServiceFactory = ({

        // if the user doesn't exist we create the user with the email
        if (!inviteeUser) {
-          inviteeUser = await userDAL.create(
-            {
-              isAccepted: false,
-              email: inviteeEmail,
-              username: inviteeEmail,
-              authMethods: [AuthMethod.EMAIL],
-              isGhost: false
-            },
-            tx
-          );
+          // TODO(carlos): will be removed once the function receives usernames instead of emails
+          const usersByEmail = await userDAL.findUserByEmail(inviteeEmail, tx);
+          if (usersByEmail?.length === 1) {
+            [inviteeUser] = usersByEmail;
+          } else {
+            inviteeUser = await userDAL.create(
+              {
+                isAccepted: false,
+                email: inviteeEmail,
+                username: inviteeEmail,
+                authMethods: [AuthMethod.EMAIL],
+                isGhost: false
+              },
+              tx
+            );
+          }
        }

        const inviteeUserId = inviteeUser?.id;