[pull] main from calcom:main

apps/api/v1/pages/api/bookings/[id]/_delete.ts

@@ -82,6 +82,7 @@ async function handler(req: NextApiRequest) {
   return await handleCancelBooking({
     bookingData: { id, allRemainingBookings, cancellationReason, cancelledBy },
     userId: req.userId,
+    impersonatedByUserUuid: null,
     actionSource: "API_V1",
   });
 }

apps/api/v1/pages/api/bookings/_post.ts

@@ -247,6 +247,7 @@ async function handler(req: NextApiRequest) {
         userId,
         hostname: req.headers.host || "",
         forcedSlug: req.headers["x-cal-force-slug"] as string | undefined,
+        impersonatedByUserUuid: null,
       },
       bookingDataSchemaGetter: getBookingDataSchemaForApi,
     });

apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts

@@ -223,6 +223,7 @@ export class BookingsController_2024_04_15 {
           platformBookingUrl: bookingRequest.platformBookingUrl,
           platformBookingLocation: bookingRequest.platformBookingLocation,
           areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+          impersonatedByUserUuid: null,
         },
       });
       if (booking.userId && booking.uid && booking.startTime && booking.user?.isPlatformManaged) {
@@ -279,6 +280,7 @@ export class BookingsController_2024_04_15 {
           platformCancelUrl: bookingRequest.platformCancelUrl,
           platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
           platformBookingUrl: bookingRequest.platformBookingUrl,
+          impersonatedByUserUuid: null,
           actionSource: "API_V2",
         });
         if (!res.onlyRemovedAttendee && res.isPlatformManagedUserBooking) {
@@ -317,6 +319,7 @@ export class BookingsController_2024_04_15 {
         userId: user.id,
         actor: makeUserActor(user.uuid),
         actionSource: "API_V2",
+        impersonatedByUserUuid: null,
       });
 
       return { status: SUCCESS_STATUS, data: markNoShowResponse };
@@ -354,6 +357,7 @@ export class BookingsController_2024_04_15 {
           platformBookingUrl: bookingRequest.platformBookingUrl,
           platformBookingLocation: bookingRequest.platformBookingLocation,
           noEmail: bookingRequest.body.noEmail,
+          impersonatedByUserUuid: null,
         },
         creationSource: "API_V2",
       });

apps/api/v2/src/ee/bookings/2024-08-13/services/booking-guests.service.ts

@@ -48,6 +48,7 @@ export class BookingGuestsService_2024_08_13 {
       input: { bookingId: booking.id, guests: input.guests },
       emailsEnabled,
       actionSource: "API_V2",
+      impersonatedByUserUuid: null,
     });
     if (res.message === "Guests added") {
       return await this.bookingsService.getBooking(bookingUid, user);

apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts

@@ -468,6 +468,7 @@ export class BookingsService_2024_08_13 {
         platformBookingLocation: bookingRequest.platformBookingLocation,
         noEmail: bookingRequest.noEmail,
         areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        impersonatedByUserUuid: null,
       },
       creationSource: "API_V2",
     });
@@ -497,6 +498,7 @@ export class BookingsService_2024_08_13 {
         platformBookingUrl: bookingRequest.platformBookingUrl,
         platformBookingLocation: bookingRequest.platformBookingLocation,
         areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        impersonatedByUserUuid: null,
       },
       creationSource: "API_V2",
     });
@@ -527,6 +529,7 @@ export class BookingsService_2024_08_13 {
         platformBookingUrl: bookingRequest.platformBookingUrl,
         platformBookingLocation: bookingRequest.platformBookingLocation,
         areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+        impersonatedByUserUuid: null,
       },
     });
 
@@ -569,6 +572,7 @@ export class BookingsService_2024_08_13 {
           platformBookingUrl: bookingRequest.platformBookingUrl,
           platformBookingLocation: bookingRequest.platformBookingLocation,
           areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+          impersonatedByUserUuid: null,
         },
       });
 
@@ -828,6 +832,7 @@ export class BookingsService_2024_08_13 {
           platformBookingUrl: bookingRequest.platformBookingUrl,
           platformBookingLocation: bookingRequest.platformBookingLocation,
           areCalendarEventsEnabled: bookingRequest.areCalendarEventsEnabled,
+          impersonatedByUserUuid: null,
         },
       });
       if (!booking.uid) {
@@ -976,6 +981,7 @@ export class BookingsService_2024_08_13 {
       platformCancelUrl: bookingRequest.platformCancelUrl,
       platformRescheduleUrl: bookingRequest.platformRescheduleUrl,
       platformBookingUrl: bookingRequest.platformBookingUrl,
+      impersonatedByUserUuid: null,
     });
 
     if (!res.onlyRemovedAttendee && res.isPlatformManagedUserBooking) {
@@ -1036,6 +1042,7 @@ export class BookingsService_2024_08_13 {
       platformClientParams,
       actor: makeUserActor(userUuid),
       actionSource: "API_V2",
+      impersonatedByUserUuid: null,
     });
 
     const booking = await this.bookingsRepository.getByUidWithAttendeesAndUserAndEvent(bookingUid);
@@ -1242,6 +1249,7 @@ export class BookingsService_2024_08_13 {
         platformClientParams,
         actionSource: "API_V2",
         actor: makeUserActor(requestUser.uuid),
+        impersonatedByUserUuid: null,
       },
     });
 
@@ -1277,6 +1285,7 @@ export class BookingsService_2024_08_13 {
         platformClientParams,
         actionSource: "API_V2",
         actor: makeUserActor(requestUser.uuid),
+        impersonatedByUserUuid: null,
       },
     });
 

apps/web/app/api/cancel/route.ts

@@ -43,6 +43,7 @@ async function handler(req: NextRequest) {
     userId: session?.user?.id || -1,
     userUuid: session?.user?.uuid,
     actionSource: "WEBAPP",
+    impersonatedByUserUuid: session?.user?.impersonatedBy?.uuid ?? null,
   });
 
   // const bookingCancelService = getBookingCancelService();

apps/web/app/api/link/route.ts

@@ -94,6 +94,7 @@ async function handler(request: NextRequest) {
           : undefined,
         actionSource: "MAGIC_LINK",
         actor: makeUserActor(user.uuid),
+        impersonatedByUserUuid: null,
       },
     });
   } catch (e) {

apps/web/app/api/verify-booking-token/route.ts

@@ -108,6 +108,7 @@ async function handleBookingAction(
         emailsEnabled: true,
         actionSource: "MAGIC_LINK",
         actor: makeUserActor(user.uuid),
+        impersonatedByUserUuid: null,
       },
     });
   } catch (e) {

apps/web/pages/api/book/event.ts

@@ -54,7 +54,7 @@ async function handler(req: NextApiRequest & { userId?: number; traceContext: Tr
       hostname: req.headers.host || "",
       forcedSlug: req.headers["x-cal-force-slug"] as string | undefined,
       traceContext: req.traceContext,
-      impersonatedByUserUuid: session?.user?.impersonatedBy?.uuid,
+      impersonatedByUserUuid: session?.user?.impersonatedBy?.uuid ?? null,
     },
   });
 

apps/web/pages/api/book/recurring-event.ts

@@ -53,6 +53,7 @@ async function handler(req: NextApiRequest & RequestMeta) {
       platformRescheduleUrl: req.platformRescheduleUrl,
       platformBookingLocation: req.platformBookingLocation,
       noEmail: req.noEmail,
+      impersonatedByUserUuid: session?.user?.impersonatedBy?.uuid ?? null,
     },
     creationSource: "WEBAPP",
   });

apps/web/playwright/locale.e2e.ts

@@ -402,7 +402,7 @@ test.describe("authorized user sees changed translations (de->ar)", async () =>
     await test.step("should change the language and show Arabic translations", async () => {
       await page.goto("/settings/my-account/general");
 
-      await page.waitForLoadState("domcontentloaded");
+      await page.waitForLoadState("networkidle");
 
       await page.getByTestId("locale-select").click();
       await page.getByTestId("select-option-ar").click();
@@ -462,7 +462,7 @@ test.describe("authorized user sees changed translations (de->pt-BR) [locale1]",
 
     await test.step("should change the language and show Brazil-Portuguese translations", async () => {
       await page.goto("/settings/my-account/general");
-      await page.waitForLoadState("domcontentloaded");
+      await page.waitForLoadState("networkidle");
 
       await page.getByTestId("locale-select").click();
       await page.getByTestId("select-option-pt-BR").click();

apps/web/test/handlers/requestReschedule.test.ts

@@ -580,5 +580,6 @@ function getTrpcHandlerData({
     },
     input: input,
     source: "WEBAPP" as const,
+    impersonatedByUserUuid: null,
   };
 }

apps/web/test/lib/confirm.handler.test.ts

@@ -131,6 +131,7 @@ describe("confirmHandler", () => {
           emailsEnabled: true,
           actor: makeUserActor(ctx.user.uuid),
           actionSource: "WEBAPP",
+          impersonatedByUserUuid: null,
         },
       });
 
@@ -230,6 +231,7 @@ describe("confirmHandler", () => {
           emailsEnabled: true,
           actor,
           actionSource: "WEBAPP",
+          impersonatedByUserUuid: null,
         },
       });
 
@@ -357,6 +359,7 @@ describe("confirmHandler", () => {
           emailsEnabled: true,
           actor,
           actionSource: "WEBAPP",
+          impersonatedByUserUuid: null,
         },
       });
 
@@ -467,6 +470,7 @@ describe("confirmHandler", () => {
           emailsEnabled: false,
           actor,
           actionSource: "WEBAPP",
+          impersonatedByUserUuid: null,
         },
       });
 
@@ -592,6 +596,7 @@ describe("confirmHandler", () => {
           emailsEnabled: false,
           actor,
           actionSource: "WEBAPP",
+          impersonatedByUserUuid: null,
         },
       });
 

packages/app-store/_utils/payments/handlePaymentSuccess.ts

@@ -251,6 +251,7 @@ export async function handlePaymentSuccess(params: {
         platformClientParams,
         traceContext: updatedTraceContext,
         actionSource: "WEBHOOK",
+        impersonatedByUserUuid: null,
         actor,
       });
     } else {

packages/features/booking-audit/lib/service/BookingAuditProducerService.interface.ts

@@ -208,6 +208,7 @@ export interface BookingAuditProducerService {
     organizationId: number | null;
     source: ActionSource;
     operationId?: string | null;
+    context?: BookingAuditContext;
     isBookingAuditEnabled: boolean;
   }): Promise<void>;
 
@@ -220,6 +221,7 @@ export interface BookingAuditProducerService {
     organizationId: number | null;
     source: ActionSource;
     operationId?: string | null;
+    context?: BookingAuditContext;
     isBookingAuditEnabled: boolean;
   }): Promise<void>;
 

packages/features/booking-audit/lib/service/BookingAuditTaskerProducerService.ts

@@ -438,6 +438,7 @@ export class BookingAuditTaskerProducerService implements BookingAuditProducerSe
     organizationId: number | null;
     source: ActionSource;
     operationId?: string | null;
+    context?: BookingAuditContext;
     isBookingAuditEnabled: boolean;
   }): Promise<void> {
     await this.queueBulkTask({
@@ -455,6 +456,7 @@ export class BookingAuditTaskerProducerService implements BookingAuditProducerSe
     organizationId: number | null;
     source: ActionSource;
     operationId?: string | null;
+    context?: BookingAuditContext;
     isBookingAuditEnabled: boolean;
   }): Promise<void> {
     await this.queueBulkTask({

packages/features/bookings/lib/dto/BookingCancel.d.ts

@@ -21,6 +21,7 @@ export type CancelBookingMeta = {
   platformCancelUrl?: string;
   platformBookingUrl?: string;
   arePlatformEmailsEnabled?: boolean;
+  impersonatedByUserUuid: string | null;
 };
 
 /**

packages/features/bookings/lib/dto/types.d.ts

@@ -40,7 +40,7 @@ export type CreateBookingMeta = {
   forcedSlug?: string;
   noEmail?: boolean;
   traceContext?: TraceContext;
-  impersonatedByUserUuid?: string;
+  impersonatedByUserUuid: string | null;
 } & PlatformParams;
 
 export type BookingHandlerInput = {

packages/features/bookings/lib/handleCancelBooking.ts

@@ -88,6 +88,7 @@ export type CancelBookingInput = {
   userUuid?: string;
   bookingData: z.infer<typeof bookingCancelInput>;
   actionSource: ValidActionSource;
+  impersonatedByUserUuid: string | null;
 } & PlatformParams;
 
 type Dependencies = {
@@ -179,6 +180,9 @@ async function handler(input: CancelBookingInput, dependencies?: Dependencies) {
   } = input;
 
   const userUuid = input.userUuid ?? null;
+  const impersonatedByUserUuid = input.impersonatedByUserUuid ?? null;
+
+  const auditContext = impersonatedByUserUuid ? { impersonatedBy: impersonatedByUserUuid } : undefined;
 
   const actionSource = input.actionSource;
 
@@ -557,6 +561,7 @@ async function handler(input: CancelBookingInput, dependencies?: Dependencies) {
       organizationId: orgId ?? null,
       operationId,
       source: actionSource,
+      context: auditContext,
       isBookingAuditEnabled,
     });
   } else {
@@ -592,6 +597,7 @@ async function handler(input: CancelBookingInput, dependencies?: Dependencies) {
           new: BookingStatus.CANCELLED,
         },
       },
+      context: auditContext,
       isBookingAuditEnabled,
     });
 
@@ -756,6 +762,7 @@ export class BookingCancelService implements IBookingCancelService {
     const cancelBookingInput: CancelBookingInput = {
       bookingData: input.bookingData,
       ...(input.bookingMeta || {}),
+      impersonatedByUserUuid: input.bookingMeta?.impersonatedByUserUuid ?? null,
       actionSource: input.actionSource,
     };