Skip to content

fix: resolve undefined {CANCEL_URL} in workflow templates #23476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anikdhabal merged 9 commits into from
Sep 4, 2025
Merged

fix: resolve undefined {CANCEL_URL} in workflow templates #23476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c9f5c71
uid and seatReference fix
ShashwatPS Aug 31, 2025
9b423c5
Seat reference fix
ShashwatPS Aug 31, 2025
edd2c16
Merge branch 'calcom:main' into shashwatps-undefinedFix
ShashwatPS Aug 31, 2025
5e053b1
Fixed cancel url link for attendees
ShashwatPS Aug 31, 2025
b526dc1
changes
anikdhabal Sep 1, 2025
31b177f
Merge branch 'main' into shashwatps-undefinedFix
anikdhabal Sep 1, 2025
5f38d8e
tweak
anikdhabal Sep 1, 2025
a16773d
Merge branch 'main' into shashwatps-undefinedFix
anikdhabal Sep 4, 2025
26f85fa
Merge branch 'main' into shashwatps-undefinedFix
anikdhabal Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/features/bookings/lib/handleSeats/handleSeats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ const handleSeats = async (newSeatedBookingObject: NewSeatedBookingObject) => {
smsReminderNumber: smsReminderNumber || null,
calendarEvent: {
...evt,
uid: seatedBooking.uid,
rescheduleReason,
...{
metadata,
Expand All @@ -127,7 +128,7 @@ const handleSeats = async (newSeatedBookingObject: NewSeatedBookingObject) => {
isRescheduleEvent: !!rescheduleUid,
isFirstRecurringEvent: true,
emailAttendeeSendToOverride: bookerEmail,
seatReferenceUid: evt.attendeeSeatId,
seatReferenceUid: resultBooking?.seatReferenceUid,
isDryRun,
});
} catch (error) {
Expand Down
21 changes: 15 additions & 6 deletions packages/features/ee/workflows/lib/reminders/emailReminderManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ export const scheduleEmailReminder = async (args: scheduleEmailReminderArgs) =>
const bookerUrl = evt.bookerUrl ?? WEBSITE_URL;

if (emailBody) {
const isEmailAttendeeAction = action === WorkflowActions.EMAIL_ATTENDEE;
const recipientEmail = getWorkflowRecipientEmail({
action,
attendeeEmail: attendeeToBeUsedInMail.email,
Expand All @@ -162,11 +163,20 @@ export const scheduleEmailReminder = async (args: scheduleEmailReminderArgs) =>
meetingUrl: bookingMetadataSchema.parse(evt.metadata || {})?.videoCallUrl,
cancelLink: `${bookerUrl}/booking/${evt.uid}?cancel=true${
recipientEmail ? `&cancelledBy=${encodeURIComponent(recipientEmail)}` : ""
}`,
}${isEmailAttendeeAction && seatReferenceUid ? `&seatReferenceUid=${seatReferenceUid}` : ""}`,
cancelReason: evt.cancellationReason,
rescheduleLink: `${bookerUrl}/reschedule/${evt.uid}${
recipientEmail ? `?rescheduledBy=${encodeURIComponent(recipientEmail)}` : ""
recipientEmail
? `?rescheduledBy=${encodeURIComponent(recipientEmail)}${
isEmailAttendeeAction && seatReferenceUid
? `&seatReferenceUid=${encodeURIComponent(seatReferenceUid)}`
: ""
}`
: isEmailAttendeeAction && seatReferenceUid
? `?seatReferenceUid=${encodeURIComponent(seatReferenceUid)}`
: ""
}`,

rescheduleReason: evt.rescheduleReason,
ratingUrl: `${bookerUrl}/booking/${evt.uid}?rating`,
noShowUrl: `${bookerUrl}/booking/${evt.uid}?noShow=true`,
Expand All @@ -175,10 +185,9 @@ export const scheduleEmailReminder = async (args: scheduleEmailReminderArgs) =>
eventEndTimeInAttendeeTimezone: dayjs(endTime).tz(evt.attendees[0].timeZone),
};

const locale =
action === WorkflowActions.EMAIL_ATTENDEE
? attendeeToBeUsedInMail.language?.locale
: evt.organizer.language.locale;
const locale = isEmailAttendeeAction
? attendeeToBeUsedInMail.language?.locale
: evt.organizer.language.locale;

const emailSubjectTemplate = customTemplate(emailSubject, variables, locale, evt.organizer.timeFormat);
emailContent.emailSubject = emailSubjectTemplate.text;
Expand Down
Loading