Fixes CAL-5372 # Delegation Credentials with CalendarCache. Following content is a snapshot of the [internal document](https://calendso.slack.com/docs/T08B8KA2BNF/F08L5JYU3V3) **Problem-1 :** CalendarCache needs SelectedCalendar records to work but SelectedCalendar record is only created when a user connects their calendar and then enables some calendar for conflict checking. Because with Delegation, no manual connection is done by any of the members, we need a way to create SelectedCalendar records automatically. **Problem-2** CalendarCache connects to credential(regular credential) which doesn’t exist for Delegation Credential scenario. Also, DelegationCredential is common for all the members(different from Credential which is different for different members) of the organization and we need to identify to which user the CalendarCache belongs. **Solution for both problems** - Create credential records for Delegation Credentials as well - Through Cron(new - we could schedule it every 5mins) - Now create SelectedCalendar records for those Credential records - Through another Cron(new - we could schedule it every 5mins) - Now CalendarCache records will automatically be created for those SelectedCalendar records -existing cron ## Fixed some Delegation Credentials bugs unrelated to calendar-cache - If DestinationCalendar wasn't set(which is possible only with Delegation Credentials), then Google Meet wasn't used as a conferencing app - [Added a test] - If no SelectedCalendar is there but Google Calendar connection exists(possible only with Delegation Credential) then we were not doing conflict checking. It is expected to not do it for Regular Credentials, but for Delegation Credential we must check for conflict in that case too [Added a test] - Earlier if a user has Regular Credential as well as Delegation Credential for the same external id which is the member email(say member1@acme.com) then availability were retrieved twice because we weren't deduplicating credentials as it wasn't a trivial thing to do. Now that is being done. **Env Variables:** Note this PR doesn't introduce any new env variable. The existing env variable has been added to .env.example. But if this env variable isn't already set, it must be set. `CALCOM_SERVICE_ACCOUNT_ENCRYPTION_KEY={SAME_AS_SET_FOR_V2_API}` **Deployment Plan:** 1. Add Observability for SelectedCalendar when _error_ field is set 2. Follow https://github.com/calcom/cal.com/blob/calendar-cache-dwd-support/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/delegation-credential/delegation-credential.md#setting-up-delegation-credential-for-google-calendar-api to enable Delegation Credential for i.cal.com 3. Note that to be able to see the option to enable Delegation Credential for an organization, you need to enable `teamFeature` and `feature` for `delegation-credential` ## Automation Tests - Introduced tests for calendar-cache.repository.ts - Tests all methods of the repository - Added more tests for handleNewBooking/delegation-credential flow. - Added test to verify the bug fix when no DestinationCalendar exists and Google Meet should be used still - Added more tests for Google Calendar/CalendarService targeting DelegationCredential - Added more tests for getCalendarsEvents. - To test the new logic of calling getAvailability still if there are no selectedCalendars in case of Delegation Credential - Also introduced tests for `getAvailabitlityWithTimezones` which was an existing function but now has some new changes. - Added tests for deduplication logic in CalendarManager.ts ## How to Test Enable Calendar Cache and Delegation Credential feature for acme org through `features` and `teamFeatures` tables. - Enable Delegation Credential for acme org - Enable atleast 1 calendar for conflict checking for one of the users(say owner1) - Ensure GOOGLE_WEBHOOK_TOKEN is set in .env file - Ensure GOOGLE_WEBHOOK_URL is set to ngrok url of webapp in .env file - Hit cron endpoint `curl http://localhost:3000/api/calendar-cache/cron\?apiKey\={API_KEY}` that would cache the freebusy result for the selected calendars Followup - https://github.com/calcom/cal.com/pull/20698 - https://github.com/calcom/cal.com/pull/18619/files#r2046795643
317 lines
8.4 KiB
TypeScript
317 lines
8.4 KiB
TypeScript
import type { calendar_v3 } from "@googleapis/calendar";
|
|
import type {
|
|
BookingSeat,
|
|
DestinationCalendar,
|
|
Prisma,
|
|
SelectedCalendar as _SelectedCalendar,
|
|
} from "@prisma/client";
|
|
import type { Dayjs } from "dayjs";
|
|
import type { TFunction } from "i18next";
|
|
import type { Time } from "ical.js";
|
|
import type { Frequency } from "rrule";
|
|
import type z from "zod";
|
|
|
|
import type { bookingResponse } from "@calcom/features/bookings/lib/getBookingResponsesSchema";
|
|
import type { Calendar } from "@calcom/features/calendars/weeklyview";
|
|
import type { TimeFormat } from "@calcom/lib/timeFormat";
|
|
import type { SchedulingType } from "@calcom/prisma/enums";
|
|
import type { CredentialForCalendarService } from "@calcom/types/Credential";
|
|
|
|
import type { Ensure } from "./utils";
|
|
|
|
export type { VideoCallData } from "./VideoApiAdapter";
|
|
|
|
type PaymentInfo = {
|
|
link?: string | null;
|
|
reason?: string | null;
|
|
id?: string | null;
|
|
paymentOption?: string | null;
|
|
amount?: number;
|
|
currency?: string;
|
|
};
|
|
|
|
export type Person = {
|
|
name: string;
|
|
email: string;
|
|
timeZone: string;
|
|
language: { translate: TFunction; locale: string };
|
|
username?: string;
|
|
id?: number;
|
|
bookingId?: number | null;
|
|
locale?: string | null;
|
|
timeFormat?: TimeFormat;
|
|
bookingSeat?: BookingSeat | null;
|
|
phoneNumber?: string | null;
|
|
};
|
|
|
|
export type TeamMember = {
|
|
id?: number;
|
|
name: string;
|
|
email: string;
|
|
phoneNumber?: string | null;
|
|
timeZone: string;
|
|
language: { translate: TFunction; locale: string };
|
|
};
|
|
|
|
export type EventBusyDate = {
|
|
start: Date | string;
|
|
end: Date | string;
|
|
source?: string | null;
|
|
};
|
|
|
|
export type EventBusyDetails = EventBusyDate & {
|
|
title?: string;
|
|
source?: string | null;
|
|
userId?: number | null;
|
|
};
|
|
|
|
export type CalendarServiceType = typeof Calendar;
|
|
export type AdditionalInfo = Record<string, unknown> & { calWarnings?: string[] };
|
|
|
|
export type NewCalendarEventType = {
|
|
uid: string;
|
|
id: string;
|
|
thirdPartyRecurringEventId?: string | null;
|
|
type: string;
|
|
password: string;
|
|
url: string;
|
|
additionalInfo: AdditionalInfo;
|
|
iCalUID?: string | null;
|
|
location?: string | null;
|
|
hangoutLink?: string | null;
|
|
conferenceData?: ConferenceData;
|
|
delegatedToId?: string | null;
|
|
};
|
|
|
|
export type CalendarEventType = {
|
|
uid: string;
|
|
etag: string;
|
|
/** This is the actual caldav event url, not the location url. */
|
|
url: string;
|
|
summary: string;
|
|
description: string;
|
|
location: string;
|
|
sequence: number;
|
|
startDate: Date | Dayjs;
|
|
endDate: Date | Dayjs;
|
|
duration: {
|
|
weeks: number;
|
|
days: number;
|
|
hours: number;
|
|
minutes: number;
|
|
seconds: number;
|
|
isNegative: boolean;
|
|
};
|
|
organizer: string;
|
|
attendees: any[][];
|
|
recurrenceId: Time;
|
|
timezone: any;
|
|
};
|
|
|
|
export type BatchResponse = {
|
|
responses: SubResponse[];
|
|
};
|
|
|
|
export type SubResponse = {
|
|
body: {
|
|
value: {
|
|
showAs: "free" | "tentative" | "away" | "busy" | "workingElsewhere";
|
|
start: { dateTime: string };
|
|
end: { dateTime: string };
|
|
}[];
|
|
};
|
|
};
|
|
|
|
export interface ConferenceData {
|
|
createRequest?: calendar_v3.Schema$CreateConferenceRequest;
|
|
}
|
|
|
|
export interface RecurringEvent {
|
|
dtstart?: Date | undefined;
|
|
interval: number;
|
|
count: number;
|
|
freq: Frequency;
|
|
until?: Date | undefined;
|
|
tzid?: string | undefined;
|
|
}
|
|
|
|
export type { IntervalLimit, IntervalLimitUnit } from "@calcom/lib/intervalLimits/intervalLimitSchema";
|
|
|
|
export type AppsStatus = {
|
|
appName: string;
|
|
type: (typeof App)["type"];
|
|
success: number;
|
|
failures: number;
|
|
errors: string[];
|
|
warnings?: string[];
|
|
};
|
|
|
|
export type CalEventResponses = Record<
|
|
string,
|
|
{
|
|
label: string;
|
|
value: z.infer<typeof bookingResponse>;
|
|
isHidden?: boolean;
|
|
}
|
|
>;
|
|
|
|
export interface ExistingRecurringEvent {
|
|
recurringEventId: string;
|
|
}
|
|
|
|
// If modifying this interface, probably should update builders/calendarEvent files
|
|
export interface CalendarEvent {
|
|
// Instead of sending this per event.
|
|
// TODO: Links sent in email should be validated and automatically redirected to org domain or regular app. It would be a much cleaner way. Maybe use existing /api/link endpoint
|
|
bookerUrl?: string;
|
|
type: string;
|
|
title: string;
|
|
startTime: string;
|
|
endTime: string;
|
|
organizer: Person;
|
|
attendees: Person[];
|
|
length?: number | null;
|
|
additionalNotes?: string | null;
|
|
customInputs?: Prisma.JsonObject | null;
|
|
description?: string | null;
|
|
team?: {
|
|
name: string;
|
|
members: TeamMember[];
|
|
id: number;
|
|
};
|
|
location?: string | null;
|
|
conferenceCredentialId?: number;
|
|
conferenceData?: ConferenceData;
|
|
additionalInformation?: AdditionalInformation;
|
|
uid?: string | null;
|
|
existingRecurringEvent?: ExistingRecurringEvent | null;
|
|
bookingId?: number;
|
|
videoCallData?: VideoCallData;
|
|
paymentInfo?: PaymentInfo | null;
|
|
requiresConfirmation?: boolean | null;
|
|
destinationCalendar?: DestinationCalendar[] | null;
|
|
cancellationReason?: string | null;
|
|
rejectionReason?: string | null;
|
|
hideCalendarNotes?: boolean;
|
|
hideCalendarEventDetails?: boolean;
|
|
recurrence?: string;
|
|
recurringEvent?: RecurringEvent | null;
|
|
eventTypeId?: number | null;
|
|
appsStatus?: AppsStatus[];
|
|
seatsShowAttendees?: boolean | null;
|
|
seatsShowAvailabilityCount?: boolean | null;
|
|
attendeeSeatId?: string;
|
|
seatsPerTimeSlot?: number | null;
|
|
schedulingType?: SchedulingType | null;
|
|
iCalUID?: string | null;
|
|
iCalSequence?: number | null;
|
|
hideOrganizerEmail?: boolean;
|
|
|
|
// It has responses to all the fields(system + user)
|
|
responses?: CalEventResponses | null;
|
|
|
|
// It just has responses to only the user fields. It allows to easily iterate over to show only user fields
|
|
userFieldsResponses?: CalEventResponses | null;
|
|
platformClientId?: string | null;
|
|
platformRescheduleUrl?: string | null;
|
|
platformCancelUrl?: string | null;
|
|
platformBookingUrl?: string | null;
|
|
oneTimePassword?: string | null;
|
|
delegationCredentialId?: string | null;
|
|
domainWideDelegationCredentialId?: string | null;
|
|
customReplyToEmail?: string | null;
|
|
}
|
|
|
|
export interface EntryPoint {
|
|
entryPointType?: string;
|
|
uri?: string;
|
|
label?: string;
|
|
pin?: string;
|
|
accessCode?: string;
|
|
meetingCode?: string;
|
|
passcode?: string;
|
|
password?: string;
|
|
}
|
|
|
|
export interface AdditionalInformation {
|
|
conferenceData?: ConferenceData;
|
|
entryPoints?: EntryPoint[];
|
|
hangoutLink?: string;
|
|
}
|
|
|
|
export interface IntegrationCalendar extends Ensure<Partial<_SelectedCalendar>, "externalId"> {
|
|
primary?: boolean;
|
|
name?: string;
|
|
readOnly?: boolean;
|
|
// For displaying the connected email address
|
|
email?: string;
|
|
primaryEmail?: string;
|
|
credentialId?: number | null;
|
|
integrationTitle?: string;
|
|
}
|
|
|
|
/**
|
|
* null is to refer to user-level SelectedCalendar
|
|
*/
|
|
export type SelectedCalendarEventTypeIds = (number | null)[];
|
|
|
|
export interface Calendar {
|
|
getCredentialId?(): number;
|
|
createEvent(
|
|
event: CalendarEvent,
|
|
credentialId: number,
|
|
externalCalendarId?: string
|
|
): Promise<NewCalendarEventType>;
|
|
|
|
updateEvent(
|
|
uid: string,
|
|
event: CalendarEvent,
|
|
externalCalendarId?: string | null
|
|
): Promise<NewCalendarEventType | NewCalendarEventType[]>;
|
|
|
|
deleteEvent(uid: string, event: CalendarEvent, externalCalendarId?: string | null): Promise<unknown>;
|
|
|
|
getAvailability(
|
|
dateFrom: string,
|
|
dateTo: string,
|
|
selectedCalendars: IntegrationCalendar[],
|
|
shouldServeCache?: boolean,
|
|
fallbackToPrimary?: boolean
|
|
): Promise<EventBusyDate[]>;
|
|
|
|
// for OOO calibration (only google calendar for now)
|
|
getAvailabilityWithTimeZones?(
|
|
dateFrom: string,
|
|
dateTo: string,
|
|
selectedCalendars: IntegrationCalendar[],
|
|
fallbackToPrimary?: boolean
|
|
): Promise<{ start: Date | string; end: Date | string; timeZone: string }[]>;
|
|
|
|
fetchAvailabilityAndSetCache?(selectedCalendars: IntegrationCalendar[]): Promise<unknown>;
|
|
|
|
listCalendars(event?: CalendarEvent): Promise<IntegrationCalendar[]>;
|
|
|
|
testDelegationCredentialSetup?(): Promise<boolean>;
|
|
|
|
watchCalendar?(options: {
|
|
calendarId: string;
|
|
eventTypeIds: SelectedCalendarEventTypeIds;
|
|
}): Promise<unknown>;
|
|
unwatchCalendar?(options: {
|
|
calendarId: string;
|
|
eventTypeIds: SelectedCalendarEventTypeIds;
|
|
}): Promise<void>;
|
|
}
|
|
|
|
/**
|
|
* @see [How to inference class type that implements an interface](https://stackoverflow.com/a/64765554/6297100)
|
|
*/
|
|
type Class<I, Args extends any[] = any[]> = new (...args: Args) => I;
|
|
|
|
export type CalendarClass = Class<Calendar, [CredentialForCalendarService]>;
|
|
|
|
export type SelectedCalendar = Pick<
|
|
_SelectedCalendar,
|
|
"userId" | "integration" | "externalId" | "credentialId"
|
|
>;
|