* 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>
241 lines
7.9 KiB
TypeScript
241 lines
7.9 KiB
TypeScript
import appStore from "@calcom/app-store";
|
|
import type { TDependencyData } from "@calcom/app-store/_appRegistry";
|
|
import type { CredentialOwner } from "@calcom/app-store/types";
|
|
import { getAppFromSlug } from "@calcom/app-store/utils";
|
|
import getEnabledAppsFromCredentials from "@calcom/lib/apps/getEnabledAppsFromCredentials";
|
|
import getInstallCountPerApp from "@calcom/lib/apps/getInstallCountPerApp";
|
|
import { getUsersCredentials } from "@calcom/lib/server/getUsersCredentials";
|
|
import type { PrismaClient } from "@calcom/prisma";
|
|
import type { User } from "@calcom/prisma/client";
|
|
import { MembershipRole } from "@calcom/prisma/enums";
|
|
import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
|
|
import type { TeamQuery } from "@calcom/trpc/server/routers/loggedInViewer/integrations.handler";
|
|
import type { TIntegrationsInputSchema } from "@calcom/trpc/server/routers/loggedInViewer/integrations.schema";
|
|
import type { PaymentApp } from "@calcom/types/PaymentService";
|
|
|
|
import { buildNonDwdCredentials } from "./domainWideDelegation/clientAndServer";
|
|
|
|
export type ConnectedApps = Awaited<ReturnType<typeof getConnectedApps>>;
|
|
|
|
export async function getConnectedApps({
|
|
user,
|
|
prisma,
|
|
input,
|
|
}: {
|
|
user: Pick<User, "id" | "name" | "avatarUrl" | "email"> & { avatar?: string };
|
|
prisma: PrismaClient;
|
|
input: TIntegrationsInputSchema;
|
|
}) {
|
|
const {
|
|
variant,
|
|
exclude,
|
|
onlyInstalled,
|
|
includeTeamInstalledApps,
|
|
extendsFeature,
|
|
teamId,
|
|
sortByMostPopular,
|
|
sortByInstalledFirst,
|
|
appId,
|
|
} = input;
|
|
let credentials = await getUsersCredentials(user);
|
|
let userTeams: TeamQuery[] = [];
|
|
|
|
if (includeTeamInstalledApps || teamId) {
|
|
const teamsQuery = await prisma.team.findMany({
|
|
where: {
|
|
members: {
|
|
some: {
|
|
userId: user.id,
|
|
accepted: true,
|
|
},
|
|
},
|
|
},
|
|
select: {
|
|
id: true,
|
|
credentials: {
|
|
select: credentialForCalendarServiceSelect,
|
|
},
|
|
name: true,
|
|
logoUrl: true,
|
|
members: {
|
|
where: {
|
|
userId: user.id,
|
|
},
|
|
select: {
|
|
role: true,
|
|
},
|
|
},
|
|
parent: {
|
|
select: {
|
|
id: true,
|
|
credentials: {
|
|
select: credentialForCalendarServiceSelect,
|
|
},
|
|
name: true,
|
|
logoUrl: true,
|
|
members: {
|
|
where: {
|
|
userId: user.id,
|
|
},
|
|
select: {
|
|
role: true,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
});
|
|
// If a team is a part of an org then include those apps
|
|
// Don't want to iterate over these parent teams
|
|
const filteredTeams: TeamQuery[] = [];
|
|
const parentTeams: TeamQuery[] = [];
|
|
// Only loop and grab parent teams if a teamId was given. If not then all teams will be queried
|
|
if (teamId) {
|
|
teamsQuery.forEach((team) => {
|
|
if (team?.parent) {
|
|
const { parent, ...filteredTeam } = team;
|
|
filteredTeams.push(filteredTeam);
|
|
// Only add parent team if it's not already in teamsQuery
|
|
if (!teamsQuery.some((t) => t.id === parent.id)) {
|
|
parentTeams.push(parent);
|
|
}
|
|
}
|
|
});
|
|
}
|
|
|
|
userTeams = [...teamsQuery, ...parentTeams];
|
|
|
|
const teamAppCredentials = userTeams.flatMap((teamApp) => {
|
|
return teamApp.credentials ? buildNonDwdCredentials(teamApp.credentials.flat()) : [];
|
|
});
|
|
if (!includeTeamInstalledApps || teamId) {
|
|
credentials = teamAppCredentials;
|
|
} else {
|
|
credentials = credentials.concat(teamAppCredentials);
|
|
}
|
|
}
|
|
|
|
const enabledApps = await getEnabledAppsFromCredentials(credentials, {
|
|
filterOnCredentials: onlyInstalled,
|
|
...(appId ? { where: { slug: appId } } : {}),
|
|
});
|
|
//TODO: Refactor this to pick up only needed fields and prevent more leaking
|
|
let apps = await Promise.all(
|
|
enabledApps.map(async ({ credentials: _, credential, key: _2 /* don't leak to frontend */, ...app }) => {
|
|
const userCredentialIds = credentials.filter((c) => c.appId === app.slug && !c.teamId).map((c) => c.id);
|
|
const invalidCredentialIds = credentials
|
|
.filter((c) => c.appId === app.slug && c.invalid)
|
|
.map((c) => c.id);
|
|
const teams = await Promise.all(
|
|
credentials
|
|
.filter((c) => c.appId === app.slug && c.teamId)
|
|
.map(async (c) => {
|
|
const team = userTeams.find((team) => team.id === c.teamId);
|
|
if (!team) {
|
|
return null;
|
|
}
|
|
return {
|
|
teamId: team.id,
|
|
name: team.name,
|
|
logoUrl: team.logoUrl,
|
|
credentialId: c.id,
|
|
isAdmin:
|
|
team.members[0].role === MembershipRole.ADMIN ||
|
|
team.members[0].role === MembershipRole.OWNER,
|
|
};
|
|
})
|
|
);
|
|
// type infer as CredentialOwner
|
|
const credentialOwner: CredentialOwner = {
|
|
name: user.name,
|
|
avatar: user?.avatar ?? user?.avatarUrl,
|
|
};
|
|
|
|
// We need to know if app is payment type
|
|
// undefined it means that app don't require app/setup/page
|
|
let isSetupAlready = undefined;
|
|
if (credential && app.categories.includes("payment")) {
|
|
const paymentApp = (await appStore[app.dirName as keyof typeof appStore]?.()) as PaymentApp | null;
|
|
if (paymentApp && "lib" in paymentApp && paymentApp?.lib && "PaymentService" in paymentApp?.lib) {
|
|
const PaymentService = paymentApp.lib.PaymentService;
|
|
const paymentInstance = new PaymentService(credential);
|
|
isSetupAlready = paymentInstance.isSetupAlready();
|
|
}
|
|
}
|
|
|
|
let dependencyData: TDependencyData = [];
|
|
if (app.dependencies?.length) {
|
|
dependencyData = app.dependencies.map((dependency) => {
|
|
const dependencyInstalled = enabledApps.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 };
|
|
});
|
|
}
|
|
|
|
return {
|
|
...app,
|
|
...(teams.length && {
|
|
credentialOwner,
|
|
}),
|
|
userCredentialIds,
|
|
invalidCredentialIds,
|
|
teams,
|
|
isInstalled: !!userCredentialIds.length || !!teams.length || app.isGlobal,
|
|
isSetupAlready,
|
|
...(app.dependencies && { dependencyData }),
|
|
};
|
|
})
|
|
);
|
|
|
|
if (variant) {
|
|
// `flatMap()` these work like `.filter()` but infers the types correctly
|
|
apps = apps
|
|
// variant check
|
|
.flatMap((item) => (item.variant.startsWith(variant) ? [item] : []));
|
|
}
|
|
|
|
if (exclude) {
|
|
// exclusion filter
|
|
apps = apps.filter((item) => (exclude ? !exclude.includes(item.variant) : true));
|
|
}
|
|
|
|
if (onlyInstalled) {
|
|
apps = apps.flatMap((item) =>
|
|
item.userCredentialIds.length > 0 || item.teams.length || item.isGlobal ? [item] : []
|
|
);
|
|
}
|
|
|
|
if (extendsFeature) {
|
|
apps = apps
|
|
.filter((app) => app.extendsFeature?.includes(extendsFeature))
|
|
.map((app) => ({
|
|
...app,
|
|
isInstalled: !!app.userCredentialIds?.length || !!app.teams?.length || app.isGlobal,
|
|
}));
|
|
}
|
|
|
|
if (sortByMostPopular) {
|
|
const installCountPerApp = await getInstallCountPerApp();
|
|
|
|
// sort the apps array by the most popular apps
|
|
apps.sort((a, b) => {
|
|
const aCount = installCountPerApp[a.slug] || 0;
|
|
const bCount = installCountPerApp[b.slug] || 0;
|
|
return bCount - aCount;
|
|
});
|
|
}
|
|
|
|
if (sortByInstalledFirst) {
|
|
apps.sort((a, b) => {
|
|
return (a.isInstalled ? 0 : 1) - (b.isInstalled ? 0 : 1);
|
|
});
|
|
}
|
|
|
|
return {
|
|
items: apps,
|
|
};
|
|
}
|