From 2867d5344253a91a34c1857d19febccff278db69 Mon Sep 17 00:00:00 2001
From: Amit Sharma <74371312+Amit91848@users.noreply.github.com>
Date: Tue, 14 Nov 2023 19:29:49 +0530
Subject: [PATCH] fix resend team member invite (#12360)

---
 .../viewer/teams/resendInvitation.handler.ts    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts b/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
index a45d2d3905..a7c0cc9bd5 100644
--- a/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/resendInvitation.handler.ts
@@ -4,8 +4,6 @@ import { getTranslation } from "@calcom/lib/server/i18n";
 import { prisma } from "@calcom/prisma";
 import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";
 
-import { TRPCError } from "@trpc/server";
-
 import { checkPermissions, getTeamOrThrow } from "./inviteMember/utils";
 import type { TResendInvitationInputSchema } from "./resendInvitation.schema";
 
@@ -36,8 +34,16 @@ export const resendInvitationHandler = async ({ ctx, input }: InviteMemberOption
     },
   });
 
-  if (!verificationToken)
-    throw new TRPCError({ code: "NOT_FOUND", message: "Couldn't resend, no existing invitation found." });
+  const inviteTeamOptions = {
+    joinLink: `${WEBAPP_URL}/auth/login?callbackUrl=/settings/teams`,
+    isCalcomMember: true,
+  };
+
+  if (verificationToken) {
+    // Token only exists if user is CAL user but hasn't completed onboarding.
+    inviteTeamOptions.joinLink = `${WEBAPP_URL}/signup?token=${verificationToken.token}&callbackUrl=/getting-started`;
+    inviteTeamOptions.isCalcomMember = false;
+  }
 
   const translation = await getTranslation(input.language ?? "en", "common");
 
@@ -46,8 +52,7 @@ export const resendInvitationHandler = async ({ ctx, input }: InviteMemberOption
     from: ctx.user.name || `${team.name}'s admin`,
     to: input.email,
     teamName: team?.parent?.name || team.name,
-    joinLink: `${WEBAPP_URL}/signup?token=${verificationToken.token}&callbackUrl=/getting-started`,
-    isCalcomMember: false,
+    ...inviteTeamOptions,
     isOrg: input.isOrg,
   });