From fd37397e5cfd090d65ad9650e3e3463443478ed8 Mon Sep 17 00:00:00 2001 From: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Date: Fri, 16 Dec 2022 22:11:08 +0100 Subject: [PATCH] Fix/workflow email (#6069) * teams plan needed * disable * disable * type fix Co-authored-by: CarinaWolli --- .../ee/workflows/lib/reminders/emailReminderManager.ts | 5 +---- .../ee/workflows/lib/reminders/reminderScheduler.ts | 10 ++-------- packages/trpc/server/routers/viewer/workflows.tsx | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts index 186069c9ad..088a733b44 100644 --- a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts @@ -39,6 +39,7 @@ export const scheduleEmailReminder = async ( workflowStepId: number, template: WorkflowTemplates ) => { + if (action === WorkflowActions.EMAIL_ADDRESS) return; const { startTime, endTime } = evt; const uid = evt.uid as string; const currentDate = dayjs(); @@ -76,10 +77,6 @@ export const scheduleEmailReminder = async ( attendeeName = evt.organizer.name; timeZone = evt.attendees[0].timeZone; break; - case WorkflowActions.EMAIL_ADDRESS: - name = ""; - attendeeName = evt.attendees[0].name; - timeZone = evt.organizer.timeZone; } let emailContent = { diff --git a/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts b/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts index 8639f4a6db..1b5b1d46a4 100644 --- a/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts +++ b/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts @@ -58,8 +58,7 @@ export const scheduleWorkflowReminders = async ( ); } else if ( step.action === WorkflowActions.EMAIL_ATTENDEE || - step.action === WorkflowActions.EMAIL_HOST || - step.action === WorkflowActions.EMAIL_ADDRESS + step.action === WorkflowActions.EMAIL_HOST ) { let sendTo = ""; @@ -70,8 +69,6 @@ export const scheduleWorkflowReminders = async ( case WorkflowActions.EMAIL_ATTENDEE: sendTo = evt.attendees[0].email; break; - case WorkflowActions.EMAIL_ADDRESS: - sendTo = step.sendTo || ""; } scheduleEmailReminder( evt, @@ -129,8 +126,7 @@ export const sendCancelledReminders = async ( ); } else if ( step.action === WorkflowActions.EMAIL_ATTENDEE || - step.action === WorkflowActions.EMAIL_HOST || - step.action === WorkflowActions.EMAIL_ADDRESS + step.action === WorkflowActions.EMAIL_HOST ) { let sendTo = ""; @@ -141,8 +137,6 @@ export const sendCancelledReminders = async ( case WorkflowActions.EMAIL_ATTENDEE: sendTo = evt.attendees[0].email; break; - case WorkflowActions.EMAIL_ADDRESS: - sendTo = step.sendTo || ""; } scheduleEmailReminder( evt, diff --git a/packages/trpc/server/routers/viewer/workflows.tsx b/packages/trpc/server/routers/viewer/workflows.tsx index a0cd2fbfff..572ddee949 100644 --- a/packages/trpc/server/routers/viewer/workflows.tsx +++ b/packages/trpc/server/routers/viewer/workflows.tsx @@ -884,7 +884,7 @@ export const workflowsRouter = router({ throw new TRPCError({ code: "UNAUTHORIZED" }); } - if (isSMSAction(step.action)) { + if (isSMSAction(step.action) || step.action === WorkflowActions.EMAIL_ADDRESS) { const hasTeamPlan = (await ctx.prisma.membership.count({ where: { userId: user.id } })) > 0; if (!hasTeamPlan) { throw new TRPCError({ code: "UNAUTHORIZED", message: "Team plan needed" });