From 809abd2f4fd0f62899e73c0c15cdbb725434d69e Mon Sep 17 00:00:00 2001
From: Manpreet Singh <manpoffc@gmail.com>
Date: Mon, 6 Nov 2023 03:00:37 -0500
Subject: [PATCH] fix: Removes send an invite email option & always send email
 (#12229)

---
 apps/web/calendso.yaml                        |  3 +-
 .../components/AddNewOrgAdminsForm.tsx        | 32 ++++++++---------
 .../settings/other-team-members-view.tsx      | 34 +++++++++----------
 .../ee/teams/components/AddNewTeamMembers.tsx | 33 ++++++++----------
 .../components/MemberInvitationModal.tsx      | 15 --------
 .../ee/teams/components/TeamListItem.tsx      | 34 +++++++++----------
 .../ee/teams/pages/team-members-view.tsx      | 34 +++++++++----------
 .../UserTable/InviteMemberModal.tsx           | 32 ++++++++---------
 .../inviteMember/inviteMember.handler.ts      |  2 +-
 .../teams/inviteMember/inviteMember.schema.ts |  1 -
 .../viewer/teams/inviteMember/utils.ts        |  1 -
 11 files changed, 95 insertions(+), 126 deletions(-)

diff --git a/apps/web/calendso.yaml b/apps/web/calendso.yaml
index 5d01b1cd8c..d96bedb85e 100644
--- a/apps/web/calendso.yaml
+++ b/apps/web/calendso.yaml
@@ -631,8 +631,7 @@ paths:
                   type: string
                 role:
                   type: string
-                sendEmailInvitation:
-                  type: boolean
+                  
     parameters:
       - schema:
           type: string
diff --git a/packages/features/ee/organizations/components/AddNewOrgAdminsForm.tsx b/packages/features/ee/organizations/components/AddNewOrgAdminsForm.tsx
index 3acc4dce65..1f4f672fb4 100644
--- a/packages/features/ee/organizations/components/AddNewOrgAdminsForm.tsx
+++ b/packages/features/ee/organizations/components/AddNewOrgAdminsForm.tsx
@@ -23,23 +23,22 @@ export const AddNewOrgAdminsForm = () => {
   }>();
   const inviteMemberMutation = trpc.viewer.teams.inviteMember.useMutation({
     async onSuccess(data) {
-      if (data.sendEmailInvitation) {
-        if (Array.isArray(data.usernameOrEmail)) {
-          showToast(
-            t("email_invite_team_bulk", {
-              userCount: data.usernameOrEmail.length,
-            }),
-            "success"
-          );
-        } else {
-          showToast(
-            t("email_invite_team", {
-              email: data.usernameOrEmail,
-            }),
-            "success"
-          );
-        }
+      if (Array.isArray(data.usernameOrEmail)) {
+        showToast(
+          t("email_invite_team_bulk", {
+            userCount: data.usernameOrEmail.length,
+          }),
+          "success"
+        );
+      } else {
+        showToast(
+          t("email_invite_team", {
+            email: data.usernameOrEmail,
+          }),
+          "success"
+        );
       }
+
       router.push(`/settings/organizations/${orgId}/add-teams`);
     },
     onError: (error) => {
@@ -56,7 +55,6 @@ export const AddNewOrgAdminsForm = () => {
           language: i18n.language,
           role: MembershipRole.ADMIN,
           usernameOrEmail: values.emails,
-          sendEmailInvitation: true,
           isOrg: true,
         });
       }}>
diff --git a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
index 6575ddda81..765ab30c36 100644
--- a/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
+++ b/packages/features/ee/organizations/pages/settings/other-team-members-view.tsx
@@ -189,29 +189,27 @@ const MembersView = () => {
                     language: i18n.language,
                     role: values.role,
                     usernameOrEmail: values.emailOrUsername,
-                    sendEmailInvitation: values.sendInviteEmail,
                   },
                   {
                     onSuccess: async (data) => {
                       await utils.viewer.teams.get.invalidate();
                       setShowMemberInvitationModal(false);
-                      if (data.sendEmailInvitation) {
-                        if (Array.isArray(data.usernameOrEmail)) {
-                          showToast(
-                            t("email_invite_team_bulk", {
-                              userCount: data.usernameOrEmail.length,
-                            }),
-                            "success"
-                          );
-                          resetFields();
-                        } else {
-                          showToast(
-                            t("email_invite_team", {
-                              email: data.usernameOrEmail,
-                            }),
-                            "success"
-                          );
-                        }
+
+                      if (Array.isArray(data.usernameOrEmail)) {
+                        showToast(
+                          t("email_invite_team_bulk", {
+                            userCount: data.usernameOrEmail.length,
+                          }),
+                          "success"
+                        );
+                        resetFields();
+                      } else {
+                        showToast(
+                          t("email_invite_team", {
+                            email: data.usernameOrEmail,
+                          }),
+                          "success"
+                        );
                       }
                     },
                     onError: (error) => {
diff --git a/packages/features/ee/teams/components/AddNewTeamMembers.tsx b/packages/features/ee/teams/components/AddNewTeamMembers.tsx
index 28c8569e77..1b892aa1be 100644
--- a/packages/features/ee/teams/components/AddNewTeamMembers.tsx
+++ b/packages/features/ee/teams/components/AddNewTeamMembers.tsx
@@ -119,29 +119,26 @@ export const AddNewTeamMembersForm = ({
                   language: i18n.language,
                   role: values.role,
                   usernameOrEmail: values.emailOrUsername,
-                  sendEmailInvitation: values.sendInviteEmail,
                 },
                 {
                   onSuccess: async (data) => {
                     await utils.viewer.teams.get.invalidate();
                     setMemberInviteModal(false);
-                    if (data.sendEmailInvitation) {
-                      if (Array.isArray(data.usernameOrEmail)) {
-                        showToast(
-                          t("email_invite_team_bulk", {
-                            userCount: data.usernameOrEmail.length,
-                          }),
-                          "success"
-                        );
-                        resetFields();
-                      } else {
-                        showToast(
-                          t("email_invite_team", {
-                            email: data.usernameOrEmail,
-                          }),
-                          "success"
-                        );
-                      }
+                    if (Array.isArray(data.usernameOrEmail)) {
+                      showToast(
+                        t("email_invite_team_bulk", {
+                          userCount: data.usernameOrEmail.length,
+                        }),
+                        "success"
+                      );
+                      resetFields();
+                    } else {
+                      showToast(
+                        t("email_invite_team", {
+                          email: data.usernameOrEmail,
+                        }),
+                        "success"
+                      );
                     }
                   },
                   onError: (error) => {
diff --git a/packages/features/ee/teams/components/MemberInvitationModal.tsx b/packages/features/ee/teams/components/MemberInvitationModal.tsx
index 72d2ce5108..4aeffb573c 100644
--- a/packages/features/ee/teams/components/MemberInvitationModal.tsx
+++ b/packages/features/ee/teams/components/MemberInvitationModal.tsx
@@ -13,7 +13,6 @@ import type { RouterOutputs } from "@calcom/trpc";
 import { trpc } from "@calcom/trpc";
 import {
   Button,
-  CheckboxField,
   Dialog,
   DialogContent,
   DialogFooter,
@@ -53,7 +52,6 @@ type MembershipRoleOption = {
 export interface NewMemberForm {
   emailOrUsername: string | string[];
   role: MembershipRole;
-  sendInviteEmail: boolean;
 }
 
 type ModalMode = "INDIVIDUAL" | "BULK" | "ORGANIZATION";
@@ -344,19 +342,6 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
                 </div>
               )}
             />
-            <Controller
-              name="sendInviteEmail"
-              control={newMemberFormMethods.control}
-              defaultValue={true}
-              render={() => (
-                <CheckboxField
-                  className="mr-0"
-                  defaultChecked={true}
-                  description={t("send_invite_email")}
-                  onChange={(e) => newMemberFormMethods.setValue("sendInviteEmail", e.target.checked)}
-                />
-              )}
-            />
             {props.token && (
               <div className="flex">
                 <Button
diff --git a/packages/features/ee/teams/components/TeamListItem.tsx b/packages/features/ee/teams/components/TeamListItem.tsx
index 539b463e4e..fcb88ba118 100644
--- a/packages/features/ee/teams/components/TeamListItem.tsx
+++ b/packages/features/ee/teams/components/TeamListItem.tsx
@@ -131,29 +131,27 @@ export default function TeamListItem(props: Props) {
               language: i18n.language,
               role: values.role,
               usernameOrEmail: values.emailOrUsername,
-              sendEmailInvitation: values.sendInviteEmail,
             },
             {
               onSuccess: async (data) => {
                 await utils.viewer.teams.get.invalidate();
                 setOpenMemberInvitationModal(false);
-                if (data.sendEmailInvitation) {
-                  if (Array.isArray(data.usernameOrEmail)) {
-                    showToast(
-                      t("email_invite_team_bulk", {
-                        userCount: data.usernameOrEmail.length,
-                      }),
-                      "success"
-                    );
-                    resetFields();
-                  } else {
-                    showToast(
-                      t("email_invite_team", {
-                        email: data.usernameOrEmail,
-                      }),
-                      "success"
-                    );
-                  }
+
+                if (Array.isArray(data.usernameOrEmail)) {
+                  showToast(
+                    t("email_invite_team_bulk", {
+                      userCount: data.usernameOrEmail.length,
+                    }),
+                    "success"
+                  );
+                  resetFields();
+                } else {
+                  showToast(
+                    t("email_invite_team", {
+                      email: data.usernameOrEmail,
+                    }),
+                    "success"
+                  );
                 }
               },
               onError: (error) => {
diff --git a/packages/features/ee/teams/pages/team-members-view.tsx b/packages/features/ee/teams/pages/team-members-view.tsx
index 227c213f08..da8128d734 100644
--- a/packages/features/ee/teams/pages/team-members-view.tsx
+++ b/packages/features/ee/teams/pages/team-members-view.tsx
@@ -205,29 +205,27 @@ const MembersView = () => {
                     language: i18n.language,
                     role: values.role,
                     usernameOrEmail: values.emailOrUsername,
-                    sendEmailInvitation: values.sendInviteEmail,
                   },
                   {
                     onSuccess: async (data) => {
                       await utils.viewer.teams.get.invalidate();
                       setShowMemberInvitationModal(false);
-                      if (data.sendEmailInvitation) {
-                        if (Array.isArray(data.usernameOrEmail)) {
-                          showToast(
-                            t("email_invite_team_bulk", {
-                              userCount: data.usernameOrEmail.length,
-                            }),
-                            "success"
-                          );
-                          resetFields();
-                        } else {
-                          showToast(
-                            t("email_invite_team", {
-                              email: data.usernameOrEmail,
-                            }),
-                            "success"
-                          );
-                        }
+
+                      if (Array.isArray(data.usernameOrEmail)) {
+                        showToast(
+                          t("email_invite_team_bulk", {
+                            userCount: data.usernameOrEmail.length,
+                          }),
+                          "success"
+                        );
+                        resetFields();
+                      } else {
+                        showToast(
+                          t("email_invite_team", {
+                            email: data.usernameOrEmail,
+                          }),
+                          "success"
+                        );
                       }
                     },
                     onError: (error) => {
diff --git a/packages/features/users/components/UserTable/InviteMemberModal.tsx b/packages/features/users/components/UserTable/InviteMemberModal.tsx
index c4201a3225..0cdb5b12fd 100644
--- a/packages/features/users/components/UserTable/InviteMemberModal.tsx
+++ b/packages/features/users/components/UserTable/InviteMemberModal.tsx
@@ -23,22 +23,21 @@ export function InviteMemberModal(props: Props) {
       // loaded a bunch of data and idk how pagination works with invalidation. We may need to use
       // Optimistic updates here instead.
       await utils.viewer.organizations.listMembers.invalidate();
-      if (data.sendEmailInvitation) {
-        if (Array.isArray(data.usernameOrEmail)) {
-          showToast(
-            t("email_invite_team_bulk", {
-              userCount: data.usernameOrEmail.length,
-            }),
-            "success"
-          );
-        } else {
-          showToast(
-            t("email_invite_team", {
-              email: data.usernameOrEmail,
-            }),
-            "success"
-          );
-        }
+
+      if (Array.isArray(data.usernameOrEmail)) {
+        showToast(
+          t("email_invite_team_bulk", {
+            userCount: data.usernameOrEmail.length,
+          }),
+          "success"
+        );
+      } else {
+        showToast(
+          t("email_invite_team", {
+            email: data.usernameOrEmail,
+          }),
+          "success"
+        );
       }
     },
     onError: (error) => {
@@ -69,7 +68,6 @@ export function InviteMemberModal(props: Props) {
           language: i18n.language,
           role: values.role,
           usernameOrEmail: values.emailOrUsername,
-          sendEmailInvitation: values.sendInviteEmail,
           isOrg: true,
         });
       }}
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
index 721cc28418..b9d2a5c805 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.handler.ts
@@ -98,7 +98,7 @@ export const inviteMemberHandler = async ({ ctx, input }: InviteMemberOptions) =
         sendTo = invitee.email;
       }
       // inform user of membership by email
-      if (input.sendEmailInvitation && ctx?.user?.name && team?.name) {
+      if (ctx?.user?.name && team?.name) {
         const inviteTeamOptions = {
           joinLink: `${WEBAPP_URL}/auth/login?callbackUrl=/settings/teams`,
           isCalcomMember: true,
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.schema.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.schema.ts
index 3a0d9816ea..69c7c24fe8 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.schema.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMember/inviteMember.schema.ts
@@ -12,7 +12,6 @@ export const ZInviteMemberInputSchema = z.object({
   }),
   role: z.nativeEnum(MembershipRole),
   language: z.string(),
-  sendEmailInvitation: z.boolean(),
   isOrg: z.boolean().default(false),
 });
 
diff --git a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
index 370e975901..ddde7024d8 100644
--- a/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
+++ b/packages/trpc/server/routers/viewer/teams/inviteMember/utils.ts
@@ -243,7 +243,6 @@ export async function sendVerificationEmail({
     role: "ADMIN" | "MEMBER" | "OWNER";
     usernameOrEmail: string | string[];
     language: string;
-    sendEmailInvitation: boolean;
     isOrg: boolean;
   };
   connectionInfo: ReturnType<typeof getOrgConnectionInfo>;