Validate that a user isnt a member of the organization before marking the username unavailable (#13354)

2024-01-22 08:01:55 -03:00
parent 313bb89789
commit 2ae2c15083
1 changed files with 17 additions and 1 deletions
@@ -118,12 +118,28 @@ const usernameCheck = async (usernameRaw: string) => {
  const user = await prisma.user.findFirst({
    where: { username, organizationId: null },
    select: {
+      id: true,
      username: true,
    },
  });

  if (user) {
-    response.available = false;
+    const userIsAMemberOfAnOrg = await prisma.membership.findFirst({
+      where: {
+        userId: user.id,
+        team: {
+          metadata: {
+            path: ["isOrganization"],
+            equals: true,
+          },
+        },
+      },
+    });
+    // When we invite an email, that doesn't match the orgAutoAcceptEmail, we create a user with organizationId=null.
+    // The only way to differentiate b/w 'a new email that was invited to an Org' and 'a user that was created using regular signup' is to check if the user is a member of an org.
+    if (!userIsAMemberOfAnOrg) {
+      response.available = false;
+    }
  }

  if (await isPremiumUserName(username)) {