From 8a18e167e94c267d2cfff9b7830a72d0345b2618 Mon Sep 17 00:00:00 2001
From: Lauris Skraucis <lauris.skraucis@gmail.com>
Date: Tue, 25 Mar 2025 14:18:29 +0100
Subject: [PATCH] fix: remove oAuth clientId from email when rescheduling
 platform booking (#20354)

Co-authored-by: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>
---
 .../bookings/Booker/components/hooks/useBookingForm.ts      | 3 +++
 .../Booker/components/hooks/useInitialFormValues.ts         | 6 ++++++
 packages/platform/atoms/booker/BookerPlatformWrapper.tsx    | 1 +
 3 files changed, 10 insertions(+)

diff --git a/packages/features/bookings/Booker/components/hooks/useBookingForm.ts b/packages/features/bookings/Booker/components/hooks/useBookingForm.ts
index 0191e71c9b..45d4068824 100644
--- a/packages/features/bookings/Booker/components/hooks/useBookingForm.ts
+++ b/packages/features/bookings/Booker/components/hooks/useBookingForm.ts
@@ -23,6 +23,7 @@ export interface IUseBookingForm {
     name: string | null;
   };
   lastBookingResponse?: Record<string, string>;
+  clientId?: string;
 }
 
 export type UseBookingFormReturnType = ReturnType<typeof useBookingForm>;
@@ -36,6 +37,7 @@ export const useBookingForm = ({
   extraOptions,
   prefillFormParams,
   lastBookingResponse,
+  clientId,
 }: IUseBookingForm) => {
   const rescheduleUid = useBookerStore((state) => state.rescheduleUid);
   const bookingData = useBookerStore((state) => state.bookingData);
@@ -75,6 +77,7 @@ export const useBookingForm = ({
     extraOptions,
     prefillFormParams,
     lastBookingResponse,
+    clientId,
   });
 
   const bookingForm = useForm<BookingFormValues>({
diff --git a/packages/features/bookings/Booker/components/hooks/useInitialFormValues.ts b/packages/features/bookings/Booker/components/hooks/useInitialFormValues.ts
index 143f424485..1ad8539eff 100644
--- a/packages/features/bookings/Booker/components/hooks/useInitialFormValues.ts
+++ b/packages/features/bookings/Booker/components/hooks/useInitialFormValues.ts
@@ -22,6 +22,7 @@ type UseInitialFormValuesProps = {
     name: string | null;
   };
   lastBookingResponse?: Record<string, string>;
+  clientId?: string;
 };
 
 // Add this stable hash function
@@ -63,6 +64,7 @@ export function useInitialFormValues({
   extraOptions,
   prefillFormParams,
   lastBookingResponse,
+  clientId,
 }: UseInitialFormValuesProps) {
   const stableHashExtraOptions = getStableHash(extraOptions);
 
@@ -120,6 +122,10 @@ export function useInitialFormValues({
             : name ?? username ?? parsedLastBookingResponse?.name ?? "",
       };
 
+      if (clientId) {
+        defaultUserValues.email = defaultUserValues.email.replace(`+${clientId}`, "");
+      }
+
       if (!isRescheduling) {
         const defaults = {
           responses: {} as Partial<z.infer<ReturnType<typeof getBookingResponsesSchema>>>,
diff --git a/packages/platform/atoms/booker/BookerPlatformWrapper.tsx b/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
index 87e87d75f9..6902cd6335 100644
--- a/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
+++ b/packages/platform/atoms/booker/BookerPlatformWrapper.tsx
@@ -340,6 +340,7 @@ export const BookerPlatformWrapper = (
     hasSession,
     extraOptions: extraOptions ?? {},
     prefillFormParams: prefillFormParams,
+    clientId,
   });
   const {
     mutate: createBooking,