* 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]>
140 lines
4.8 KiB
TypeScript
140 lines
4.8 KiB
TypeScript
import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
|
|
import { getAppFromSlug } from "@calcom/app-store/utils";
|
|
import getInstallCountPerApp from "@calcom/lib/apps/getInstallCountPerApp";
|
|
import { getAllDwdCredentialsForUser } from "@calcom/lib/domainWideDelegation/server";
|
|
import type { UserAdminTeams } from "@calcom/lib/server/repository/user";
|
|
import prisma, { safeAppSelect, safeCredentialSelect } from "@calcom/prisma";
|
|
import { userMetadata } from "@calcom/prisma/zod-utils";
|
|
import type { AppFrontendPayload as App } from "@calcom/types/App";
|
|
import type { CredentialFrontendPayload as Credential } from "@calcom/types/Credential";
|
|
|
|
export type TDependencyData = {
|
|
name?: string;
|
|
installed?: boolean;
|
|
}[];
|
|
|
|
/**
|
|
* Get App metadata either using dirName or slug
|
|
*/
|
|
export async function getAppWithMetadata(app: { dirName: string } | { slug: string }) {
|
|
let appMetadata: App | null;
|
|
|
|
if ("dirName" in app) {
|
|
appMetadata = appStoreMetadata[app.dirName as keyof typeof appStoreMetadata] as App;
|
|
} else {
|
|
const foundEntry = Object.entries(appStoreMetadata).find(([, meta]) => {
|
|
return meta.slug === app.slug;
|
|
});
|
|
if (!foundEntry) return null;
|
|
appMetadata = foundEntry[1] as App;
|
|
}
|
|
|
|
if (!appMetadata) return null;
|
|
// Let's not leak api keys to the front end
|
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
const { key, ...metadata } = appMetadata;
|
|
return metadata;
|
|
}
|
|
|
|
/** Mainly to use in listings for the frontend, use in getStaticProps or getServerSideProps */
|
|
export async function getAppRegistry() {
|
|
const dbApps = await prisma.app.findMany({
|
|
where: { enabled: true },
|
|
select: { dirName: true, slug: true, categories: true, enabled: true, createdAt: true },
|
|
});
|
|
const apps = [] as App[];
|
|
const installCountPerApp = await getInstallCountPerApp();
|
|
for await (const dbapp of dbApps) {
|
|
const app = await getAppWithMetadata(dbapp);
|
|
if (!app) continue;
|
|
// Skip if app isn't installed
|
|
/* This is now handled from the DB */
|
|
// if (!app.installed) return apps;
|
|
app.createdAt = dbapp.createdAt.toISOString();
|
|
apps.push({
|
|
...app,
|
|
category: app.category || "other",
|
|
installed:
|
|
true /* All apps from DB are considered installed by default. @TODO: Add and filter our by `enabled` property */,
|
|
installCount: installCountPerApp[dbapp.slug] || 0,
|
|
});
|
|
}
|
|
return apps;
|
|
}
|
|
|
|
export async function getAppRegistryWithCredentials(userId: number, userAdminTeams: UserAdminTeams = []) {
|
|
// Get teamIds to grab existing credentials
|
|
|
|
const dbApps = await prisma.app.findMany({
|
|
where: { enabled: true },
|
|
select: {
|
|
...safeAppSelect,
|
|
credentials: {
|
|
where: { OR: [{ userId }, { teamId: { in: userAdminTeams } }] },
|
|
select: safeCredentialSelect,
|
|
},
|
|
},
|
|
orderBy: {
|
|
credentials: {
|
|
_count: "desc",
|
|
},
|
|
},
|
|
});
|
|
|
|
const user = await prisma.user.findUnique({
|
|
where: {
|
|
id: userId,
|
|
},
|
|
select: {
|
|
email: true,
|
|
id: true,
|
|
metadata: true,
|
|
},
|
|
});
|
|
|
|
const dwdCredentials = user
|
|
? await getAllDwdCredentialsForUser({ user: { id: userId, email: user.email } })
|
|
: [];
|
|
|
|
const usersDefaultApp = userMetadata.parse(user?.metadata)?.defaultConferencingApp?.appSlug;
|
|
const apps = [] as (App & {
|
|
credentials: Credential[];
|
|
isDefault?: boolean;
|
|
})[];
|
|
const installCountPerApp = await getInstallCountPerApp();
|
|
for await (const dbapp of dbApps) {
|
|
const dwdCredentialsForApp = dwdCredentials.filter((credential) => credential.appId === dbapp.slug);
|
|
const nonDwdCredentialsForApp = dbapp.credentials;
|
|
const allCredentials = [...dwdCredentialsForApp, ...nonDwdCredentialsForApp];
|
|
const app = await getAppWithMetadata(dbapp);
|
|
if (!app) continue;
|
|
// Skip if app isn't installed
|
|
/* This is now handled from the DB */
|
|
// if (!app.installed) return apps;
|
|
app.createdAt = dbapp.createdAt.toISOString();
|
|
let dependencyData: TDependencyData = [];
|
|
if (app.dependencies) {
|
|
dependencyData = app.dependencies.map((dependency) => {
|
|
const dependencyInstalled = dbApps.some(
|
|
(dbAppIterator) => dbAppIterator.credentials.length && dbAppIterator.slug === dependency
|
|
);
|
|
// If the app marked as dependency is simply deleted from the codebase, we can have the situation where App is marked installed in DB but we couldn't get the app.
|
|
const dependencyName = getAppFromSlug(dependency)?.name;
|
|
return { name: dependencyName, installed: dependencyInstalled };
|
|
});
|
|
}
|
|
|
|
apps.push({
|
|
...app,
|
|
categories: dbapp.categories,
|
|
credentials: allCredentials,
|
|
installed: true,
|
|
installCount: installCountPerApp[dbapp.slug] || 0,
|
|
isDefault: usersDefaultApp === dbapp.slug,
|
|
...(app.dependencies && { dependencyData }),
|
|
});
|
|
}
|
|
|
|
return apps;
|
|
}
|