feat: SMS workflow action for form triggers #3 (calcom#23673)

CarinaWolli · CarinaWolli · Amit91848 · web-flow · commit e63923708873 · 2025-10-21T15:28:10.000Z
* allow routing forms for activeOn * use repository function to get routing forms * remove unnecessary code * adjust logic in update handler * add triggers to api v2 * remvoe unused file * rename to getAcitveOnOptions handler * remove routingFormOptions handler * clean up getActiveOnOptions * refactor WorkflowService * remove logs * remove unused * fix: type check * fix: missed before after events for recurring * fix: calendarEvent handleMarkNoShow * fix error message Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * don't query disabled routing forms * create tasker function * add tasker code * move isFormTrigger function * small adjustments + todo comments * remove email to host action for form triggers * throw trpc error if email to host is added as step * fix dialog on how to use form responses as variables * remove add variable dropdown for form triggers * remove form workfows in event workflows tab * improvements for workflow logic on form submission * review fixes * base setup for seperate schedule functions (evt and form) * add missing BOOKING_PAID workflow trigger * fix pathname * fix: test for BOOKING_REQUESTED * fix activeOn ids * pass hideBranding and smsReminderNumber * adjustments to reminderScheduler * create empty scheduelForForm functions * pass locale and timezone with form user * pass formData instead of responses * pass timeFormat and locale * reusable function for email sending and reminder creation * implement scheduleEmailReminderForForm * remove added editor field from merge conflict * don't support cal.ai action with form triggers * throw bad request if form trigger and cal.ai is combined * add tests for scheduleFormWorkflows * add form submission tests * remove form response varibe info * clean up workflow actions * fixes for getting template options * pass triggerType to getAllWorkflows * move reusable logic to scheduleSMSReminder * add formdata to param type * type fixes for text reminder managers * implement scheduleSMSReminderForForm * fix import * fix isAuthorizedToAddActiveOnIds * disble whatsapp action * implement triggerFormSubmittedNoEventWorkflow * code clean up * Merge branch 'devin/1755107037-add-workflow-triggers' into feat/routing-form-workflow-triggers * fix type errors * remove async from getSubmitterEmail * fix type errors * revert cal.ai changes * fix type error * add sublogger * code clean up * fix type errors * remove label for attendee whatsapp action * code clean up * fixes saving teams on org workflows * fix type error * code improvements for activeOn ids * Revert "code improvements for activeOn ids" This reverts commit 0a3590a. * improve variable name * fix unit tests * small fixes * type fixes * remove unused translation keys * fix merge conflict issues * code clean up * remove SMS action support * remove more SMS code * add missing imports * set custom template for form action * type fixes * fix tasker endpoint * fix duplicate check * fix workfows.test.ts * use repository funciton to getHideBranding * add back SMS action * add back changes to smsReminderManager * code clean up * fix hasDuplicateSubmission * code clean up * select only needed properties * remove repository functions * Revert "remove repository functions" This reverts commit 7aa47b1. * add scheduleWorkflows function * Revert "add scheduleWorkflows function" This reverts commit fe5db4f. * move type to /types * Revert "move type to /types" This reverts commit 91e0152. * revert changes causing type errors * remove import * remove unused import * Revert "remove unused import" This reverts commit 1916768. * revert changed from attempt to fix type errors * pass object to gt all workflows * fix isAuthorized check * trigger filtering * remove form submitted no event booked code * remove form submitted no event from schema * remove more code * remove test * fixes * add getSubmitterEmail function * add trigger * small fixes * add missing workflow DTOs * small fixes * use activeOnWithChildren * fix active on when switching trigger type * remove add variable dropdown * add getAllWorkflowsFromRoutingForm to WorkflowService * fix error caused by undefined evt * fix type error * fix type error * fix tests * code clean up * final fixes and clean up * remove console.log * remove template text form from triggers * add routing form repoditory function * fix bug with key * add comments * fix test * add missing await * use predefined FormSubmissionData type * add .trim() to sms message * pass contextData instead * add missing trigger in update-workflow.input.ts * ForEvt and ForForm function for aiPhoneCallManager * chore: add support for form workflows on api v2 * fixup! chore: add support for form workflows on api v2 * use only repository functions in update handler * move all prisma queries from list.handler * review suggestions * chore: handle workflows api v2 * chore: handle workflows api v2, split in 2 endpoints * fix workflow step creation * remove connect agent and fixes types * add type to workflow * chore: use workflow type in apiv2 WorkflowsOutputService * update worklfow type on update * chore: use workflow type in apiv2 WorkflowsOutputService * fix template body for torm trigger * some UI fixes for email subject/body * resetting email body when changing form triggers * use type field to query workflows * clean up all old active on values * remove responseId from all funciton calls * remove undefined from updateTemplate * refactor: split routing form and event-type workflows code * refactor: split routing form and event-type workflows code * fix template text when adding action * chore: don't rename WorkflowActivationDto to avoid ci blocking * refine update schedule to use only allowed actions * fix type error * don't allow whatsapp action with form trigger * fix type error * return early if activeOn array is empty * fix: from step type in BaseFormWorkflowStepDto * fixup! fix: from step type in BaseFormWorkflowStepDto * api v2 updates * move all prisma calls to repository (service/workflows.ts) * use FORM_TRIGGER_WORKFLOW_EVENTS for form queries * use userRepository * use FORM_TRIGGER_WORKFLOW_EVENTS in isFormTrigger * code clean up * code clean up * use repository functions in formSubmissionValidation.ts * remove action check in update handler * add back trpc import * fix agent repository functions * add SMS actions to allowed form action constants * remove unsued import * fixes for offset api v2 * add missing responseId * fix failing test * fix failing test * remove unused imports * chore: handle sms step action for form worklfow in dtos --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
diff --git a/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/teams/workflows/controllers/org-team-workflows.controller.e2e-spec.ts
@@ -404,7 +404,7 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
       invalidWorkflow.steps = [
         {
           stepNumber: 1,
-          action: "sms_number",
+          action: "cal_ai_phone_call",
           recipient: PHONE_NUMBER,
           template: REMINDER,
           verifiedPhoneId: verifiedPhoneId,
@@ -439,6 +439,18 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
             html: "<p>Reminder for your event {EVENT_NAME}.</p>",
           },
         },
+        {
+          stepNumber: 2,
+          action: "sms_attendee",
+          recipient: EMAIL,
+          template: REMINDER,
+          phoneRequired: false,
+          sender: "updatedSender",
+          message: {
+            subject: "Update Upcoming: {EVENT_NAME}",
+            text: "Update Reminder for your event {EVENT_NAME}.</p>",
+          },
+        },
       ];
       return request(app.getHttpServer())
         .post(`${basePath}/routing-form`)
@@ -459,12 +471,15 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
           }
 
           expect(responseBody.data.trigger.type).toEqual(sampleCreateWorkflowRoutingFormDto.trigger.type);
-          expect(responseBody.data.steps).toHaveLength(sampleCreateWorkflowRoutingFormDto.steps.length);
+          expect(responseBody.data.steps).toHaveLength(validWorkflow.steps.length);
           expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.id).toBeDefined();
           expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.sender).toEqual(
             "CalcomE2EStep1"
           );
 
+          expect(responseBody.data.steps.find((step) => step.stepNumber === 2)?.id).toBeDefined();
+          expect(responseBody.data.steps.find((step) => step.action === "sms_attendee")).toBeDefined();
+
           const trigger = sampleCreateWorkflowRoutingFormDto.trigger as OnFormSubmittedTriggerDto;
           expect(responseBody.data.trigger?.type).toEqual(trigger.type);
 
diff --git a/apps/api/v2/src/modules/workflows/inputs/create-form-workflow.ts b/apps/api/v2/src/modules/workflows/inputs/create-form-workflow.ts
@@ -7,8 +7,12 @@ import {
   EMAIL_ADDRESS,
   EMAIL_ATTENDEE,
   FORM_ALLOWED_STEP_ACTIONS,
+  SMS_NUMBER,
   WorkflowEmailAddressStepDto,
   WorkflowEmailAttendeeStepDto,
+  WorkflowPhoneNumberStepDto,
+  WorkflowPhoneAttendeeStepDto,
+  SMS_ATTENDEE,
 } from "./workflow-step.input";
 import {
   RoutingFormWorkflowTriggerDto,
@@ -85,6 +89,8 @@ export class CreateFormWorkflowDto {
     oneOf: [
       { $ref: getSchemaPath(WorkflowEmailAddressStepDto) },
       { $ref: getSchemaPath(WorkflowEmailAttendeeStepDto) },
+      { $ref: getSchemaPath(WorkflowPhoneAttendeeStepDto) },
+      { $ref: getSchemaPath(WorkflowPhoneNumberStepDto) },
     ],
     type: "array",
   })
@@ -99,8 +105,15 @@ export class CreateFormWorkflowDto {
       subTypes: [
         { value: WorkflowEmailAddressStepDto, name: EMAIL_ADDRESS },
         { value: WorkflowEmailAttendeeStepDto, name: EMAIL_ATTENDEE },
+        { value: WorkflowPhoneAttendeeStepDto, name: SMS_ATTENDEE },
+        { value: WorkflowPhoneNumberStepDto, name: SMS_NUMBER },
       ],
     },
   })
-  steps!: (WorkflowEmailAddressStepDto | WorkflowEmailAttendeeStepDto)[];
+  steps!: (
+    | WorkflowEmailAddressStepDto
+    | WorkflowEmailAttendeeStepDto
+    | WorkflowPhoneAttendeeStepDto
+    | WorkflowPhoneNumberStepDto
+  )[];
 }
diff --git a/apps/api/v2/src/modules/workflows/inputs/update-form-workflow.input.ts b/apps/api/v2/src/modules/workflows/inputs/update-form-workflow.input.ts
@@ -8,6 +8,8 @@ import {
   EMAIL_ADDRESS,
   EMAIL_ATTENDEE,
   FORM_ALLOWED_STEP_ACTIONS,
+  SMS_ATTENDEE,
+  SMS_NUMBER,
   UpdateEmailAddressWorkflowStepDto,
   UpdateEmailAttendeeWorkflowStepDto,
   UpdateEmailHostWorkflowStepDto,
@@ -75,6 +77,8 @@ export class UpdateFormWorkflowDto {
     oneOf: [
       { $ref: getSchemaPath(UpdateEmailAddressWorkflowStepDto) },
       { $ref: getSchemaPath(UpdateEmailAttendeeWorkflowStepDto) },
+      { $ref: getSchemaPath(UpdatePhoneAttendeeWorkflowStepDto) },
+      { $ref: getSchemaPath(UpdatePhoneNumberWorkflowStepDto) },
     ],
     type: "array",
   })
@@ -90,8 +94,15 @@ export class UpdateFormWorkflowDto {
       subTypes: [
         { value: UpdateEmailAddressWorkflowStepDto, name: EMAIL_ADDRESS },
         { value: UpdateEmailAttendeeWorkflowStepDto, name: EMAIL_ATTENDEE },
+        { value: UpdatePhoneAttendeeWorkflowStepDto, name: SMS_ATTENDEE },
+        { value: UpdatePhoneNumberWorkflowStepDto, name: SMS_NUMBER },
       ],
     },
   })
-  steps?: (UpdateEmailAddressWorkflowStepDto | UpdateEmailAttendeeWorkflowStepDto)[];
+  steps?: (
+    | UpdateEmailAddressWorkflowStepDto
+    | UpdateEmailAttendeeWorkflowStepDto
+    | UpdatePhoneNumberWorkflowStepDto
+    | UpdatePhoneAttendeeWorkflowStepDto
+  )[];
 }
diff --git a/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts b/apps/api/v2/src/modules/workflows/inputs/workflow-step.input.ts
@@ -24,7 +24,7 @@ export const STEP_ACTIONS = [
   CAL_AI_PHONE_CALL,
 ] as const;
 
-export const FORM_ALLOWED_STEP_ACTIONS = [EMAIL_ATTENDEE, EMAIL_ADDRESS] as const;
+export const FORM_ALLOWED_STEP_ACTIONS = [EMAIL_ATTENDEE, EMAIL_ADDRESS, SMS_ATTENDEE, SMS_NUMBER] as const;
 
 export const STEP_ACTIONS_TO_ENUM = {
   [EMAIL_HOST]: WorkflowActions.EMAIL_HOST,
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
@@ -1460,6 +1460,7 @@
   "email_host_action": "send email to host",
   "email_attendee_action": "send email to attendees",
   "email_attendee_action_form": "Send email to submitted email address",
+  "sms_attendee_action_form": "Send SMS to submitted phone number",
   "sms_attendee_action": "Send SMS to attendee",
   "sms_number_action": "send SMS to a specific number",
   "send_reminder_sms": "Easily send meeting reminders via SMS to your attendees",
diff --git a/packages/features/ee/workflows/api/scheduleSMSReminders.ts b/packages/features/ee/workflows/api/scheduleSMSReminders.ts
@@ -171,11 +171,7 @@ export async function handler(req: NextRequest) {
       }
 
       if (message?.length && message?.length > 0 && sendTo) {
-        const smsMessageWithoutOptOut = message;
-
-        if (process.env.TWILIO_OPT_OUT_ENABLED === "true") {
-          message = await WorkflowOptOutService.addOptOutMessage(message, locale || "en");
-        }
+        const smsMessageWithoutOptOut = await WorkflowOptOutService.addOptOutMessage(message, locale || "en");
 
         const scheduledNotification = await scheduleSmsOrFallbackEmail({
           twilioData: {
diff --git a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx
@@ -79,6 +79,8 @@ export default function WorkflowDetailsPage(props: Props) {
           if (isFormTrigger(form.getValues("trigger"))) {
             if (option.value === WorkflowActions.EMAIL_ATTENDEE) {
               label = t("email_attendee_action_form");
+            } else if (option.value === WorkflowActions.SMS_ATTENDEE) {
+              label = t("sms_attendee_action_form");
             }
           }
 
@@ -167,11 +169,11 @@ export default function WorkflowDetailsPage(props: Props) {
     <>
       <div>
         <FormCard
-          className="border-muted mb-0"
+          className="mb-0 border-muted"
           collapsible={false}
           label={
-            <div className="flex items-center gap-2 pb-2 pt-1">
-              <div className="border-subtle text-subtle ml-1 rounded-lg border p-1">
+            <div className="flex gap-2 items-center pt-1 pb-2">
+              <div className="p-1 ml-1 rounded-lg border border-subtle text-subtle">
                 <Icon name="zap" size="16" />
               </div>
               <div className="text-sm font-medium leading-none">{t("trigger")}</div>
@@ -208,11 +210,11 @@ export default function WorkflowDetailsPage(props: Props) {
                 <div key={index}>
                   <FormCard
                     key={step.id}
-                    className="bg-muted border-muted mb-0"
+                    className="mb-0 bg-muted border-muted"
                     collapsible={false}
                     label={
-                      <div className="flex items-center gap-2 pb-2 pt-1">
-                        <div className="border-subtle text-subtle rounded-lg border p-1">
+                      <div className="flex gap-2 items-center pt-1 pb-2">
+                        <div className="p-1 rounded-lg border border-subtle text-subtle">
                           <Icon name="arrow-right" size="16" />
                         </div>
                         <div className="text-sm font-medium leading-none">{t("action")}</div>
diff --git a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx b/packages/features/ee/workflows/components/WorkflowStepContainer.tsx
@@ -380,11 +380,10 @@ export default function WorkflowStepContainer(props: WorkflowStepProps) {
   });
 
   const hasAiAction = hasCalAIAction(steps);
-  const hasSMSAction = steps.some((s) => isSMSAction(s.action));
-  const hasWhatsappAction = steps.some((s) => isWhatsappAction(s.action));
   const hasEmailToHostAction = steps.some((s) => s.action === WorkflowActions.EMAIL_HOST);
+  const hasWhatsappAction = steps.some((s) => isWhatsappAction(s.action));
 
-  const disallowFormTriggers = hasAiAction || hasSMSAction || hasEmailToHostAction || hasWhatsappAction;
+  const disallowFormTriggers = hasAiAction || hasEmailToHostAction || hasWhatsappAction;
 
   const filteredTriggerOptions = triggerOptions.filter(
     (option) => !(isFormTrigger(option.value) && disallowFormTriggers)
diff --git a/packages/features/ee/workflows/lib/constants.ts b/packages/features/ee/workflows/lib/constants.ts
@@ -108,4 +108,6 @@ export const FORM_TRIGGER_WORKFLOW_EVENTS: WorkflowTriggerEvents[] = [
 export const ALLOWED_FORM_WORKFLOW_ACTIONS = [
   WorkflowActions.EMAIL_ATTENDEE,
   WorkflowActions.EMAIL_ADDRESS,
+  WorkflowActions.SMS_ATTENDEE,
+  WorkflowActions.SMS_NUMBER,
 ] as const;
diff --git a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts
@@ -340,6 +340,7 @@ const scheduleEmailReminderForEvt = async (args: scheduleEmailReminderArgs & { e
   });
 };
 
+// sends all immediately, no scheduling needed
 const scheduleEmailReminderForForm = async (
   args: scheduleEmailReminderArgs & {
     formData: FormSubmissionData;
diff --git a/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts b/packages/features/ee/workflows/lib/reminders/reminderScheduler.ts
@@ -114,10 +114,6 @@ const processWorkflowStep = async (
   };
 
   if (isSMSAction(step.action)) {
-    if (!evt) {
-      // SMS action not not yet supported for form triggers
-      return;
-    }
     const sendTo = step.action === WorkflowActions.SMS_ATTENDEE ? smsReminderNumber : step.sendTo;
 
     await scheduleSMSReminder({
@@ -127,7 +123,7 @@ const processWorkflowStep = async (
       message: step.reminderBody || "",
       sender: step.sender,
       isVerificationPending: step.numberVerificationPending,
-      evt,
+      ...contextData,
     });
   } else if (
     step.action === WorkflowActions.EMAIL_ATTENDEE ||
diff --git a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts
diff --git a/packages/features/ee/workflows/lib/service/workflowOptOutService.ts b/packages/features/ee/workflows/lib/service/workflowOptOutService.ts
