fix: remove kyc and make text messages to attendee org only (calcom#1…

…1389) * add orgs upgrade badge to select * don't allow updating to if no teams or orgs plan * make sure only paying users can request verification codes * add new action helper function * remove kyc code * code clean up * fix verify button UI * fix type errors * add eventTypeRequiresConfirmation everywhere * address feedback --------- Co-authored-by: CarinaWolli <[email protected]>
hm-edu · Sep 21, 2023 · 3b50fe0 · 3b50fe0
1 parent 96263b0
commit 3b50fe0
Show file tree

Hide file tree

Showing 30 changed files with 89 additions and 542 deletions.
diff --git a/apps/web/pages/api/trpc/kycVerification/[trpc].ts b/apps/web/pages/api/trpc/kycVerification/[trpc].ts
diff --git a/apps/web/pages/settings/admin/kycVerification/index.tsx b/apps/web/pages/settings/admin/kycVerification/index.tsx
diff --git a/apps/web/pages/settings/admin/kycVerification/kycVerificationView.tsx b/apps/web/pages/settings/admin/kycVerification/kycVerificationView.tsx
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
@@ -1639,6 +1639,7 @@
   "minimum_round_robin_hosts_count": "Number of hosts required to attend",
   "hosts": "Hosts",
   "upgrade_to_enable_feature": "You need to create a team to enable this feature. Click to create a team.",
+  "orgs_upgrade_to_enable_feature" : "You need to upgrade to our enterprise plan to enable this feature.",
   "new_attendee": "New Attendee",
   "awaiting_approval": "Awaiting Approval",
   "requires_google_calendar": "This app requires a Google Calendar connection",
@@ -2003,11 +2004,6 @@
   "requires_booker_email_verification": "Requires booker email verification",
   "description_requires_booker_email_verification": "To ensure booker's email verification before scheduling events",
   "requires_confirmation_mandatory": "Text messages can only be sent to attendees when event type requires confirmation.",
-  "kyc_verification_information": "To ensure security, you have to verify your {{teamOrAccount}} before sending text messages to attendees. Please contact us at <a>{{supportEmail}}</a> and provide the following information:",
-  "kyc_verification_documents": "<ul><li>Your {{teamOrUser}}</li><li>For businesses: Attach your Business Verification Documentation</li><li>For individuals: Attach a government-issued ID</li></ul>",
-  "verify_team_or_account": "Verify {{teamOrAccount}}",
-  "verify_account": "Verify Account",
-  "kyc_verification": "KYC Verification",
   "organizations": "Organizations",
   "org_admin_other_teams": "Other teams",
   "org_admin_other_teams_description": "Here you can see teams inside your organization that you are not part of. You can add yourself to them if needed.",

diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts
@@ -9,7 +9,6 @@ import { deleteMeeting, updateMeeting } from "@calcom/core/videoClient";
 import dayjs from "@calcom/dayjs";
 import { sendCancelledEmails, sendCancelledSeatEmails } from "@calcom/emails";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
-import { isEventTypeOwnerKYCVerified } from "@calcom/features/ee/workflows/lib/isEventTypeOwnerKYCVerified";
 import { deleteScheduledEmailReminder } from "@calcom/features/ee/workflows/lib/reminders/emailReminderManager";
 import { sendCancelledReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
 import { deleteScheduledSMSReminder } from "@calcom/features/ee/workflows/lib/reminders/smsReminderManager";
@@ -71,17 +70,6 @@ async function getBookingToDelete(id: number | undefined, uid: string | undefine
             select: {
               id: true,
               hideBranding: true,
-              metadata: true,
-              teams: {
-                select: {
-                  accepted: true,
-                  team: {
-                    select: {
-                      metadata: true,
-                    },
-                  },
-                },
-              },
             },
           },
           teamId: true,
@@ -299,8 +287,6 @@ async function handler(req: CustomRequest) {
   );
   await Promise.all(promises);
 
-  const isKYCVerified = isEventTypeOwnerKYCVerified(bookingToDelete.eventType);
-
   //Workflows - schedule reminders
   if (bookingToDelete.eventType?.workflows) {
     await sendCancelledReminders({
@@ -311,7 +297,7 @@ async function handler(req: CustomRequest) {
         ...{ eventType: { slug: bookingToDelete.eventType.slug } },
       },
       hideBranding: !!bookingToDelete.eventType.owner?.hideBranding,
-      isKYCVerified,
+      eventTypeRequiresConfirmation: bookingToDelete.eventType.requiresConfirmation,
     });
   }
 

diff --git a/packages/features/bookings/lib/handleConfirmation.ts b/packages/features/bookings/lib/handleConfirmation.ts
@@ -3,7 +3,6 @@ import type { Prisma, Workflow, WorkflowsOnEventTypes, WorkflowStep } from "@pri
 import type { EventManagerUser } from "@calcom/core/EventManager";
 import EventManager from "@calcom/core/EventManager";
 import { sendScheduledEmails } from "@calcom/emails";
-import { isEventTypeOwnerKYCVerified } from "@calcom/features/ee/workflows/lib/isEventTypeOwnerKYCVerified";
 import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler";
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import { scheduleTrigger } from "@calcom/features/webhooks/lib/scheduleTrigger";
@@ -87,18 +86,8 @@ export async function handleConfirmation(args: {
     eventType: {
       bookingFields: Prisma.JsonValue | null;
       slug: string;
-      team: {
-        metadata: Prisma.JsonValue;
-      } | null;
       owner: {
         hideBranding?: boolean | null;
-        metadata: Prisma.JsonValue;
-        teams: {
-          accepted: boolean;
-          team: {
-            metadata: Prisma.JsonValue;
-          };
-        }[];
       } | null;
       workflows: (WorkflowsOnEventTypes & {
         workflow: Workflow & {
@@ -135,25 +124,9 @@ export async function handleConfirmation(args: {
             select: {
               slug: true,
               bookingFields: true,
-              team: {
-                select: {
-                  metadata: true,
-                },
-              },
               owner: {
                 select: {
                   hideBranding: true,
-                  metadata: true,
-                  teams: {
-                    select: {
-                      accepted: true,
-                      team: {
-                        select: {
-                          metadata: true,
-                        },
-                      },
-                    },
-                  },
                 },
               },
               workflows: {
@@ -202,25 +175,9 @@ export async function handleConfirmation(args: {
           select: {
             slug: true,
             bookingFields: true,
-            team: {
-              select: {
-                metadata: true,
-              },
-            },
             owner: {
               select: {
                 hideBranding: true,
-                metadata: true,
-                teams: {
-                  select: {
-                    accepted: true,
-                    team: {
-                      select: {
-                        metadata: true,
-                      },
-                    },
-                  },
-                },
               },
             },
             workflows: {
@@ -250,8 +207,6 @@ export async function handleConfirmation(args: {
     updatedBookings.push(updatedBooking);
   }
 
-  const isKYCVerified = isEventTypeOwnerKYCVerified(updatedBookings[0].eventType);
-
   //Workflows - set reminders for confirmed events
   try {
     for (let index = 0; index < updatedBookings.length; index++) {
@@ -276,7 +231,6 @@ export async function handleConfirmation(args: {
           isFirstRecurringEvent: isFirstBooking,
           hideBranding: !!updatedBookings[index].eventType?.owner?.hideBranding,
           eventTypeRequiresConfirmation: true,
-          isKYCVerified,
         });
       }
     }

diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts
@@ -39,7 +39,6 @@ import {
   allowDisablingAttendeeConfirmationEmails,
   allowDisablingHostConfirmationEmails,
 } from "@calcom/features/ee/workflows/lib/allowDisablingStandardEmails";
-import { isEventTypeOwnerKYCVerified } from "@calcom/features/ee/workflows/lib/isEventTypeOwnerKYCVerified";
 import {
   cancelWorkflowReminders,
   scheduleWorkflowReminders,
@@ -260,7 +259,6 @@ const getEventTypesFromDB = async (eventTypeId: number) => {
         select: {
           id: true,
           name: true,
-          metadata: true,
         },
       },
       bookingFields: true,
@@ -292,17 +290,6 @@ const getEventTypesFromDB = async (eventTypeId: number) => {
       owner: {
         select: {
           hideBranding: true,
-          metadata: true,
-          teams: {
-            select: {
-              accepted: true,
-              team: {
-                select: {
-                  metadata: true,
-                },
-              },
-            },
-          },
         },
       },
       workflows: {
@@ -379,7 +366,7 @@ async function ensureAvailableUsers(
   }
 ) {
   const availableUsers: IsFixedAwareUser[] = [];
-  const duration = dayjs(input.dateTo).diff(input.dateFrom, 'minute');
+  const duration = dayjs(input.dateTo).diff(input.dateFrom, "minute");
 
   const originalBookingDuration = input.originalRescheduledBooking
     ? dayjs(input.originalRescheduledBooking.endTime).diff(
@@ -1199,8 +1186,6 @@ async function handler(
 
   const subscribersMeetingEnded = await getWebhooks(subscriberOptionsMeetingEnded);
 
-  const isKYCVerified = isEventTypeOwnerKYCVerified(eventType);
-
   const handleSeats = async () => {
     let resultBooking:
       | (Partial<Booking> & {
@@ -1769,7 +1754,7 @@ async function handler(
         isFirstRecurringEvent: true,
         emailAttendeeSendToOverride: bookerEmail,
         seatReferenceUid: evt.attendeeSeatId,
-        isKYCVerified,
+        eventTypeRequiresConfirmation: eventType.requiresConfirmation,
       });
     } catch (error) {
       log.error("Error while scheduling workflow reminders", error);
@@ -2416,7 +2401,7 @@ async function handler(
       isFirstRecurringEvent: true,
       hideBranding: !!eventType.owner?.hideBranding,
       seatReferenceUid: evt.attendeeSeatId,
-      isKYCVerified,
+      eventTypeRequiresConfirmation: eventType.requiresConfirmation,
     });
   } catch (error) {
     log.error("Error while scheduling workflow reminders", error);

diff --git a/packages/features/ee/workflows/components/AddActionDialog.tsx b/packages/features/ee/workflows/components/AddActionDialog.tsx
@@ -39,7 +39,6 @@ interface IAddActionDialog {
     senderId?: string,
     senderName?: string
   ) => void;
-  setKYCVerificationDialogOpen: () => void;
 }
 
 interface ISelectActionOption {
@@ -57,7 +56,7 @@ type AddActionFormValues = {
 
 export const AddActionDialog = (props: IAddActionDialog) => {
   const { t } = useLocale();
-  const { isOpenDialog, setIsOpenDialog, addAction, setKYCVerificationDialogOpen } = props;
+  const { isOpenDialog, setIsOpenDialog, addAction } = props;
   const [isPhoneNumberNeeded, setIsPhoneNumberNeeded] = useState(false);
   const [isSenderIdNeeded, setIsSenderIdNeeded] = useState(false);
   const [isEmailAddressNeeded, setIsEmailAddressNeeded] = useState(false);
@@ -171,14 +170,13 @@ export const AddActionDialog = (props: IAddActionDialog) => {
                       onChange={handleSelectAction}
                       options={actionOptions.map((option) => ({
                         ...option,
-                        verificationAction: () => setKYCVerificationDialogOpen(),
                       }))}
                       isOptionDisabled={(option: {
                         label: string;
                         value: WorkflowActions;
-                        needsUpgrade: boolean;
-                        needsVerification: boolean;
-                      }) => option.needsUpgrade || option.needsVerification}
+                        needsTeamsUpgrade: boolean;
+                        needsOrgsUpgrade: boolean;
+                      }) => option.needsTeamsUpgrade || option.needsOrgsUpgrade}
                     />
                   );
                 }}