feat: add country code filtering for SMS workflows

apps/api/v2/src/ee/event-types/event-types_2024_06_14/pipes/event-type-response.transformer.ts

@@ -17,7 +17,7 @@ export class EventTypeResponseTransformPipe implements PipeTransform {
   private transformEventType(eventType: EventTypeResponse): EventTypeOutput_2024_06_14 {
     return plainToClass(
       EventTypeOutput_2024_06_14,
-      this.outputEventTypesService.getResponseEventType(eventType.ownerId, eventType, false),
+      this.outputEventTypesService.getResponseEventType(eventType.ownerId, eventType),
       { strategy: "exposeAll" }
     );
   }

apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.ts

@@ -96,11 +96,7 @@ type Input = Pick<
 
 @Injectable()
 export class OutputEventTypesService_2024_06_14 {
-  getResponseEventType(
-    ownerId: number,
-    databaseEventType: Input,
-    isOrgTeamEvent: boolean
-  ): EventTypeOutput_2024_06_14 {
+  getResponseEventType(ownerId: number, databaseEventType: Input): EventTypeOutput_2024_06_14 {
     const {
       id,
       length,
@@ -138,7 +134,7 @@ export class OutputEventTypesService_2024_06_14 {
     const customName = databaseEventType?.eventName ?? undefined;
     const bookingFields = databaseEventType.bookingFields
       ? this.transformBookingFields(databaseEventType.bookingFields)
-      : this.getDefaultBookingFields(isOrgTeamEvent);
+      : this.getDefaultBookingFields();
 
     const recurrence = this.transformRecurringEvent(databaseEventType.recurringEvent);
     const metadata = this.transformMetadata(databaseEventType.metadata) || {};
@@ -261,14 +257,13 @@ export class OutputEventTypesService_2024_06_14 {
     return [...transformBookingFieldsInternalToApi(knownBookingFields), ...unknownBookingFields];
   }
 
-  getDefaultBookingFields(isOrgTeamEvent: boolean) {
+  getDefaultBookingFields() {
     const defaultBookingFields = getBookingFieldsWithSystemFields({
       disableGuests: false,
       bookingFields: null,
       customInputs: [],
       metadata: null,
       workflows: [],
-      isOrgTeamEvent,
     });
     return this.transformBookingFields(defaultBookingFields);
   }

apps/api/v2/src/modules/organizations/event-types/services/output.service.ts

@@ -93,14 +93,13 @@ export class OutputOrganizationsEventTypesService {
     private readonly teamsEventTypesRepository: TeamsEventTypesRepository,
     private readonly usersRepository: UsersRepository
   ) {}
-
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   async getResponseTeamEventType(databaseEventType: Input, isOrgTeamEvent: boolean) {
     const { teamId, userId, parentId, assignAllTeamMembers } = databaseEventType;
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { ownerId, users, ...rest } = this.outputEventTypesService.getResponseEventType(
       0,
-      databaseEventType,
-      isOrgTeamEvent
+      databaseEventType
     );
     const hosts =
       databaseEventType.schedulingType === "MANAGED"

apps/web/lib/booking.ts

@@ -117,12 +117,11 @@ export const getEventTypesFromDB = async (id: number) => {
 
   const metadata = EventTypeMetaDataSchema.parse(eventType.metadata);
   const { profile, ...restEventType } = eventType;
-  const isOrgTeamEvent = !!eventType?.team && !!profile?.organizationId;
 
   return {
     isDynamic: false,
     ...restEventType,
-    bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }),
+    bookingFields: getBookingFieldsWithSystemFields({ ...eventType }),
     metadata,
   };
 };

apps/web/public/static/locales/en/common.json

@@ -3670,6 +3670,9 @@
   "webhook_metadata": "Metadata",
   "stats": "Stats",
   "booking_status": "Booking status",
+  "allowed_country_codes": "Allowed Country Codes",
+  "select_country_codes": "Select country codes...",
+  "country_code_restriction_help": "SMS will only be sent to phone numbers from the selected countries. Leave empty to allow all countries.",
   "visit": "Visit",
   "location_custom_label_input_label": "Custom label on booking page",
   "meeting_link": "Meeting link",

packages/features/bookings/lib/getBookingFields.ts

@@ -47,6 +47,7 @@ export const getSmsReminderNumberSource = ({
 }: {
   workflowId: Workflow["id"];
   isSmsReminderNumberRequired: boolean;
+  allowedCountryCodes?: string[];
 }) => ({
   id: `${workflowId}`,
   type: "workflow",
@@ -84,15 +85,13 @@ export const getAIAgentCallPhoneNumberSource = ({
 export const getBookingFieldsWithSystemFields = ({
   bookingFields,
   disableGuests,
-  isOrgTeamEvent = false,
   disableBookingTitle,
   customInputs,
   metadata,
   workflows,
 }: {
   bookingFields: Fields | EventType["bookingFields"];
   disableGuests: boolean;
-  isOrgTeamEvent?: boolean;
   disableBookingTitle?: boolean;
   customInputs: EventTypeCustomInput[] | z.infer<typeof customInputSchema>[];
   metadata: EventType["metadata"] | z.infer<typeof EventTypeMetaDataSchema>;
@@ -107,7 +106,6 @@ export const getBookingFieldsWithSystemFields = ({
   return ensureBookingInputsHaveSystemFields({
     bookingFields: parsedBookingFields,
     disableGuests,
-    isOrgTeamEvent,
     disableBookingTitle,
     additionalNotesRequired: parsedMetaData?.additionalNotesRequired || false,
     customInputs: parsedCustomInputs,
@@ -118,15 +116,13 @@ export const getBookingFieldsWithSystemFields = ({
 export const ensureBookingInputsHaveSystemFields = ({
   bookingFields,
   disableGuests,
-  isOrgTeamEvent,
   disableBookingTitle,
   additionalNotesRequired,
   customInputs,
   workflows,
 }: {
   bookingFields: Fields;
   disableGuests: boolean;
-  isOrgTeamEvent: boolean;
   disableBookingTitle?: boolean;
   additionalNotesRequired: boolean;
   customInputs: z.infer<typeof customInputSchema>[];
@@ -147,10 +143,12 @@ export const ensureBookingInputsHaveSystemFields = ({
   };
 
   const smsNumberSources = [] as NonNullable<(typeof bookingFields)[number]["sources"]>;
+
   workflows.forEach((workflow) => {
     workflow.workflow.steps.forEach((step) => {
       if (step.action === "SMS_ATTENDEE" || step.action === "WHATSAPP_ATTENDEE") {
         const workflowId = workflow.workflow.id;
+
         smsNumberSources.push(
           getSmsReminderNumberSource({
             workflowId,

packages/features/bookings/lib/getBookingResponsesSchema.ts

@@ -1,12 +1,11 @@
-import { isValidPhoneNumber } from "libphonenumber-js";
+import { isValidPhoneNumber, getCountryCallingCode, type CountryCode } from "libphonenumber-js";
 import z from "zod";
 
 import type { ALL_VIEWS } from "@calcom/features/form-builder/schema";
 import { dbReadResponseSchema, fieldTypesSchemaMap } from "@calcom/features/form-builder/schema";
 import type { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
 import { bookingResponses, emailSchemaRefinement } from "@calcom/prisma/zod-utils";
 
-// eslint-disable-next-line @typescript-eslint/ban-types
 type View = ALL_VIEWS | (string & {});
 type BookingFields = (z.infer<typeof eventTypeBookingFields> & z.BRAND<"HAS_SYSTEM_FIELDS">) | null;
 type CommonParams = { bookingFields: BookingFields; view: View };
@@ -103,15 +102,41 @@ function preprocess<T extends z.ZodType>({
           };
           try {
             parsedValue = JSON.parse(value);
-          } catch (e) {}
+          } catch (e) {
+            console.error("Failed to parse JSON:", e);
+          }
           const optionsInputs = field.optionsInputs;
           const optionInputField = optionsInputs?.[parsedValue.value];
           if (optionInputField && optionInputField.type === "phone") {
-            parsedValue.optionValue = ensureValidPhoneNumber(parsedValue.optionValue);
+            let phoneValue = parsedValue.optionValue;
+            // Auto-prepend country code for single country restrictions
+            if (field.allowedCountryCodes?.length === 1 && phoneValue) {
+              const countryCode = field.allowedCountryCodes[0].toUpperCase();
+              const dialCode = getCountryCallingCode(countryCode as CountryCode);
+
+              // If phoneValue doesn't start with + or doesn't start with the correct country code
+              if (!phoneValue.startsWith(`+${dialCode}`)) {
+                // Remove any existing + and prepend the correct country code
+                phoneValue = `+${dialCode}${phoneValue.replace(/^\+/, "")}`;
+              }
+            }
+            parsedValue.optionValue = ensureValidPhoneNumber(phoneValue);
           }
           newResponses[field.name] = parsedValue;
         } else if (field.type === "phone") {
-          newResponses[field.name] = ensureValidPhoneNumber(value);
+          // Auto-prepend country code for single country restrictions
+          let phoneValue = value;
+          if (field.allowedCountryCodes?.length === 1 && phoneValue) {
+            const countryCode = field.allowedCountryCodes[0].toUpperCase();
+            const dialCode = getCountryCallingCode(countryCode as CountryCode);
+
+            // If phoneValue doesn't start with + or doesn't start with the correct country code
+            if (!phoneValue.startsWith(`+${dialCode}`)) {
+              // Remove any existing + and prepend the correct country code
+              phoneValue = `+${dialCode}${phoneValue.replace(/^\+/, "")}`;
+            }
+          }
+          newResponses[field.name] = ensureValidPhoneNumber(phoneValue);
         } else {
           newResponses[field.name] = value;
         }

packages/features/bookings/lib/handleNewBooking/getEventType.ts

@@ -15,11 +15,9 @@ const _getEventType = async ({
   const eventType =
     !eventTypeId && !!eventTypeSlug ? getDefaultEvent(eventTypeSlug) : await getEventTypesFromDB(eventTypeId);
 
-  const isOrgTeamEvent = !!eventType?.team && !!eventType?.team?.parentId;
-
   return {
     ...eventType,
-    bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }),
+    bookingFields: getBookingFieldsWithSystemFields({ ...eventType }),
   };
 };
 

packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts

@@ -194,10 +194,9 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
     throw new Error(ErrorCode.EventTypeNotFound);
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { profile, hosts, users, ...restEventType } = eventType;
 
-  const isOrgTeamEvent = !!eventType?.team && !!profile?.organizationId;
-
   const hostsWithSelectedCalendars = hosts.map((host) => ({
     ...host,
     user: withSelectedCalendars(host.user),
@@ -213,7 +212,7 @@ export const getEventTypesFromDB = async (eventTypeId: number) => {
     recurringEvent: parseRecurringEvent(eventType?.recurringEvent),
     customInputs: customInputSchema.array().parse(eventType?.customInputs || []),
     locations: (eventType?.locations ?? []) as LocationObject[],
-    bookingFields: getBookingFieldsWithSystemFields({ ...restEventType, isOrgTeamEvent }),
+    bookingFields: getBookingFieldsWithSystemFields({ ...restEventType }),
     rrSegmentQueryValue: rrSegmentQueryValueSchema.parse(eventType.rrSegmentQueryValue) ?? null,
     isDynamic: false,
     hostGroups: eventType.hostGroups || [],

packages/features/components/phone-input/PhoneInput.tsx

@@ -20,6 +20,7 @@ export type PhoneInputProps = {
   disabled?: boolean;
   onChange: (value: string) => void;
   defaultCountry?: string;
+  allowedCountryCodes?: string[];
   inputStyle?: CSSProperties;
   flagButtonStyle?: CSSProperties;
 };
@@ -30,6 +31,7 @@ function BasePhoneInput({
   onChange,
   value,
   defaultCountry = "us",
+  allowedCountryCodes,
   ...rest
 }: PhoneInputProps) {
   const isPlatform = useIsPlatform();
@@ -53,17 +55,34 @@ function BasePhoneInput({
 
   if (!isPlatform) {
     return (
-      <BasePhoneInputWeb name={name} className={className} onChange={onChange} value={value} {...rest} />
+      <BasePhoneInputWeb
+        name={name}
+        className={className}
+        onChange={onChange}
+        value={value}
+        allowedCountryCodes={allowedCountryCodes}
+        {...rest}
+      />
     );
   }
 
+  const singleCountry = allowedCountryCodes?.length === 1;
+  const onlyCountries = allowedCountryCodes?.map((code) => code.toLowerCase());
+
+  // If country codes are restricted, use the first one as the default
+  const effectiveDefaultCountry = allowedCountryCodes?.length
+    ? allowedCountryCodes[0].toLowerCase()
+    : defaultCountry;
+
   return (
     <PhoneInput
       {...rest}
       value={value ? value.trim().replace(/^\+?/, "+") : undefined}
       enableSearch
       disableSearchIcon
-      country={defaultCountry}
+      country={effectiveDefaultCountry}
+      onlyCountries={onlyCountries && onlyCountries.length > 0 ? onlyCountries : undefined}
+      disableCountryCode={singleCountry}
       inputProps={{
         name,
         required: rest.required,
@@ -101,19 +120,29 @@ function BasePhoneInputWeb({
   className = "",
   onChange,
   value,
+  allowedCountryCodes,
   inputStyle,
   flagButtonStyle,
   ...rest
 }: Omit<PhoneInputProps, "defaultCountry">) {
   const defaultCountry = useDefaultCountry();
+  const onlyCountries = allowedCountryCodes?.map((code) => code.toLowerCase());
+  const singleCountry = allowedCountryCodes?.length === 1;
+
+  // If country codes are restricted, use the first one as the default
+  const effectiveDefaultCountry = allowedCountryCodes?.length
+    ? allowedCountryCodes[0].toLowerCase()
+    : defaultCountry;
 
   return (
     <PhoneInput
       {...rest}
       value={value ? value.trim().replace(/^\+?/, "+") : undefined}
-      country={value ? undefined : defaultCountry}
+      country={value ? undefined : effectiveDefaultCountry}
       enableSearch
       disableSearchIcon
+      onlyCountries={onlyCountries && onlyCountries.length > 0 ? onlyCountries : undefined}
+      disableCountryCode={singleCountry}
       inputProps={{
         name,
         required: rest.required,
@@ -162,9 +191,11 @@ const useDefaultCountry = () => {
         return;
       }
 
-      isSupportedCountry(data?.countryCode)
-        ? setDefaultCountry(data.countryCode.toLowerCase())
-        : setDefaultCountry(navigator.language.split("-")[1]?.toLowerCase() || "us");
+      if (isSupportedCountry(data?.countryCode)) {
+        setDefaultCountry(data.countryCode.toLowerCase());
+      } else {
+        setDefaultCountry(navigator.language.split("-")[1]?.toLowerCase() || "us");
+      }
     },
     [query.data]
   );