* Add endpoints for testing the flow * Add MVP * new route * Fixes * Fixes * Remove enable toggle support from domainWideDelegation * Fixes * Revert "Remove enable toggle support from domainWideDelegation" This reverts commit c29e729206cd1fa063f9c9ce0cf148ef1577d60b. * Revert yarn.lock * More fixes * Fix new workspace platform add * refactor: improvements * refactor: bug fixes and improvements * fix: type errors * fix: conflicts * chore: update test * fix: logic * chore: improvements * fix: toglle * fix: bugs * fix: type err * chore: check number type * fix: after conflicts * chore: fix type err * fix: type errors and tests * fix: tets * test * chore: remove unused * fix: google meet url on booking page and secondary calendar * fix: add property * fix: type err * fix: re assingment bug * fix: use getAllCredentials * chore: fix import * fix: installed count * fix: pass event type * fix: import * fix: [Stacked PR] Review fixes (#17958) * Review fixes * fix: destination calendar bug --------- Co-authored-by: Udit Takkar <udit222001@gmail.com> * refactor: use repository * chore: remove duplicate * fix: More review fixes for domain wide delegation (#17969) * Reuse buildCredentialPayloadForCalendar * fixes --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * fix ts error * Fix getSchedule not using dwd credentials (#17995) * fix: Remove direct DWD table access from google-calendar and remove delegatedToId column from Credential (#18015) * Remove fn rename to reduce number of files changed * chore: check feature globally * test: add unit tests * chore: move function * test: add booking test * wip * Remove domain-wide-delegation team feature flag * Make sure duplicate calendars are not shown due to DWD. Show DWD when there is conflict * Fix tests and their ts errors * Fix more tests * Move findUsersForAvailabilityCheck to separate file as it has AppStore dependency causing problem with Routing Forms. Build crashes * fix: Multiple calendar connections from Google not showing up in apps/installed * DestinationCalendar must have either credentialId or domainWideDeelgationId. Also handle the case when DWD is disabled and there was a non-dwd credential that could be used * Disable deletetion of DWD as it is destructive and prefer disabling instead * Show DWD credential calendars at the top * Fixed tests * Calendar Cache DWD support * Self-Review: Verify email required and add more selectedCalendar tests * Self Review: shorten names * Self ReviewL Dead code removal * Revert "Calendar Cache DWD support" This reverts commit 009f236470fa21eba5986117d4f6e4d4c5e38c34. * Some misc fixes * fixes * Performance improvememt in slots loading and booking * More cases for handling dwd credentials * simplify the logic. Ensure that EventManager and the modules below it in the flow have CredentialForCalendarService available * Fix tests * Fix installed/conferencing not showing gogole meet * Shorten name * Fix ApI v2 tests * Add some more tests * add getSchedule tests * Improve tests * Make Google Meet default when DWD for google is enabled * Enable feature flagging for DWD * chore: bump libraries * Encrypt serviceaccount private key * Fix ts errors * bump platform libraries * org add dwd * org add dwd * bump platform libraries * fix selected calendars * fix remove selected dwd calendar * remove oauthclient id aliad in authedCalendar * remove oauthclient id aliad in authedCalendar * refactor: OrganizationsDwdController * chore: export toggleDwdEnabled from platform-libraries * feat: v2 update (enable / disable) dwd * refactor: SelectedCalendarsController check if user belongs to dwd org & for not dwd use previous logic * wip: DestinationCalendar send domainWideDelegationCredentialId from frontend to api * try fix set destination calendar api v2 * fixup! try fix set destination calendar api v2 * setting google meet as default location working for dwd * bump platform libraries version * allow office 365 workspace slug * allow office 365 workspace slug * chore: v2 create dwd MS and Google service keys input * fix: CreateDwdInput serviceAccountKey * fix: CredentialForCalendarService type * fix: check workspace slug * feat: update serviceAccessKey of DWD * testing * fixup! testing * fix: getAuthUtl bug * fix: unit tests * fix: type err and unit test * fix: e2e test * fix: credentials bug and failing unit tests * Update CalendarService.ts * chore: refactor office365 calendar service and add testDomainWideDelegationSetup * fix: office365Calendar use correct clientId/Secret for DWD * fix: office365Calendar dwd no need refresh token * test: add unit test for outlook dwd and setup * feat: added dwd support for office365 calendar * feat: added dwd support for office365 video * test: finish test for outlook dwd * fix: create dialog bug * chore: remove console logs * fix: refreshToken bug * bump version libraries * refactor: fetch dwd credentials only in findQualifiedHosts * fixup! refactor: fetch dwd credentials only in findQualifiedHosts * fix: type err * fix: type err * fix: getUserDisplayName * fix: unit test * chore: bump platform lib --------- Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Udit Takkar <udit222001@gmail.com> Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
193 lines
6.4 KiB
TypeScript
193 lines
6.4 KiB
TypeScript
import type { DestinationCalendar } from "@prisma/client";
|
|
import type { Prisma } from "@prisma/client";
|
|
|
|
import { metadata as GoogleMeetMetadata } from "@calcom/app-store/googlevideo/_metadata";
|
|
import { MeetLocationType } from "@calcom/app-store/locations";
|
|
import EventManager from "@calcom/core/EventManager";
|
|
import type { EventManagerInitParams } from "@calcom/core/EventManager";
|
|
import { getAllCredentials } from "@calcom/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials";
|
|
import type { EventType } from "@calcom/features/bookings/lib/getAllCredentialsForUsersOnEvent/getAllCredentials";
|
|
import { getVideoCallDetails } from "@calcom/features/bookings/lib/handleNewBooking/getVideoCallDetails";
|
|
import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser";
|
|
import logger from "@calcom/lib/logger";
|
|
import { getTranslation } from "@calcom/lib/server/i18n";
|
|
import { BookingReferenceRepository } from "@calcom/lib/server/repository/bookingReference";
|
|
import { prisma } from "@calcom/prisma";
|
|
import type { CalendarEvent, AdditionalInformation } from "@calcom/types/Calendar";
|
|
|
|
type InitParams = {
|
|
user: {
|
|
id: number;
|
|
name: string | null;
|
|
email: string;
|
|
username: string | null;
|
|
} & EventManagerInitParams["user"];
|
|
eventTypeAppMetadata?: EventManagerInitParams["eventTypeAppMetadata"];
|
|
eventType: EventType;
|
|
};
|
|
|
|
export const handleRescheduleEventManager = async ({
|
|
evt,
|
|
rescheduleUid,
|
|
newBookingId,
|
|
changedOrganizer,
|
|
previousHostDestinationCalendar,
|
|
initParams,
|
|
bookingLocation,
|
|
bookingId,
|
|
bookingICalUID,
|
|
bookingMetadata,
|
|
}: {
|
|
evt: CalendarEvent;
|
|
rescheduleUid: string;
|
|
newBookingId?: number;
|
|
changedOrganizer?: boolean;
|
|
previousHostDestinationCalendar?: DestinationCalendar[] | null;
|
|
initParams: InitParams;
|
|
bookingLocation: string | null;
|
|
bookingId: number;
|
|
bookingICalUID?: string | null;
|
|
bookingMetadata?: Prisma.JsonValue;
|
|
}) => {
|
|
const handleRescheduleEventManager = logger.getSubLogger({
|
|
prefix: ["handleRescheduleEventManager", `${bookingId}`],
|
|
});
|
|
|
|
const allCredentials = await getAllCredentials(initParams.user, initParams?.eventType);
|
|
|
|
const eventManager = new EventManager(
|
|
{ ...initParams.user, credentials: allCredentials },
|
|
initParams?.eventTypeAppMetadata
|
|
);
|
|
|
|
const updateManager = await eventManager.reschedule(
|
|
evt,
|
|
rescheduleUid,
|
|
newBookingId,
|
|
changedOrganizer,
|
|
previousHostDestinationCalendar
|
|
);
|
|
|
|
const results = updateManager.results ?? [];
|
|
|
|
const { metadata: videoMetadata, videoCallUrl: _videoCallUrl } = getVideoCallDetails({
|
|
results: results,
|
|
});
|
|
|
|
let videoCallUrl = _videoCallUrl;
|
|
let metadata: AdditionalInformation = {};
|
|
metadata = videoMetadata;
|
|
|
|
if (results.length) {
|
|
// Handle Google Meet results
|
|
if (bookingLocation === MeetLocationType) {
|
|
const googleMeetResult = {
|
|
appName: GoogleMeetMetadata.name,
|
|
type: "conferencing",
|
|
uid: results[0].uid,
|
|
originalEvent: results[0].originalEvent,
|
|
};
|
|
|
|
// Find index of google_calendar inside createManager.referencesToCreate
|
|
const googleCalIndex = updateManager.referencesToCreate.findIndex(
|
|
(ref) => ref.type === "google_calendar"
|
|
);
|
|
const googleCalResult = results[googleCalIndex];
|
|
|
|
const t = await getTranslation("en", "common");
|
|
|
|
if (!googleCalResult) {
|
|
handleRescheduleEventManager.warn("Google Calendar not installed but using Google Meet as location");
|
|
results.push({
|
|
...googleMeetResult,
|
|
success: false,
|
|
calWarnings: [t("google_meet_warning")],
|
|
});
|
|
}
|
|
|
|
const googleHangoutLink = Array.isArray(googleCalResult?.updatedEvent)
|
|
? googleCalResult.updatedEvent[0]?.hangoutLink
|
|
: googleCalResult?.updatedEvent?.hangoutLink ?? googleCalResult?.createdEvent?.hangoutLink;
|
|
|
|
if (googleHangoutLink) {
|
|
results.push({
|
|
...googleMeetResult,
|
|
success: true,
|
|
});
|
|
|
|
// Add google_meet to referencesToCreate in the same index as google_calendar
|
|
updateManager.referencesToCreate[googleCalIndex] = {
|
|
...updateManager.referencesToCreate[googleCalIndex],
|
|
meetingUrl: googleHangoutLink,
|
|
};
|
|
|
|
// Also create a new referenceToCreate with type video for google_meet
|
|
updateManager.referencesToCreate.push({
|
|
type: "google_meet_video",
|
|
meetingUrl: googleHangoutLink,
|
|
uid: googleCalResult.uid,
|
|
credentialId: updateManager.referencesToCreate[googleCalIndex].credentialId,
|
|
});
|
|
} else if (googleCalResult && !googleHangoutLink) {
|
|
results.push({
|
|
...googleMeetResult,
|
|
success: false,
|
|
});
|
|
}
|
|
}
|
|
const createdOrUpdatedEvent = Array.isArray(results[0]?.updatedEvent)
|
|
? results[0]?.updatedEvent[0]
|
|
: results[0]?.updatedEvent ?? results[0]?.createdEvent;
|
|
metadata.hangoutLink = createdOrUpdatedEvent?.hangoutLink;
|
|
metadata.conferenceData = createdOrUpdatedEvent?.conferenceData;
|
|
metadata.entryPoints = createdOrUpdatedEvent?.entryPoints;
|
|
|
|
videoCallUrl =
|
|
metadata.hangoutLink || createdOrUpdatedEvent?.url || getVideoCallUrlFromCalEvent(evt) || videoCallUrl;
|
|
|
|
const calendarResult = results.find((result) => result.type.includes("_calendar"));
|
|
|
|
evt.iCalUID = Array.isArray(calendarResult?.updatedEvent)
|
|
? calendarResult?.updatedEvent[0]?.iCalUID
|
|
: calendarResult?.updatedEvent?.iCalUID || undefined;
|
|
}
|
|
const newReferencesToCreate = structuredClone(updateManager.referencesToCreate);
|
|
|
|
await BookingReferenceRepository.replaceBookingReferences({
|
|
bookingId,
|
|
newReferencesToCreate,
|
|
});
|
|
|
|
try {
|
|
if (bookingLocation?.startsWith("http")) {
|
|
videoCallUrl = bookingLocation;
|
|
}
|
|
|
|
const newBookingMetaData = videoCallUrl
|
|
? {
|
|
videoCallUrl: getVideoCallUrlFromCalEvent(evt) || videoCallUrl,
|
|
}
|
|
: undefined;
|
|
|
|
await prisma.booking.update({
|
|
where: {
|
|
id: bookingId,
|
|
},
|
|
data: {
|
|
location: bookingLocation,
|
|
iCalUID: evt.iCalUID !== bookingICalUID ? evt.iCalUID : bookingICalUID,
|
|
metadata: { ...(typeof bookingMetadata === "object" && bookingMetadata), ...newBookingMetaData },
|
|
},
|
|
});
|
|
} catch (error) {
|
|
handleRescheduleEventManager.error("Error while updating booking metadata", JSON.stringify({ error }));
|
|
}
|
|
|
|
const evtWithAdditionalInfo = {
|
|
...evt,
|
|
additionalInformation: metadata,
|
|
};
|
|
|
|
return { evtWithAdditionalInfo };
|
|
};
|