From 035e3f155b3c3f99499113903dcabdae432b0e54 Mon Sep 17 00:00:00 2001
From: Muhsin Shah <muhsinshah21@gmail.com>
Date: Thu, 14 Mar 2024 09:09:05 +0530
Subject: [PATCH] refactoring the signup cases

---
 server/src/services/auth.service.ts | 39 ++---------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/server/src/services/auth.service.ts b/server/src/services/auth.service.ts
index 7b1cc54f70..814a6798bd 100644
--- a/server/src/services/auth.service.ts
+++ b/server/src/services/auth.service.ts
@@ -457,10 +457,8 @@ export class AuthService {
     const invitedButNotActivated = !!alreadyInvitedUserByAdmin && !!existingUser.invitationToken;
     const activeUserWantsToSignUpToWorkspace = hasActiveWorkspaces && !!organizationId && !isAlreadyActiveInWorkspace;
     const personalWorkspaceCount = await this.organizationUsersService.personalWorkspaceCount(existingUser.id);
-    const didInstanceSignUpAlreadyButNotActive = !!existingUser?.invitationToken && personalWorkspaceCount > 0;
-    const activatedAccountNoActiveWorkspaces = !existingUser?.invitationToken && hasSomeWorkspaceInvites;
     /* Personal workspace case */
-    const adminInvitedButUserWantsInstanceSignup =
+    const hasWorkspaceInviteButUserWantsInstanceSignup =
       !!existingUser?.invitationToken && hasSomeWorkspaceInvites && !organizationId;
     const isUserAlreadyExisted = !!isAlreadyActiveInWorkspace || hasActiveWorkspaces;
     const workspaceSignupForInstanceSignedUpUserButNotActive = !!existingUser?.invitationToken && !!organizationId;
@@ -494,7 +492,6 @@ export class AuthService {
           manager,
           defaultOrganization
         );
-        break;
       }
       case activeUserWantsToSignUpToWorkspace: {
         /* Create new organizations_user entry and send an invite */
@@ -518,7 +515,7 @@ export class AuthService {
           defaultOrganization
         );
       }
-      case adminInvitedButUserWantsInstanceSignup: {
+      case hasWorkspaceInviteButUserWantsInstanceSignup: {
         const errorMessage = 'The user is already registered. Please check your inbox for the activation link';
         if (personalWorkspaceCount === 0) {
           await this.createUserOrPersonalWorkspace(
@@ -550,38 +547,6 @@ export class AuthService {
           response,
           manager
         );
-        break;
-      }
-      case activatedAccountNoActiveWorkspaces:
-      case didInstanceSignUpAlreadyButNotActive: {
-        /* Resend intance invitation */
-        const errorMessage = 'The user is already registered. Please check your inbox for the activation link';
-
-        if (!organizationId) {
-          if (activatedAccountNoActiveWorkspaces) {
-            /* Send invite to the personal workspace */
-            const personalWorkspaces = await this.organizationUsersService.personalWorkspaces(existingUser.id);
-            if (personalWorkspaces?.length) {
-              const personalWorkspaceUser = personalWorkspaces[0];
-              if (personalWorkspaceUser) {
-                const signingUpOrganization = await this.organizationsService.fetchOrganization(
-                  personalWorkspaceUser.organizationId
-                );
-                this.sendOrgInvite(
-                  { email: existingUser.email, firstName },
-                  signingUpOrganization.name,
-                  personalWorkspaceUser.invitationToken
-                );
-                return;
-              }
-            }
-          }
-        }
-
-        this.emailService
-          .sendWelcomeEmail(existingUser.email, existingUser.firstName, existingUser.invitationToken)
-          .catch((err) => console.error(err));
-        throw new NotAcceptableException(errorMessage);
       }
       case isUserAlreadyExisted: {
         /* already an user of that workspace or user is trying signup again from instance signup page */