* 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 <[email protected]> * refactor: use repository * chore: remove duplicate * fix: More review fixes for domain wide delegation (#17969) * Reuse buildCredentialPayloadForCalendar * fixes --------- Co-authored-by: Udit Takkar <[email protected]> * 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 <[email protected]> Co-authored-by: Udit Takkar <[email protected]> Co-authored-by: Udit Takkar <[email protected]> Co-authored-by: Morgan Vernay <[email protected]> Co-authored-by: supalarry <[email protected]> Co-authored-by: Somay Chauhan <[email protected]> Co-authored-by: Morgan <[email protected]>
109 lines
3.7 KiB
TypeScript
109 lines
3.7 KiB
TypeScript
import { cookies, headers } from "next/headers";
|
|
import type { NextRequest } from "next/server";
|
|
import { NextResponse } from "next/server";
|
|
import { z } from "zod";
|
|
|
|
import { getCalendarCredentials, getConnectedCalendars } from "@calcom/core/CalendarManager";
|
|
import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
|
|
import { CalendarCache } from "@calcom/features/calendar-cache/calendar-cache";
|
|
import { HttpError } from "@calcom/lib/http-error";
|
|
import notEmpty from "@calcom/lib/notEmpty";
|
|
import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
|
|
import { UserRepository } from "@calcom/lib/server/repository/user";
|
|
|
|
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
|
|
|
|
const selectedCalendarSelectSchema = z.object({
|
|
integration: z.string(),
|
|
externalId: z.string(),
|
|
credentialId: z.coerce.number(),
|
|
domainWideDelegationCredentialId: z.string().nullish().default(null),
|
|
eventTypeId: z.coerce.number().nullish(),
|
|
});
|
|
|
|
async function authMiddleware() {
|
|
const session = await getServerSession({ req: buildLegacyRequest(headers(), cookies()) });
|
|
|
|
if (!session?.user?.id) {
|
|
throw new HttpError({ statusCode: 401, message: "Not authenticated" });
|
|
}
|
|
|
|
const userWithCredentials = await UserRepository.findUserWithCredentials({ id: session.user.id });
|
|
|
|
if (!userWithCredentials) {
|
|
throw new HttpError({ statusCode: 401, message: "Not authenticated" });
|
|
}
|
|
|
|
return userWithCredentials;
|
|
}
|
|
|
|
// TODO: It doesn't seem to be used from within the app. It is possible that someone outside Cal.com is using this GET endpoint
|
|
async function getHandler() {
|
|
const user = await authMiddleware();
|
|
|
|
const selectedCalendarIds = await SelectedCalendarRepository.findMany({
|
|
where: { userId: user.id },
|
|
select: { externalId: true },
|
|
});
|
|
// get user's credentials + their connected integrations
|
|
const calendarCredentials = getCalendarCredentials(user.credentials);
|
|
// get all the connected integrations' calendars (from third party)
|
|
const { connectedCalendars } = await getConnectedCalendars(
|
|
calendarCredentials,
|
|
user.userLevelSelectedCalendars
|
|
);
|
|
|
|
const calendars = connectedCalendars.flatMap((c) => c.calendars).filter(notEmpty);
|
|
const selectableCalendars = calendars.map((cal) => {
|
|
return { selected: selectedCalendarIds.findIndex((s) => s.externalId === cal.externalId) > -1, ...cal };
|
|
});
|
|
|
|
return NextResponse.json(selectableCalendars);
|
|
}
|
|
|
|
async function postHandler(req: NextRequest) {
|
|
const user = await authMiddleware();
|
|
|
|
const body = await req.json();
|
|
const { integration, externalId, credentialId, eventTypeId, domainWideDelegationCredentialId } =
|
|
selectedCalendarSelectSchema.parse(body);
|
|
|
|
await SelectedCalendarRepository.upsert({
|
|
userId: user.id,
|
|
integration,
|
|
externalId,
|
|
credentialId,
|
|
domainWideDelegationCredentialId,
|
|
eventTypeId: eventTypeId ?? null,
|
|
});
|
|
|
|
return NextResponse.json({ message: "Calendar Selection Saved" });
|
|
}
|
|
|
|
async function deleteHandler(req: NextRequest) {
|
|
const user = await authMiddleware();
|
|
const searchParams = Object.fromEntries(req.nextUrl.searchParams.entries());
|
|
|
|
const { integration, externalId, credentialId, eventTypeId } =
|
|
selectedCalendarSelectSchema.parse(searchParams);
|
|
|
|
const calendarCacheRepository = await CalendarCache.initFromCredentialId(credentialId);
|
|
await calendarCacheRepository.unwatchCalendar({
|
|
calendarId: externalId,
|
|
eventTypeIds: [eventTypeId ?? null],
|
|
});
|
|
|
|
await SelectedCalendarRepository.delete({
|
|
where: {
|
|
userId: user.id,
|
|
externalId,
|
|
integration,
|
|
eventTypeId: eventTypeId ?? null,
|
|
},
|
|
});
|
|
|
|
return NextResponse.json({ message: "Calendar Selection Saved" });
|
|
}
|
|
|
|
export { deleteHandler as DELETE, postHandler as POST, getHandler as GET };
|