From 3e27735ccb5f297706f9781078ae903d898f16d8 Mon Sep 17 00:00:00 2001 From: Hariom Balhara Date: Mon, 16 Jan 2023 14:50:50 +0530 Subject: [PATCH] Disable redirect for cancellation page (#6498) --- apps/web/pages/booking/[uid].tsx | 5 +++-- packages/emails/templates/_base-email.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/web/pages/booking/[uid].tsx b/apps/web/pages/booking/[uid].tsx index 134ff070cf..b11184ea82 100644 --- a/apps/web/pages/booking/[uid].tsx +++ b/apps/web/pages/booking/[uid].tsx @@ -929,6 +929,7 @@ const schema = z.object({ uid: z.string(), email: z.string().optional(), eventTypeSlug: z.string().optional(), + cancel: stringToBoolean, }); const handleSeatsEventTypeOnBooking = ( @@ -962,7 +963,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) { const ssr = await ssrInit(context); const parsedQuery = schema.safeParse(context.query); if (!parsedQuery.success) return { notFound: true }; - const { uid, email, eventTypeSlug } = parsedQuery.data; + const { uid, email, eventTypeSlug, cancel } = parsedQuery.data; const bookingInfo = await prisma.booking.findFirst({ where: { @@ -1048,7 +1049,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) { customInputs: customInputSchema.array().parse(eventTypeRaw.customInputs), }; - if (eventType.metadata?.disableSuccessPage && eventType.successRedirectUrl) { + if (eventType.metadata?.disableSuccessPage && eventType.successRedirectUrl && !cancel) { return { redirect: { destination: eventType.successRedirectUrl, diff --git a/packages/emails/templates/_base-email.ts b/packages/emails/templates/_base-email.ts index 78f72a6f9b..907049df3b 100644 --- a/packages/emails/templates/_base-email.ts +++ b/packages/emails/templates/_base-email.ts @@ -30,7 +30,7 @@ export default class BaseEmail { if (process.env.NEXT_PUBLIC_IS_E2E) { global.E2E_EMAILS = global.E2E_EMAILS || []; global.E2E_EMAILS.push(this.getNodeMailerPayload()); - console.log("Skipped Sending Email"); + console.log("Skipped Sending Email as NEXT_PUBLIC_IS_E2E==1"); return new Promise((r) => r("Skipped sendEmail for E2E")); } new Promise((resolve, reject) =>