From 2ab24e530ba9ee7f302426de93bc796ddcfea4c7 Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Sat, 17 Dec 2022 22:51:00 +0000 Subject: [PATCH] Nope on test (#6085) * Nope on test * Use // instead of /**/ * Investigating why types are failing --- .../features/ee/workflows/lib/constants.ts | 2 +- .../trpc/server/routers/viewer/workflows.tsx | 274 +++++++++--------- 2 files changed, 139 insertions(+), 137 deletions(-) diff --git a/packages/features/ee/workflows/lib/constants.ts b/packages/features/ee/workflows/lib/constants.ts index 21732a7a24..07e43a397b 100644 --- a/packages/features/ee/workflows/lib/constants.ts +++ b/packages/features/ee/workflows/lib/constants.ts @@ -11,7 +11,7 @@ export const WORKFLOW_TRIGGER_EVENTS = [ export const WORKFLOW_ACTIONS = [ WorkflowActions.EMAIL_HOST, WorkflowActions.EMAIL_ATTENDEE, - // WorkflowActions.EMAIL_ADDRESS, Disabling for now due to abuse episode + WorkflowActions.EMAIL_ADDRESS, WorkflowActions.SMS_ATTENDEE, WorkflowActions.SMS_NUMBER, ] as const; diff --git a/packages/trpc/server/routers/viewer/workflows.tsx b/packages/trpc/server/routers/viewer/workflows.tsx index c6b2618125..16bb01fe3f 100644 --- a/packages/trpc/server/routers/viewer/workflows.tsx +++ b/packages/trpc/server/routers/viewer/workflows.tsx @@ -10,7 +10,7 @@ import { } from "@prisma/client"; import { z } from "zod"; -import dayjs from "@calcom/dayjs"; +// import dayjs from "@calcom/dayjs"; import { WORKFLOW_TEMPLATES, WORKFLOW_TRIGGER_EVENTS, @@ -23,7 +23,7 @@ import { scheduleEmailReminder, } from "@calcom/features/ee/workflows/lib/reminders/emailReminderManager"; import { - BookingInfo, + // BookingInfo, deleteScheduledSMSReminder, scheduleSMSReminder, } from "@calcom/features/ee/workflows/lib/reminders/smsReminderManager"; @@ -32,7 +32,7 @@ import { sendVerificationCode, } from "@calcom/features/ee/workflows/lib/reminders/verifyPhoneNumber"; import { SENDER_ID } from "@calcom/lib/constants"; -import { getErrorFromUnknown } from "@calcom/lib/errors"; +// import { getErrorFromUnknown } from "@calcom/lib/errors"; import { getTranslation } from "@calcom/lib/server/i18n"; import { TRPCError } from "@trpc/server"; @@ -850,148 +850,150 @@ export const workflowsRouter = router({ reminderBody: z.string(), }) ) + // eslint-disable-next-line @typescript-eslint/no-unused-vars .mutation(async ({ ctx, input }) => { - const { user } = ctx; - const { step, emailSubject, reminderBody } = input; - const { action, template, sendTo, sender } = step; + throw new TRPCError({ code: "FORBIDDEN", message: "Test action temporarily disabled" }); + // const { user } = ctx; + // const { step, emailSubject, reminderBody } = input; + // const { action, template, sendTo, sender } = step; - const senderID = sender || SENDER_ID; + // const senderID = sender || SENDER_ID; - if (action === WorkflowActions.SMS_NUMBER) { - if (!sendTo) throw new TRPCError({ code: "BAD_REQUEST", message: "Missing sendTo" }); - const verifiedNumbers = await ctx.prisma.verifiedNumber.findFirst({ - where: { - userId: ctx.user.id, - phoneNumber: sendTo, - }, - }); - if (!verifiedNumbers) - throw new TRPCError({ code: "UNAUTHORIZED", message: "Phone number is not verified" }); - } + // if (action === WorkflowActions.SMS_NUMBER) { + // if (!sendTo) throw new TRPCError({ code: "BAD_REQUEST", message: "Missing sendTo" }); + // const verifiedNumbers = await ctx.prisma.verifiedNumber.findFirst({ + // where: { + // userId: ctx.user.id, + // phoneNumber: sendTo, + // }, + // }); + // if (!verifiedNumbers) + // throw new TRPCError({ code: "UNAUTHORIZED", message: "Phone number is not verified" }); + // } - try { - const userWorkflow = await ctx.prisma.workflow.findUnique({ - where: { - id: step.workflowId, - }, - select: { - userId: true, - steps: true, - }, - }); + // try { + // const userWorkflow = await ctx.prisma.workflow.findUnique({ + // where: { + // id: step.workflowId, + // }, + // select: { + // userId: true, + // steps: true, + // }, + // }); - if (!userWorkflow || userWorkflow.userId !== user.id) { - throw new TRPCError({ code: "UNAUTHORIZED" }); - } + // if (!userWorkflow || userWorkflow.userId !== user.id) { + // throw new TRPCError({ code: "UNAUTHORIZED" }); + // } - 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" }); - } - } + // 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" }); + // } + // } - const booking = await ctx.prisma.booking.findFirst({ - orderBy: { - createdAt: "desc", - }, - where: { - userId: ctx.user.id, - }, - include: { - attendees: true, - user: true, - }, - }); + // const booking = await ctx.prisma.booking.findFirst({ + // orderBy: { + // createdAt: "desc", + // }, + // where: { + // userId: ctx.user.id, + // }, + // include: { + // attendees: true, + // user: true, + // }, + // }); - let evt: BookingInfo; - if (booking) { - evt = { - uid: booking?.uid, - attendees: - booking?.attendees.map((attendee) => { - return { name: attendee.name, email: attendee.email, timeZone: attendee.timeZone }; - }) || [], - organizer: { - language: { - locale: booking?.user?.locale || "", - }, - name: booking?.user?.name || "", - email: booking?.user?.email || "", - timeZone: booking?.user?.timeZone || "", - }, - startTime: booking?.startTime.toISOString() || "", - endTime: booking?.endTime.toISOString() || "", - title: booking?.title || "", - location: booking?.location || null, - additionalNotes: booking?.description || null, - customInputs: booking?.customInputs, - }; - } else { - //if no booking exists create an example booking - evt = { - attendees: [{ name: "John Doe", email: "john.doe@example.com", timeZone: "Europe/London" }], - organizer: { - language: { - locale: ctx.user.locale, - }, - name: ctx.user.name || "", - email: ctx.user.email, - timeZone: ctx.user.timeZone, - }, - startTime: dayjs().add(10, "hour").toISOString(), - endTime: dayjs().add(11, "hour").toISOString(), - title: "Example Booking", - location: "Office", - additionalNotes: "These are additional notes", - }; - } + // let evt: BookingInfo; + // if (booking) { + // evt = { + // uid: booking?.uid, + // attendees: + // booking?.attendees.map((attendee) => { + // return { name: attendee.name, email: attendee.email, timeZone: attendee.timeZone }; + // }) || [], + // organizer: { + // language: { + // locale: booking?.user?.locale || "", + // }, + // name: booking?.user?.name || "", + // email: booking?.user?.email || "", + // timeZone: booking?.user?.timeZone || "", + // }, + // startTime: booking?.startTime.toISOString() || "", + // endTime: booking?.endTime.toISOString() || "", + // title: booking?.title || "", + // location: booking?.location || null, + // additionalNotes: booking?.description || null, + // customInputs: booking?.customInputs, + // }; + // } else { + // //if no booking exists create an example booking + // evt = { + // attendees: [{ name: "John Doe", email: "john.doe@example.com", timeZone: "Europe/London" }], + // organizer: { + // language: { + // locale: ctx.user.locale, + // }, + // name: ctx.user.name || "", + // email: ctx.user.email, + // timeZone: ctx.user.timeZone, + // }, + // startTime: dayjs().add(10, "hour").toISOString(), + // endTime: dayjs().add(11, "hour").toISOString(), + // title: "Example Booking", + // location: "Office", + // additionalNotes: "These are additional notes", + // }; + // } - if ( - action === WorkflowActions.EMAIL_ATTENDEE || - action === WorkflowActions.EMAIL_HOST /*|| - action === WorkflowActions.EMAIL_ADDRESS*/ - ) { - scheduleEmailReminder( - evt, - WorkflowTriggerEvents.NEW_EVENT, - action, - { time: null, timeUnit: null }, - ctx.user.email, - emailSubject, - reminderBody, - 0, - template - ); - return { message: "Notification sent" }; - } else if (action === WorkflowActions.SMS_NUMBER && sendTo) { - scheduleSMSReminder( - evt, - sendTo, - WorkflowTriggerEvents.NEW_EVENT, - action, - { time: null, timeUnit: null }, - reminderBody, - 0, - template, - senderID, - ctx.user.id - ); - return { message: "Notification sent" }; - } - return { - ok: false, - status: 500, - message: "Notification could not be sent", - }; - } catch (_err) { - const error = getErrorFromUnknown(_err); - return { - ok: false, - status: 500, - message: error.message, - }; - } + // if ( + // action === WorkflowActions.EMAIL_ATTENDEE || + // action === WorkflowActions.EMAIL_HOST /*|| + // action === WorkflowActions.EMAIL_ADDRESS*/ + // ) { + // scheduleEmailReminder( + // evt, + // WorkflowTriggerEvents.NEW_EVENT, + // action, + // { time: null, timeUnit: null }, + // ctx.user.email, + // emailSubject, + // reminderBody, + // 0, + // template + // ); + // return { message: "Notification sent" }; + // } else if (action === WorkflowActions.SMS_NUMBER && sendTo) { + // scheduleSMSReminder( + // evt, + // sendTo, + // WorkflowTriggerEvents.NEW_EVENT, + // action, + // { time: null, timeUnit: null }, + // reminderBody, + // 0, + // template, + // senderID, + // ctx.user.id + // ); + // return { message: "Notification sent" }; + // } + // return { + // ok: false, + // status: 500, + // message: "Notification could not be sent", + // }; + // } catch (_err) { + // const error = getErrorFromUnknown(_err); + // return { + // ok: false, + // status: 500, + // message: error.message, + // }; + // } }), activateEventType: authedProcedure .input(