* 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>
172 lines
4.6 KiB
TypeScript
172 lines
4.6 KiB
TypeScript
import type { Prisma } from "@prisma/client";
|
|
import type { TFunction } from "next-i18next";
|
|
|
|
import { defaultVideoAppCategories } from "@calcom/app-store/utils";
|
|
import getEnabledAppsFromCredentials from "@calcom/lib/apps/getEnabledAppsFromCredentials";
|
|
import {
|
|
buildNonDwdCredentials,
|
|
enrichUserWithDwdConferencingCredentialsWithoutOrgId,
|
|
} from "@calcom/lib/domainWideDelegation/server";
|
|
import { prisma } from "@calcom/prisma";
|
|
import { AppCategories } from "@calcom/prisma/enums";
|
|
import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";
|
|
|
|
import { defaultLocations } from "./locations";
|
|
|
|
export async function getLocationGroupedOptions(
|
|
userOrTeamId: { userId: number } | { teamId: number },
|
|
t: TFunction
|
|
) {
|
|
const apps: Record<
|
|
string,
|
|
{
|
|
label: string;
|
|
value: string;
|
|
disabled?: boolean;
|
|
icon?: string;
|
|
slug?: string;
|
|
credentialId?: number;
|
|
}[]
|
|
> = {};
|
|
|
|
// don't default to {}, when you do TS no longer determines the right types.
|
|
let idToSearchObject: Prisma.CredentialWhereInput;
|
|
let user = null;
|
|
if ("teamId" in userOrTeamId) {
|
|
const teamId = userOrTeamId.teamId;
|
|
// See if the team event belongs to an org
|
|
const org = await prisma.team.findFirst({
|
|
where: {
|
|
children: {
|
|
some: {
|
|
id: teamId,
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
if (org) {
|
|
idToSearchObject = {
|
|
teamId: {
|
|
in: [teamId, org.id],
|
|
},
|
|
};
|
|
} else {
|
|
idToSearchObject = { teamId };
|
|
}
|
|
} else {
|
|
idToSearchObject = { userId: userOrTeamId.userId };
|
|
user = await prisma.user.findUnique({
|
|
where: {
|
|
id: userOrTeamId.userId,
|
|
},
|
|
});
|
|
}
|
|
|
|
const nonDwdCredentials = await prisma.credential.findMany({
|
|
where: {
|
|
...idToSearchObject,
|
|
app: {
|
|
categories: {
|
|
hasSome: defaultVideoAppCategories,
|
|
},
|
|
},
|
|
},
|
|
select: {
|
|
...credentialForCalendarServiceSelect,
|
|
team: {
|
|
select: {
|
|
name: true,
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
let credentials;
|
|
if (user) {
|
|
// We only add dwd credentials if the request for location options is for a user because DWD Credential is applicable to Users only.
|
|
const { credentials: allCredentials } = await enrichUserWithDwdConferencingCredentialsWithoutOrgId({
|
|
user: {
|
|
...user,
|
|
credentials: nonDwdCredentials,
|
|
},
|
|
});
|
|
credentials = allCredentials;
|
|
} else {
|
|
// TODO: We can avoid calling buildNonDwdCredentials here by moving the above prisma query to the repository and doing it there
|
|
credentials = buildNonDwdCredentials(nonDwdCredentials);
|
|
}
|
|
|
|
const integrations = await getEnabledAppsFromCredentials(credentials, { filterOnCredentials: true });
|
|
|
|
integrations.forEach((app) => {
|
|
// All apps that are labeled as a locationOption are video apps.
|
|
if (app.locationOption) {
|
|
// All apps that are labeled as a locationOption are video apps. Extract the secondary category if available
|
|
let groupByCategory =
|
|
app.categories.length >= 2
|
|
? app.categories.find((groupByCategory) => !defaultVideoAppCategories.includes(groupByCategory))
|
|
: app.categories[0] || app.category;
|
|
if (!groupByCategory) groupByCategory = AppCategories.conferencing;
|
|
|
|
for (const { teamName } of app.credentials.map((credential) => ({
|
|
teamName: credential.team?.name,
|
|
}))) {
|
|
const label = `${app.locationOption.label} ${teamName ? `(${teamName})` : ""}`;
|
|
const option = {
|
|
...app.locationOption,
|
|
label,
|
|
icon: app.logo,
|
|
slug: app.slug,
|
|
...(app.credential
|
|
? { credentialId: app.credential.id, teamName: app.credential.team?.name ?? null }
|
|
: {}),
|
|
};
|
|
if (apps[groupByCategory]) {
|
|
apps[groupByCategory] = [...apps[groupByCategory], option];
|
|
} else {
|
|
apps[groupByCategory] = [option];
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
defaultLocations.forEach((l) => {
|
|
const category = l.category;
|
|
if (apps[category]) {
|
|
apps[category] = [
|
|
...apps[category],
|
|
{
|
|
label: l.label,
|
|
value: l.type,
|
|
icon: l.iconUrl,
|
|
},
|
|
];
|
|
} else {
|
|
apps[category] = [
|
|
{
|
|
label: l.label,
|
|
value: l.type,
|
|
icon: l.iconUrl,
|
|
},
|
|
];
|
|
}
|
|
});
|
|
const locations = [];
|
|
|
|
// Translating labels and pushing into array
|
|
for (const category in apps) {
|
|
const tmp = {
|
|
label: t(category),
|
|
options: apps[category].map((l) => ({
|
|
...l,
|
|
label: t(l.label),
|
|
})),
|
|
};
|
|
|
|
locations.push(tmp);
|
|
}
|
|
|
|
return locations;
|
|
}
|