From 943c1a3c03e3cb9762c155878a999aed70a2cbc5 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Thu, 11 Sep 2025 09:33:50 +0530 Subject: [PATCH] fix: events not removed from the previous host calendar due to wrong credentials usage (#23756) * fix: events not removed from the previous host claendar * fix test * Update roundRobinManualReassignment.test.ts --- .../handleRescheduleEventManager.ts | 6 ++- .../roundRobinDeleteEvents.test.ts | 4 +- .../roundRobinManualReassignment.test.ts | 4 +- .../roundRobinManualReassignment.ts | 38 ++++++++++++++++++ .../roundRobinReassignment.test.ts | 8 +++- .../ee/round-robin/roundRobinReassignment.ts | 39 +++++++++++++++++++ .../ee/round-robin/utils/bookingSelect.ts | 13 ++++++- 7 files changed, 106 insertions(+), 6 deletions(-) diff --git a/packages/features/ee/round-robin/handleRescheduleEventManager.ts b/packages/features/ee/round-robin/handleRescheduleEventManager.ts index 01b666bb74..d3eac97d27 100644 --- a/packages/features/ee/round-robin/handleRescheduleEventManager.ts +++ b/packages/features/ee/round-robin/handleRescheduleEventManager.ts @@ -53,6 +53,8 @@ export const handleRescheduleEventManager = async ({ prefix: ["handleRescheduleEventManager", `${bookingId}`], }); + const skipDeleteEventsAndMeetings = changedOrganizer; + const allCredentials = await getAllCredentialsIncludeServiceAccountKey( initParams.user, initParams?.eventType @@ -68,7 +70,9 @@ export const handleRescheduleEventManager = async ({ rescheduleUid, newBookingId, changedOrganizer, - previousHostDestinationCalendar + previousHostDestinationCalendar, + undefined, + skipDeleteEventsAndMeetings ); const results = updateManager.results ?? []; diff --git a/packages/features/ee/round-robin/roundRobinDeleteEvents.test.ts b/packages/features/ee/round-robin/roundRobinDeleteEvents.test.ts index 24011a8f23..f86fdbfc97 100644 --- a/packages/features/ee/round-robin/roundRobinDeleteEvents.test.ts +++ b/packages/features/ee/round-robin/roundRobinDeleteEvents.test.ts @@ -115,6 +115,8 @@ describe("roundRobinReassignment test", () => { await roundRobinReassignment({ bookingId: 123, + reassignedById: 101, + orgId: null, }); // Verify that calendar deletion occurred (may be called multiple times due to duplicate references) @@ -122,7 +124,7 @@ describe("roundRobinReassignment test", () => { const deleteCall = calendarMock.deleteEventCalls[0]; expect(deleteCall.args.uid).toBe("ORIGINAL_EVENT_ID"); expect(deleteCall.args.externalCalendarId).toBe("MOCK_EXTERNAL_CALENDAR_ID"); - expect(deleteCall.args.event.organizer.email).toBe(newHost.email); // Current implementation uses new host credentials + expect(deleteCall.args.event.organizer.email).toBe(originalHost.email); expect(deleteCall.args.event.uid).toBe(bookingToReassignUid); // Verify that creation occurred with new host credentials diff --git a/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts b/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts index 51b2537f96..d48ab97bc1 100644 --- a/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts +++ b/packages/features/ee/round-robin/roundRobinManualReassignment.test.ts @@ -154,7 +154,9 @@ const expectEventManagerCalledWith = ( expectedParams.uid, undefined, expectedParams.changedOrganizer, - expectedParams.destinationCalendars ?? expect.any(Array) + expectedParams.destinationCalendars ?? expect.any(Array), + undefined, + expectedParams.changedOrganizer ); }; diff --git a/packages/features/ee/round-robin/roundRobinManualReassignment.ts b/packages/features/ee/round-robin/roundRobinManualReassignment.ts index 0a687d8b1d..9c4bf20fa0 100644 --- a/packages/features/ee/round-robin/roundRobinManualReassignment.ts +++ b/packages/features/ee/round-robin/roundRobinManualReassignment.ts @@ -7,6 +7,7 @@ import { sendRoundRobinScheduledEmailsAndSMS, sendRoundRobinUpdatedEmailsAndSMS, } from "@calcom/emails"; +import { getAllCredentialsIncludeServiceAccountKey } from "@calcom/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials"; import getBookingResponsesSchema from "@calcom/features/bookings/lib/getBookingResponsesSchema"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { getEventTypesFromDB } from "@calcom/features/bookings/lib/handleNewBooking/getEventTypesFromDB"; @@ -21,6 +22,7 @@ import { import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler"; import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; +import EventManager from "@calcom/lib/EventManager"; import { SENDER_NAME } from "@calcom/lib/constants"; import { enrichUserWithDelegationCredentialsIncludeServiceAccountKey } from "@calcom/lib/delegationCredential/server"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; @@ -32,6 +34,7 @@ import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat"; import { prisma } from "@calcom/prisma"; import { WorkflowActions, WorkflowMethods, WorkflowTriggerEvents } from "@calcom/prisma/enums"; import type { EventTypeMetadata, PlatformClientParams } from "@calcom/prisma/zod-utils"; +import { eventTypeAppMetadataOptionalSchema } from "@calcom/prisma/zod-utils"; import type { CalendarEvent } from "@calcom/types/Calendar"; import { handleRescheduleEventManager } from "./handleRescheduleEventManager"; @@ -324,6 +327,41 @@ export const roundRobinManualReassignment = async ({ }) : null; + const apps = eventTypeAppMetadataOptionalSchema.parse(eventType?.metadata?.apps); + + // remove the event and meeting using the old host's credentials + if (hasOrganizerChanged && originalOrganizer.id !== newUser.id) { + const previousHostCredentials = await getAllCredentialsIncludeServiceAccountKey( + originalOrganizer, + eventType + ); + + const originalHostEventManager = new EventManager( + { ...originalOrganizer, credentials: previousHostCredentials }, + apps + ); + + const deletionEvent: CalendarEvent = { + ...evt, + organizer: { + id: originalOrganizer.id, + name: originalOrganizer.name || "", + email: originalOrganizer.email, + username: originalOrganizer.username || undefined, + timeZone: originalOrganizer.timeZone, + language: { translate: originalOrganizerT, locale: originalOrganizer.locale ?? "en" }, + timeFormat: getTimeFormatStringFromUserTimeFormat(originalOrganizer.timeFormat), + }, + destinationCalendar: previousHostDestinationCalendar ? [previousHostDestinationCalendar] : [], + title: booking.title, + }; + + await originalHostEventManager.deleteEventsAndMeetings({ + event: deletionEvent, + bookingReferences: booking.references, + }); + } + const { evtWithAdditionalInfo } = await handleRescheduleEventManager({ evt, rescheduleUid: booking.uid, diff --git a/packages/features/ee/round-robin/roundRobinReassignment.test.ts b/packages/features/ee/round-robin/roundRobinReassignment.test.ts index d849973410..3c1f91b7cc 100644 --- a/packages/features/ee/round-robin/roundRobinReassignment.test.ts +++ b/packages/features/ee/round-robin/roundRobinReassignment.test.ts @@ -171,7 +171,9 @@ describe("roundRobinReassignment test", () => { bookingToReassignUid, undefined, true, - expect.arrayContaining([expect.objectContaining(testDestinationCalendar)]) + expect.arrayContaining([expect.objectContaining(testDestinationCalendar)]), + undefined, + true ); // Use equal fairness rr algorithm @@ -279,7 +281,9 @@ describe("roundRobinReassignment test", () => { bookingToReassignUid, undefined, false, - [] + [], + undefined, + false ); // Ensure organizer stays the same diff --git a/packages/features/ee/round-robin/roundRobinReassignment.ts b/packages/features/ee/round-robin/roundRobinReassignment.ts index aa8a6767aa..b48c0a8898 100644 --- a/packages/features/ee/round-robin/roundRobinReassignment.ts +++ b/packages/features/ee/round-robin/roundRobinReassignment.ts @@ -8,6 +8,7 @@ import { sendRoundRobinScheduledEmailsAndSMS, sendRoundRobinUpdatedEmailsAndSMS, } from "@calcom/emails"; +import { getAllCredentialsIncludeServiceAccountKey } from "@calcom/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials"; import getBookingResponsesSchema from "@calcom/features/bookings/lib/getBookingResponsesSchema"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { ensureAvailableUsers } from "@calcom/features/bookings/lib/handleNewBooking/ensureAvailableUsers"; @@ -17,6 +18,7 @@ import AssignmentReasonRecorder, { RRReassignmentType, } from "@calcom/features/ee/round-robin/assignmentReason/AssignmentReasonRecorder"; import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming"; +import EventManager from "@calcom/lib/EventManager"; import { enrichHostsWithDelegationCredentials, enrichUserWithDelegationCredentialsIncludeServiceAccountKey, @@ -31,6 +33,7 @@ import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat"; import { prisma } from "@calcom/prisma"; import { userMetadata as userMetadataSchema } from "@calcom/prisma/zod-utils"; import type { EventTypeMetadata, PlatformClientParams } from "@calcom/prisma/zod-utils"; +import { eventTypeAppMetadataOptionalSchema } from "@calcom/prisma/zod-utils"; import type { CalendarEvent } from "@calcom/types/Calendar"; import { handleRescheduleEventManager } from "./handleRescheduleEventManager"; @@ -355,6 +358,42 @@ export const roundRobinReassignment = async ({ user: { ...organizer, credentials }, }); + const apps = eventTypeAppMetadataOptionalSchema.parse(eventType?.metadata?.apps); + + // remove the event and meeting using the old host's credentials + if (hasOrganizerChanged && originalOrganizer.id !== reassignedRRHost.id) { + const previousHostCredentials = await getAllCredentialsIncludeServiceAccountKey( + originalOrganizer, + eventType + ); + const originalHostEventManager = new EventManager( + { ...originalOrganizer, credentials: previousHostCredentials }, + apps + ); + + const originalOrganizerT = await getTranslation(originalOrganizer.locale || "en", "common"); + + const deletionEvent: CalendarEvent = { + ...evt, + organizer: { + id: originalOrganizer.id, + name: originalOrganizer.name || "", + email: originalOrganizer.email, + username: originalOrganizer.username || undefined, + timeZone: originalOrganizer.timeZone, + language: { translate: originalOrganizerT, locale: originalOrganizer.locale ?? "en" }, + timeFormat: getTimeFormatStringFromUserTimeFormat(originalOrganizer.timeFormat), + }, + destinationCalendar: previousHostDestinationCalendar ? [previousHostDestinationCalendar] : [], + title: booking.title, + }; + + await originalHostEventManager.deleteEventsAndMeetings({ + event: deletionEvent, + bookingReferences: booking.references, + }); + } + const { evtWithAdditionalInfo } = await handleRescheduleEventManager({ evt, rescheduleUid: booking.uid, diff --git a/packages/features/ee/round-robin/utils/bookingSelect.ts b/packages/features/ee/round-robin/utils/bookingSelect.ts index 536d6727a5..2a636108fa 100644 --- a/packages/features/ee/round-robin/utils/bookingSelect.ts +++ b/packages/features/ee/round-robin/utils/bookingSelect.ts @@ -1,4 +1,5 @@ import type { Prisma } from "@calcom/prisma/client"; +import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential"; export const bookingSelect = { uid: true, @@ -13,8 +14,18 @@ export const bookingSelect = { eventTypeId: true, destinationCalendar: true, user: { - include: { + select: { + id: true, + name: true, + username: true, + email: true, + locale: true, + timeZone: true, + timeFormat: true, destinationCalendar: true, + credentials: { + select: credentialForCalendarServiceSelect, + }, }, }, attendees: true,