Fix team invite signup not working

calcom · Feb 16, 2024 · 3093e71 · 3093e71
1 parent a056160
commit 3093e71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/packages/lib/server/username.ts b/packages/lib/server/username.ts
@@ -207,7 +207,9 @@ const usernameCheckForSignup = async ({
     // 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 username is in global namespace
     if (!userIsAMemberOfAnOrg) {
-      response.available = false;
+      const isClaimingAlreadySetUsername = user.username === username;
+      const isClaimingUnsetUsername = !user.username;
+      response.available = isClaimingUnsetUsername || isClaimingAlreadySetUsername;
       // There are no premium users outside an organization only
       response.premium = await isPremiumUserName(username);
     }

diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
@@ -236,9 +236,11 @@ export async function createNewUsersConnectToOrgIfExists({
         const { orgId, autoAccept } = connectionInfoMap[usernameOrEmail];
         const [emailUser, emailDomain] = usernameOrEmail.split("@");
         const username =
-          emailDomain === autoAcceptEmailDomain
-            ? slugify(emailUser)
-            : slugify(`${emailUser}-${emailDomain.split(".")[0]}`);
+          input.isOrg || parentId
+            ? emailDomain === autoAcceptEmailDomain
+              ? slugify(emailUser)
+              : slugify(`${emailUser}-${emailDomain.split(".")[0]}`)
+            : null;
 
         const createdUser = await tx.user.create({
           data: {