Fixes: #15317

apps/web/components/booking/CancelBooking.tsx

@@ -32,13 +32,15 @@ type Props = {
     };
     eventType: unknown;
   };
+  rescheduleEmail: string | null;
 };
 
 export default function CancelBooking(props: Props) {
   const [cancellationReason, setCancellationReason] = useState<string>("");
   const { t } = useLocale();
   const router = useRouter();
-  const { booking, allRemainingBookings, seatReferenceUid, bookingCancelledEventProps } = props;
+  const { booking, allRemainingBookings, seatReferenceUid, bookingCancelledEventProps, rescheduleEmail } =
+    props;
   const [loading, setLoading] = useState(false);
   const telemetry = useTelemetry();
   const [error, setError] = useState<string | null>(booking ? null : t("booking_already_cancelled"));
@@ -99,6 +101,7 @@ export default function CancelBooking(props: Props) {
                       allRemainingBookings,
                       // @NOTE: very important this shouldn't cancel with number ID use uid instead
                       seatReferenceUid,
+                      canceledBy: rescheduleEmail,
                     }),
                     headers: {
                       "Content-Type": "application/json",

apps/web/modules/bookings/views/bookings-single-view.tsx

@@ -160,6 +160,7 @@ export default function Success(props: PageProps) {
   const [calculatedDuration, setCalculatedDuration] = useState<number | undefined>(undefined);
   const [comment, setComment] = useState("");
   const parsedRating = rating ? parseInt(rating, 10) : 3;
+  const userEmail = session?.user?.email ?? searchParams?.get("email");
 
   const defaultRating = isNaN(parsedRating) ? 3 : parsedRating > 5 ? 5 : parsedRating < 1 ? 1 : parsedRating;
   const [rateValue, setRateValue] = useState<number>(defaultRating);
@@ -664,7 +665,9 @@ export default function Success(props: PageProps) {
                                 <span className="text-default inline">
                                   <span className="underline" data-testid="reschedule-link">
                                     <Link
-                                      href={`/reschedule/${seatReferenceUid || bookingInfo?.uid}`}
+                                      href={`/reschedule/${seatReferenceUid || bookingInfo?.uid} ${
+                                        userEmail ? `?email=${userEmail}` : ""
+                                      }`}
                                       legacyBehavior>
                                       {t("reschedule")}
                                     </Link>
@@ -702,6 +705,7 @@ export default function Success(props: PageProps) {
                             allRemainingBookings={allRemainingBookings}
                             seatReferenceUid={seatReferenceUid}
                             bookingCancelledEventProps={bookingCancelledEventProps}
+                            rescheduleEmail={userEmail}
                           />
                         </>
                       ))}

apps/web/modules/users/views/users-public-view.tsx

@@ -26,7 +26,7 @@
 
   const [user] = users; //To be used when we only have a single user, not dynamic group
   useTheme(profile.theme);
   const { t } = useLocale();
 
   const isBioEmpty = !user.bio || !user.bio.replace("<p><br></p>", "").length;
 
@@ -132,8 +132,9 @@
                   className="text-emphasis absolute right-4 top-4 h-4 w-4 opacity-0 transition-opacity group-hover:opacity-100"
                 />
                 {/* Don't prefetch till the time we drop the amount of javascript in [user][type] page which is impacting score for [user] page */}
-                <div className="block w-full p-5">
+                <div className="block w-full">
                   <Link
+                    className="p-5"
                     prefetch={false}
                     href={{
                       pathname: `/${user.profile.username}/${type.slug}`,

apps/web/pages/reschedule/[uid].tsx

@@ -17,8 +17,16 @@ export default function Type() {
 export async function getServerSideProps(context: GetServerSidePropsContext) {
   const session = await getServerSession(context);
 
-  const { uid: bookingUid, seatReferenceUid } = z
-    .object({ uid: z.string(), seatReferenceUid: z.string().optional() })
+  const {
+    uid: bookingUid,
+    seatReferenceUid,
+    rescheduledBy,
+  } = z
+    .object({
+      uid: z.string(),
+      seatReferenceUid: z.string().optional(),
+      rescheduledBy: z.string().optional(),
+    })
     .parse(context.query);
 
   const { uid, seatReferenceUid: maybeSeatReferenceUid } = await maybeGetBookingUidFromSeat(
@@ -140,7 +148,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
     redirect: {
       destination: `/${eventPage}?${destinationUrl.toString()}${
         eventType.seatsPerTimeSlot ? "&bookingUid=null" : ""
-      }`,
+      }${rescheduledBy ? `&rescheduledBy=${rescheduledBy}` : ""}`,
       permanent: false,
     },
   };

packages/features/bookings/Booker/store.ts

@@ -25,7 +25,8 @@ type StoreInitializeType = {
   bookingData?: GetBookingType | null | undefined;
   verifiedEmail?: string | null;
   rescheduleUid?: string | null;
-  seatReferenceUid?: string;
+  seatReferenceUid?: string | null;
+  reschduledBy?: string | null;
   durationConfig?: number[] | null;
   org?: string | null;
   isInstantMeeting?: boolean;
@@ -116,6 +117,7 @@ export type BookerStore = {
    * object is something that's fetched server side.
    */
   rescheduleUid: string | null;
+  reschduledBy: string | null;
   bookingUid: string | null;
   bookingData: GetBookingType | null;
   setBookingData: (bookingData: GetBookingType | null | undefined) => void;
@@ -205,6 +207,7 @@ export const useBookerStore = create<BookerStore>((set, get) => ({
   username: null,
   eventSlug: null,
   eventId: null,
+  reschduledBy: null,
   verifiedEmail: null,
   setVerifiedEmail: (email: string | null) => {
     set({ verifiedEmail: email });
@@ -240,6 +243,7 @@ export const useBookerStore = create<BookerStore>((set, get) => ({
     month,
     eventId,
     rescheduleUid = null,
+    reschduledBy = null,
     bookingUid = null,
     bookingData = null,
     layout,
@@ -257,6 +261,7 @@ export const useBookerStore = create<BookerStore>((set, get) => ({
       get().eventId === eventId &&
       get().rescheduleUid === rescheduleUid &&
       get().bookingUid === bookingUid &&
+      get().reschduledBy === reschduledBy &&
       get().bookingData?.responses.email === bookingData?.responses.email &&
       get().layout === layout
     )
@@ -267,6 +272,7 @@ export const useBookerStore = create<BookerStore>((set, get) => ({
       eventId,
       org,
       rescheduleUid,
+      reschduledBy,
       bookingUid,
       bookingData,
       layout: layout || BookerLayouts.MONTH_VIEW,
@@ -356,6 +362,7 @@ export const useInitializeBookerStore = ({
   month,
   eventId,
   rescheduleUid = null,
+  reschduledBy = null,
   bookingData = null,
   verifiedEmail = null,
   layout,

packages/features/bookings/Booker/types.ts

@@ -92,6 +92,7 @@ export interface BookerProps {
 export type WrappedBookerPropsMain = {
   sessionUsername?: string | null;
   rescheduleUid: string | null;
+  rescheduledBy: string | null;
   bookingUid: string | null;
   isRedirect: boolean;
   fromUserNameRedirected: string;

packages/features/bookings/lib/book-event-form/booking-to-mutation-input-mapper.tsx

@@ -14,6 +14,7 @@ export type BookingOptions = {
   timeZone: string;
   language: string;
   rescheduleUid: string | undefined;
+  rescheduledBy: string | undefined;
   username: string;
   metadata?: Record<string, string>;
   bookingUid?: string;
@@ -31,6 +32,7 @@ export const mapBookingToMutationInput = ({
   timeZone,
   language,
   rescheduleUid,
+  rescheduledBy,
   username,
   metadata,
   bookingUid,
@@ -52,6 +54,7 @@ export const mapBookingToMutationInput = ({
     timeZone: timeZone,
     language: language,
     rescheduleUid,
+    rescheduledBy,
     metadata: metadata || {},
     hasHashedBookingLink: hashedLink ? true : false,
     bookingUid,

packages/features/bookings/lib/handleCancelBooking.ts

@@ -140,7 +140,7 @@ export type CustomRequest = NextApiRequest & {
 };
 
 async function handler(req: CustomRequest) {
-  const { id, uid, allRemainingBookings, cancellationReason, seatReferenceUid } =
+  const { id, uid, allRemainingBookings, cancellationReason, seatReferenceUid, canceledBy } =
     schemaBookingCancelParams.parse(req.body);
   req.bookingToDelete = await getBookingToDelete(id, uid);
   const {
@@ -366,6 +366,7 @@ async function handler(req: CustomRequest) {
       data: {
         status: BookingStatus.CANCELLED,
         cancellationReason: cancellationReason,
+        canceledBy: canceledBy ? canceledBy : undefined, // It's kind of a check the person who cancels the booking is the same person who created it
       },
     });
     const allUpdatedBookings = await prisma.booking.findMany({

packages/features/bookings/lib/handleNewBooking.ts

@@ -1199,6 +1199,7 @@ async function handler(
   }
 
   let rescheduleUid = reqBody.rescheduleUid;
+  const reschduledBy = reqBody.rescheduledBy;
 
   if (
     Object.prototype.hasOwnProperty.call(eventType, "bookingLimits") ||
@@ -1243,6 +1244,7 @@ async function handler(
     }
     originalRescheduledBooking = await getOriginalRescheduledBooking(
       rescheduleUid,
+      reschduledBy,
       !!eventType.seatsPerTimeSlot
     );
     if (!originalRescheduledBooking) {
@@ -1793,6 +1795,7 @@ async function handler(
       data: {
         rescheduled: true,
         status: BookingStatus.CANCELLED,
+        reschduledBy: reqBody.rescheduledBy,
       },
     });
   }

packages/lib/CalEventParser.ts

@@ -2,7 +2,7 @@ import type { TFunction } from "next-i18next";
 import short from "short-uuid";
 import { v5 as uuidv5 } from "uuid";
 
-import type { CalendarEvent } from "@calcom/types/Calendar";
+import type { CalendarEvent, Person } from "@calcom/types/Calendar";
 
 import { WEBAPP_URL } from "./constants";
 import getLabelValueMapFromResponses from "./getLabelValueMapFromResponses";
@@ -217,7 +217,7 @@ export const getPlatformCancelLink = (
   return "";
 };
 
-export const getCancelLink = (calEvent: CalendarEvent): string => {
+export const getCancelLink = (calEvent: CalendarEvent, attendee: Person): string => {
   const Uid = getUid(calEvent);
   const seatReferenceUid = getSeatReferenceId(calEvent);
   if (calEvent.platformClientId) {
@@ -227,6 +227,7 @@ export const getCancelLink = (calEvent: CalendarEvent): string => {
   const cancelLink = new URL(`${calEvent.bookerUrl ?? WEBAPP_URL}/booking/${Uid}`);
   cancelLink.searchParams.append("cancel", "true");
   cancelLink.searchParams.append("allRemainingBookings", String(!!calEvent.recurringEvent));
+  cancelLink.searchParams.append("cancelledBy", attendee.email);
   if (seatReferenceUid) cancelLink.searchParams.append("seatReferenceUid", seatReferenceUid);
   return cancelLink.toString();
 };
@@ -249,15 +250,17 @@ export const getPlatformRescheduleLink = (
   return "";
 };
 
-export const getRescheduleLink = (calEvent: CalendarEvent): string => {
+export const getRescheduleLink = (calEvent: CalendarEvent, attendee: Person): string => {
   const Uid = getUid(calEvent);
   const seatUid = getSeatReferenceId(calEvent);
 
   if (calEvent.platformClientId) {
     return getPlatformRescheduleLink(calEvent, Uid, seatUid);
   }
 
-  return `${calEvent.bookerUrl ?? WEBAPP_URL}/reschedule/${seatUid ? seatUid : Uid}`;
+  return `${calEvent.bookerUrl ?? WEBAPP_URL}/reschedule/${seatUid ? seatUid : Uid}$rescheduledBy=${
+    attendee.email
+  }`;
 };
 
 export const getRichDescription = (

packages/platform/atoms/booker/BookerPlatformWrapper.tsx

@@ -42,6 +42,7 @@ import { AtomsWrapper } from "../src/components/atoms-wrapper";
 
 type BookerPlatformWrapperAtomProps = Omit<BookerProps, "username" | "entity"> & {
   rescheduleUid?: string;
+  rescheduledBy?: string;
   bookingUid?: string;
   username: string | string[];
   entity?: BookerProps["entity"];
@@ -306,6 +307,7 @@ export const BookerPlatformWrapper = (props: BookerPlatformWrapperAtomProps) =>
           }
         }
         rescheduleUid={props.rescheduleUid ?? null}
+        rescheduledBy={props.rescheduledBy ?? null}
         bookingUid={props.bookingUid ?? null}
         isRedirect={false}
         fromUserNameRedirected=""

packages/platform/atoms/booker/BookerWebWrapper.tsx

@@ -36,6 +36,8 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => {
   const fromUserNameRedirected = searchParams?.get("username") || "";
   const rescheduleUid =
     typeof window !== "undefined" ? new URLSearchParams(window.location.search).get("rescheduleUid") : null;
+  const rescheduledBy =
+    typeof window !== "undefined" ? new URLSearchParams(window.location.search).get("rescheduledBy") : null;
   const bookingUid =
     typeof window !== "undefined" ? new URLSearchParams(window.location.search).get("bookingUid") : null;
   const date = dayjs(selectedDate).format("YYYY-MM-DD");
@@ -49,6 +51,7 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => {
     ...props,
     eventId: event?.data?.id,
     rescheduleUid,
+    reschduledBy,
     bookingUid: bookingUid,
     layout: bookerLayout.defaultLayout,
     org: props.entity.orgSlug,
@@ -192,6 +195,7 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => {
       isRedirect={isRedirect}
       fromUserNameRedirected={fromUserNameRedirected}
       rescheduleUid={rescheduleUid}
+      rescheduledBy={rescheduledBy}
       bookingUid={bookingUid}
       hasSession={hasSession}
       extraOptions={routerQuery}

packages/platform/atoms/hooks/useHandleBookEvent.ts

@@ -39,6 +39,7 @@ export const useHandleBookEvent = ({
   const duration = useBookerStore((state) => state.selectedDuration);
   const { timezone } = useTimePreferences();
   const rescheduleUid = useBookerStore((state) => state.rescheduleUid);
+  const rescheduledBy = useBookerStore((state) => state.reschduledBy);
   const { t, i18n } = useLocale();
   const username = useBookerStore((state) => state.username);
   const recurringEventCount = useBookerStore((state) => state.recurringEventCount);
@@ -77,6 +78,7 @@ export const useHandleBookEvent = ({
         timeZone: timezone,
         language: i18n.language,
         rescheduleUid: rescheduleUid || undefined,
+        rescheduledBy: rescheduledBy || undefined,
         bookingUid: (bookingData && bookingData.uid) || seatedEventData?.bookingUid || undefined,
         username: username || "",
         metadata: metadata,