Scheduling infrastructure for absolutely everyone.
fix: canceling workflow reminders (#21416)
Carina Wollendorfer4ff366cd9977
diff --git a/packages/features/tasker/tasks/scanWorkflowBody.test.ts b/packages/features/tasker/tasks/scanWorkflowBody.test.tsindex dda3b03086e..a17a95eed62 100644--- a/packages/features/tasker/tasks/scanWorkflowBody.test.ts+++ b/packages/features/tasker/tasks/scanWorkflowBody.test.ts@@ -5,7 +5,7 @@ import { describe, expect, it, vi, beforeEach } from "vitest";import { lockUser, LockReason } from "@calcom/lib/autoLock";import { scheduleWorkflowNotifications } from "@calcom/trpc/server/routers/viewer/workflows/util";-import { scanWorkflowBody } from "./scanWorkflowBody";+import { scanWorkflowBody, iffyScanBody } from "./scanWorkflowBody";vi.mock("@calcom/lib/autoLock", async (importActual) => {const actual = await importActual<typeof import("@calcom/lib/autoLock")>();@@ -19,6 +19,14 @@ vi.mock("@calcom/trpc/server/routers/viewer/workflows/util", () => ({scheduleWorkflowNotifications: vi.fn(),}));+vi.mock("./scanWorkflowBody", async (importActual) => {+ const actual = await importActual<typeof import("./scanWorkflowBody")>();+ return {+ ...actual,+ iffyScanBody: vi.fn(),+ };+});+const mockWorkflowStep = {id: 1,reminderBody: "Test reminder body",@@ -58,7 +66,7 @@ describe("scanWorkflowBody", () => {await scanWorkflowBody(payload);- expect(prismaMock.workflowStep.findMany).not.toHaveBeenCalled();+ expect(iffyScanBody).not.toHaveBeenCalled();});it("should mark workflow step as safe if no reminder body", async () => {diff --git a/packages/features/tasker/tasks/scanWorkflowBody.ts b/packages/features/tasker/tasks/scanWorkflowBody.tsindex 694dcde1803..f1d06a652b9 100644--- a/packages/features/tasker/tasks/scanWorkflowBody.ts+++ b/packages/features/tasker/tasks/scanWorkflowBody.ts@@ -19,21 +19,6 @@ const log = logger.getSubLogger({ prefix: ["[tasker] scanWorkflowBody"] });export async function scanWorkflowBody(payload: string) {const { workflowStepIds, userId } = scanWorkflowBodySchema.parse(JSON.parse(payload));- if (!process.env.IFFY_API_KEY) {- log.info("IFFY_API_KEY not set, skipping scan");- await prisma.workflowStep.updateMany({- where: {- id: {- in: workflowStepIds,- },- },- data: {- verifiedAt: new Date(),- },- });- return;- }-const workflowSteps = await prisma.workflowStep.findMany({where: {id: {@@ -55,38 +40,66 @@ export async function scanWorkflowBody(payload: string) {},});- for (const workflowStep of workflowSteps) {- if (!workflowStep.reminderBody) {- await prisma.workflowStep.update({- where: {- id: workflowStep.id,- },- data: {- verifiedAt: new Date(),- },+ if (process.env.IFFY_API_KEY) {+ for (const workflowStep of workflowSteps) {+ if (!workflowStep.reminderBody) {+ await prisma.workflowStep.update({+ where: {+ id: workflowStep.id,+ },+ data: {+ verifiedAt: new Date(),+ },+ });+ continue;+ }++ const timeFormat = getTimeFormatStringFromUserTimeFormat(workflowStep.workflow.user?.timeFormat);++ // Determine if body is a template+ const defaultTemplate = getTemplateBodyForAction({+ action: workflowStep.action,+ locale: workflowStep.workflow.user?.locale ?? "en",+ t: await getTranslation(workflowStep.workflow.user?.locale ?? "en", "common"),+ template: workflowStep.template,+ timeFormat,});- continue;- }- const timeFormat = getTimeFormatStringFromUserTimeFormat(workflowStep.workflow.user?.timeFormat);+ if (!defaultTemplate) {+ log.error(`Template not found for action ${workflowStep.action}, template ${workflowStep.template}`);+ continue;+ }- // Determine if body is a template- const defaultTemplate = getTemplateBodyForAction({- action: workflowStep.action,- locale: workflowStep.workflow.user?.locale ?? "en",- t: await getTranslation(workflowStep.workflow.user?.locale ?? "en", "common"),- template: workflowStep.template,- timeFormat,- });+ if (+ compareReminderBodyToTemplate({ reminderBody: workflowStep.reminderBody, template: defaultTemplate })+ ) {+ await prisma.workflowStep.update({+ where: {+ id: workflowStep.id,+ },+ data: {+ verifiedAt: new Date(),+ },+ });+ continue;+ }- if (!defaultTemplate) {- log.error(`Template not found for action ${workflowStep.action}, template ${workflowStep.template}`);- continue;- }+ const isSpam = await iffyScanBody(workflowStep.reminderBody, workflowStep.id);++ if (isSpam) {+ if (!workflowStep.workflow.user?.whitelistWorkflows) {+ // We won't delete the workflow step incase it is flagged as a false positive+ log.warn(`Workflow step ${workflowStep.id} is spam with body ${workflowStep.reminderBody}`);+ await lockUser("userId", userId.toString(), LockReason.SPAM_WORKFLOW_BODY);++ // Return early if spam is detected+ return;+ }+ log.warn(+ `For whitelisted user, workflow step ${workflowStep.id} is spam with body ${workflowStep.reminderBody}`+ );+ }- if (- compareReminderBodyToTemplate({ reminderBody: workflowStep.reminderBody, template: defaultTemplate })- ) {await prisma.workflowStep.update({where: {id: workflowStep.id,@@ -95,28 +108,16 @@ export async function scanWorkflowBody(payload: string) {verifiedAt: new Date(),},});- continue;- }-- const isSpam = await iffyScanBody(workflowStep.reminderBody, workflowStep.id);-- if (isSpam) {- if (!workflowStep.workflow.user?.whitelistWorkflows) {- // We won't delete the workflow step incase it is flagged as a false positive- log.warn(`Workflow step ${workflowStep.id} is spam with body ${workflowStep.reminderBody}`);- await lockUser("userId", userId.toString(), LockReason.SPAM_WORKFLOW_BODY);-- // Return early if spam is detected- return;- }- log.warn(- `For whitelisted user, workflow step ${workflowStep.id} is spam with body ${workflowStep.reminderBody}`- );}+ }- await prisma.workflowStep.update({+ if (!process.env.IFFY_API_KEY) {+ log.info("IFFY_API_KEY not set, skipping scan");+ await prisma.workflowStep.updateMany({where: {- id: workflowStep.id,+ id: {+ in: workflowStepIds,+ },},data: {verifiedAt: new Date(),@@ -159,7 +160,7 @@ export async function scanWorkflowBody(payload: string) {});}-const iffyScanBody = async (body: string, workflowStepId: number) => {+export const iffyScanBody = async (body: string, workflowStepId: number) => {try {const response = await fetch("https://api.iffy.com/api/v1/moderate", {method: "POST",diff --git a/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts b/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.tsindex bbadb64406e..6c73e5c2bdc 100644--- a/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts+++ b/packages/trpc/server/routers/viewer/workflows/activateEventType.handler.ts@@ -164,8 +164,9 @@ export const activateEventTypeHandler = async ({ ctx, input }: ActivateEventTypeconst remindersToDelete = await prisma.workflowReminder.findMany({where: {booking: {- eventTypeId: eventTypeId,- userId: ctx.user.id,+ eventTypeId: {+ in: Array.from(activeOnEventTypes.keys()),+ },},workflowStepId: {in: eventTypeWorkflow.steps.map((step) => {