* 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]>
129 lines
4.2 KiB
TypeScript
129 lines
4.2 KiB
TypeScript
import type z from "zod";
|
|
|
|
import { enrichUserWithDwdCredentialsWithoutOrgId } from "@calcom/lib/domainWideDelegation/server";
|
|
import { UserRepository } from "@calcom/lib/server/repository/user";
|
|
import prisma from "@calcom/prisma";
|
|
import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
|
|
import { eventTypeAppMetadataOptionalSchema } from "@calcom/prisma/zod-utils";
|
|
import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
|
|
import type { CredentialPayload } from "@calcom/types/Credential";
|
|
|
|
export type EventType = {
|
|
userId?: number | null;
|
|
team?: { id: number | null; parentId: number | null } | null;
|
|
parentId?: number | null;
|
|
metadata: z.infer<typeof EventTypeMetaDataSchema>;
|
|
} | null;
|
|
|
|
/**
|
|
* Gets credentials from the user, team, and org if applicable
|
|
*
|
|
*/
|
|
export const getAllCredentials = async (
|
|
user: { id: number; username: string | null; email: string; credentials: CredentialPayload[] },
|
|
eventType: EventType
|
|
) => {
|
|
let allCredentials = user.credentials;
|
|
|
|
// If it's a team event type query for team credentials
|
|
if (eventType?.team?.id) {
|
|
const teamCredentialsQuery = await prisma.credential.findMany({
|
|
where: {
|
|
teamId: eventType.team.id,
|
|
},
|
|
select: credentialForCalendarServiceSelect,
|
|
});
|
|
allCredentials.push(...teamCredentialsQuery);
|
|
}
|
|
|
|
// If it's a managed event type, query for the parent team's credentials
|
|
if (eventType?.parentId) {
|
|
const teamCredentialsQuery = await prisma.team.findFirst({
|
|
where: {
|
|
eventTypes: {
|
|
some: {
|
|
id: eventType.parentId,
|
|
},
|
|
},
|
|
},
|
|
select: {
|
|
credentials: {
|
|
select: credentialForCalendarServiceSelect,
|
|
},
|
|
},
|
|
});
|
|
if (teamCredentialsQuery?.credentials) {
|
|
allCredentials.push(...teamCredentialsQuery?.credentials);
|
|
}
|
|
}
|
|
|
|
const { profile } = await UserRepository.enrichUserWithItsProfile({
|
|
user: user,
|
|
});
|
|
|
|
// If the user is a part of an organization, query for the organization's credentials
|
|
if (profile?.organizationId) {
|
|
const org = await prisma.team.findUnique({
|
|
where: {
|
|
id: profile.organizationId,
|
|
},
|
|
select: {
|
|
credentials: {
|
|
select: credentialForCalendarServiceSelect,
|
|
},
|
|
},
|
|
});
|
|
|
|
if (org?.credentials) {
|
|
allCredentials.push(...org.credentials);
|
|
}
|
|
}
|
|
|
|
// Only return CRM credentials that are enabled on the event type
|
|
const eventTypeAppMetadata = eventTypeAppMetadataOptionalSchema.parse(eventType?.metadata?.apps);
|
|
|
|
// Will be [credentialId]: { enabled: boolean }]
|
|
const eventTypeCrmCredentials: Record<number, { enabled: boolean }> = {};
|
|
|
|
for (const appKey in eventTypeAppMetadata) {
|
|
const app = eventTypeAppMetadata[appKey as keyof typeof eventTypeAppMetadata];
|
|
if (app.appCategories && app.appCategories.some((category: string) => category === "crm")) {
|
|
eventTypeCrmCredentials[app.credentialId] = {
|
|
enabled: app.enabled,
|
|
};
|
|
}
|
|
}
|
|
|
|
allCredentials = allCredentials.filter((credential) => {
|
|
if (!credential.type.includes("_crm") && !credential.type.includes("_other_calendar")) {
|
|
return credential;
|
|
}
|
|
|
|
// Backwards compatibility: All CRM apps are triggered for every event type. Unless disabled on the event type
|
|
// Check if the CRM app exists on the event type
|
|
if (eventTypeCrmCredentials[credential.id]) {
|
|
if (eventTypeCrmCredentials[credential.id].enabled) {
|
|
return credential;
|
|
}
|
|
} else {
|
|
// If the CRM app doesn't exist on the event type metadata, check that the credential belongs to the user/team/org and is an old CRM credential
|
|
if (
|
|
credential.type.includes("_other_calendar") &&
|
|
(credential.userId === eventType?.userId ||
|
|
credential.teamId === eventType?.team?.id ||
|
|
credential.teamId === eventType?.team?.parentId ||
|
|
credential.teamId === profile?.organizationId)
|
|
) {
|
|
// If the CRM app doesn't exist on the event type metadata, assume it's an older CRM credential
|
|
return credential;
|
|
}
|
|
}
|
|
});
|
|
|
|
const userWithDwdCredentials = await enrichUserWithDwdCredentialsWithoutOrgId({
|
|
user: { ...user, credentials: allCredentials },
|
|
});
|
|
|
|
return userWithDwdCredentials.credentials;
|
|
};
|