* 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>
344 lines
10 KiB
TypeScript
344 lines
10 KiB
TypeScript
import type { Prisma } from "@prisma/client";
|
|
|
|
import { prisma } from "@calcom/prisma";
|
|
import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
|
|
import type { SelectedCalendarEventTypeIds } from "@calcom/types/Calendar";
|
|
|
|
import { buildCredentialPayloadForPrisma } from "../buildCredentialPayloadForCalendar";
|
|
|
|
export type UpdateArguments = {
|
|
where: FindManyArgs["where"];
|
|
data: Prisma.SelectedCalendarUpdateManyArgs["data"];
|
|
};
|
|
export type FindManyArgs = {
|
|
// https://github.com/microsoft/TypeScript/issues/55217 It crashes atoms build with this if we become too generic here. Seems like a TS bug with complex prisma types.
|
|
where?: {
|
|
userId?:
|
|
| number
|
|
| {
|
|
in: number[];
|
|
};
|
|
credentialId?: number | null;
|
|
integration?: string;
|
|
externalId?: string;
|
|
eventTypeId?: number | null;
|
|
googleChannelId?:
|
|
| string
|
|
| null
|
|
| {
|
|
not: null;
|
|
};
|
|
};
|
|
orderBy?: {
|
|
userId?: "asc" | "desc";
|
|
};
|
|
select?: Prisma.SelectedCalendarSelect;
|
|
};
|
|
|
|
const ensureUserLevelWhere = {
|
|
eventTypeId: null,
|
|
};
|
|
|
|
export class SelectedCalendarRepository {
|
|
private static async findConflicting(data: {
|
|
userId: number;
|
|
integration: string;
|
|
externalId: string;
|
|
eventTypeId?: number | null;
|
|
}) {
|
|
// Because userId_integration_externalId_eventTypeId is a unique constraint but with eventTypeId being nullable,
|
|
// it allows for multiple entries with the same (userId, integration, externalId) with eventTypeId=null in DB.
|
|
// We restrict it at app level by ensuring that an entry doesn't exist already before creating a new one
|
|
return await SelectedCalendarRepository.findFirst({
|
|
where: {
|
|
userId: data.userId,
|
|
integration: data.integration,
|
|
externalId: data.externalId,
|
|
eventTypeId: data.eventTypeId || null,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async findById(id: string) {
|
|
return await prisma.selectedCalendar.findUnique({ where: { id } });
|
|
}
|
|
|
|
static async create(data: Prisma.SelectedCalendarUncheckedCreateInput) {
|
|
const conflictingCalendar = await SelectedCalendarRepository.findConflicting(data);
|
|
|
|
if (conflictingCalendar) {
|
|
throw new Error("Selected calendar already exists");
|
|
}
|
|
|
|
return await prisma.selectedCalendar.create({
|
|
data: {
|
|
...data,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async upsert(data: Prisma.SelectedCalendarUncheckedCreateInput) {
|
|
// userId_integration_externalId_eventTypeId is a unique constraint but with eventTypeId being nullable
|
|
// So, this unique constraint can't be used in upsert. Prisma doesn't allow that, So, we do create and update separately
|
|
const credentialPayload = buildCredentialPayloadForPrisma({
|
|
credentialId: data.credentialId,
|
|
domainWideDelegationCredentialId: data.domainWideDelegationCredentialId,
|
|
});
|
|
|
|
const newData = {
|
|
...data,
|
|
...credentialPayload,
|
|
};
|
|
|
|
const conflictingCalendar = await SelectedCalendarRepository.findConflicting(newData);
|
|
if (conflictingCalendar) {
|
|
return await prisma.selectedCalendar.update({
|
|
where: {
|
|
id: conflictingCalendar.id,
|
|
},
|
|
data: newData,
|
|
});
|
|
}
|
|
|
|
return await prisma.selectedCalendar.create({
|
|
data: newData,
|
|
});
|
|
}
|
|
|
|
static async delete({ where }: { where: Prisma.SelectedCalendarUncheckedCreateInput }) {
|
|
const calendarsToDelete = await SelectedCalendarRepository.findMany({ where });
|
|
|
|
if (calendarsToDelete.length === 0) {
|
|
// Same behaviour as Prisma.delete as it throws error if no record is found
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
|
|
if (calendarsToDelete.length > 1) {
|
|
throw new Error("Multiple SelectedCalendar records found to delete. deleteMany should be used instead");
|
|
}
|
|
|
|
// We can't use delete because unique constraint on userId_integration_externalId_eventTypeId has eventTypeId as nullable
|
|
return await prisma.selectedCalendar.delete({
|
|
where: {
|
|
id: calendarsToDelete[0].id,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async createIfNotExists(data: Prisma.SelectedCalendarUncheckedCreateInput) {
|
|
const conflictingCalendar = await SelectedCalendarRepository.findConflicting(data);
|
|
|
|
if (conflictingCalendar) return conflictingCalendar;
|
|
return await prisma.selectedCalendar.create({
|
|
data,
|
|
});
|
|
}
|
|
|
|
/** Retrieve calendars that need to be watched */
|
|
static async getNextBatchToWatch(limit = 100) {
|
|
// Get selected calendars from users that belong to a team that has calendar cache enabled
|
|
const oneDayInMS = 24 * 60 * 60 * 1000;
|
|
const tomorrowTimestamp = String(new Date().getTime() + oneDayInMS);
|
|
const nextBatch = await prisma.selectedCalendar.findMany({
|
|
take: limit,
|
|
where: {
|
|
user: {
|
|
teams: {
|
|
some: {
|
|
team: {
|
|
features: {
|
|
some: {
|
|
featureId: "calendar-cache",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
// RN we only support google calendar subscriptions for now
|
|
integration: "google_calendar",
|
|
// We skip retrying calendars that have errored
|
|
error: null,
|
|
OR: [
|
|
// Either is a calendar pending to be watched
|
|
{ googleChannelExpiration: null },
|
|
// Or is a calendar that is about to expire
|
|
{ googleChannelExpiration: { lt: tomorrowTimestamp } },
|
|
],
|
|
},
|
|
});
|
|
return nextBatch;
|
|
}
|
|
/**
|
|
* Retrieve calendars that are being watched but shouldn't be anymore
|
|
* e.g. when a user disables calendar cache for the organization
|
|
*/
|
|
static async getNextBatchToUnwatch(limit = 100) {
|
|
const where: Prisma.SelectedCalendarWhereInput = {
|
|
// RN we only support google calendar subscriptions for now
|
|
integration: "google_calendar",
|
|
googleChannelExpiration: { not: null },
|
|
user: {
|
|
teams: {
|
|
every: {
|
|
team: {
|
|
features: {
|
|
none: {
|
|
featureId: "calendar-cache",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
// If calendar cache is disabled globally, we skip team features and unwatch all subscriptions
|
|
const nextBatch = await prisma.selectedCalendar.findMany({
|
|
take: limit,
|
|
where,
|
|
});
|
|
return nextBatch;
|
|
}
|
|
|
|
static async findMany({ where, select, orderBy }: FindManyArgs) {
|
|
return await prisma.selectedCalendar.findMany({ where, select, orderBy });
|
|
}
|
|
|
|
static async findUniqueOrThrow({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
|
|
const calendars = await prisma.selectedCalendar.findMany({ where });
|
|
if (calendars.length === 0) {
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
return calendars[0];
|
|
}
|
|
|
|
static async findFirstByGoogleChannelId(googleChannelId: string) {
|
|
return await prisma.selectedCalendar.findFirst({
|
|
where: {
|
|
googleChannelId,
|
|
},
|
|
select: {
|
|
credential: {
|
|
select: {
|
|
...credentialForCalendarServiceSelect,
|
|
selectedCalendars: {
|
|
orderBy: {
|
|
externalId: "asc",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
});
|
|
}
|
|
|
|
static async findFirst({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
|
|
return await prisma.selectedCalendar.findFirst({
|
|
where,
|
|
});
|
|
}
|
|
|
|
static async findFirstOrThrow({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
|
|
const calendar = await SelectedCalendarRepository.findFirst({ where });
|
|
if (!calendar) {
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
return calendar;
|
|
}
|
|
|
|
static async update(args: UpdateArguments) {
|
|
const calendarsToUpdate = await SelectedCalendarRepository.findMany({ where: args.where });
|
|
|
|
if (calendarsToUpdate.length === 0) {
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
|
|
if (calendarsToUpdate.length > 1) {
|
|
throw new Error("Multiple SelectedCalendar records found to update. updateMany should be used instead");
|
|
}
|
|
|
|
const calendarToUpdate = calendarsToUpdate[0];
|
|
|
|
return await prisma.selectedCalendar.update({
|
|
where: {
|
|
id: calendarToUpdate.id,
|
|
},
|
|
data: args.data,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Following methods ensure that they operate on user level calendars only
|
|
*/
|
|
static async findUserLevelUniqueOrThrow({ where }: { where: Prisma.SelectedCalendarWhereInput }) {
|
|
const calendars = await SelectedCalendarRepository.findUniqueOrThrow({
|
|
where: {
|
|
...where,
|
|
...ensureUserLevelWhere,
|
|
},
|
|
});
|
|
|
|
if (!calendars) {
|
|
throw new Error("SelectedCalendar not found");
|
|
}
|
|
return calendars;
|
|
}
|
|
|
|
static async findManyUserLevel(args: FindManyArgs) {
|
|
return SelectedCalendarRepository.findMany({
|
|
...args,
|
|
where: {
|
|
...args.where,
|
|
...ensureUserLevelWhere,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async updateUserLevel(args: UpdateArguments) {
|
|
return SelectedCalendarRepository.update({
|
|
where: {
|
|
...args.where,
|
|
...ensureUserLevelWhere,
|
|
},
|
|
data: args.data,
|
|
});
|
|
}
|
|
|
|
static async deleteUserLevel({ where }: { where: Prisma.SelectedCalendarUncheckedCreateInput }) {
|
|
return await SelectedCalendarRepository.delete({
|
|
where: {
|
|
...where,
|
|
...ensureUserLevelWhere,
|
|
},
|
|
});
|
|
}
|
|
|
|
static async upsertManyForEventTypeIds({
|
|
data,
|
|
eventTypeIds,
|
|
}: {
|
|
data: Prisma.SelectedCalendarUncheckedCreateInput;
|
|
eventTypeIds: SelectedCalendarEventTypeIds;
|
|
}) {
|
|
const userId = data.userId;
|
|
return await Promise.all(
|
|
eventTypeIds.map((eventTypeId) =>
|
|
SelectedCalendarRepository.upsert({
|
|
...data,
|
|
eventTypeId,
|
|
userId,
|
|
integration: data.integration,
|
|
externalId: data.externalId,
|
|
credentialId: data.credentialId,
|
|
})
|
|
)
|
|
);
|
|
}
|
|
static async updateById(id: string, data: Prisma.SelectedCalendarUpdateInput) {
|
|
return await prisma.selectedCalendar.update({
|
|
where: { id },
|
|
data,
|
|
});
|
|
}
|
|
}
|