* 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>
205 lines
6.0 KiB
TypeScript
205 lines
6.0 KiB
TypeScript
import logger from "@calcom/lib/logger";
|
|
import { findTeamMembersMatchingAttributeLogic } from "@calcom/lib/raqb/findTeamMembersMatchingAttributeLogic";
|
|
import type { AttributesQueryValue } from "@calcom/lib/raqb/types";
|
|
import { safeStringify } from "@calcom/lib/safeStringify";
|
|
import { SchedulingType } from "@calcom/prisma/enums";
|
|
import type { CredentialPayload } from "@calcom/types/Credential";
|
|
|
|
import { enrichHostsWithDwdCredentials } from "../domainWideDelegation/server";
|
|
import getOrgIdFromMemberOrTeamId from "../getOrgIdFromMemberOrTeamId";
|
|
|
|
const log = logger.getSubLogger({ prefix: ["[getRoutedUsers]"] });
|
|
|
|
export const getRoutedUsersWithContactOwnerAndFixedUsers = <
|
|
T extends { id: number; isFixed?: boolean; email: string }
|
|
>({
|
|
routedTeamMemberIds,
|
|
users,
|
|
contactOwnerEmail,
|
|
}: {
|
|
routedTeamMemberIds: number[] | null;
|
|
users: T[];
|
|
contactOwnerEmail: string | null;
|
|
}) => {
|
|
// We don't want to enter a scenario where we have no team members to be booked
|
|
// So, let's just fallback to regular flow if no routedTeamMemberIds are provided
|
|
if (!routedTeamMemberIds || !routedTeamMemberIds.length) {
|
|
return users;
|
|
}
|
|
|
|
log.debug(
|
|
"filtering users as per routedTeamMemberIds",
|
|
safeStringify({ routedTeamMemberIds, contactOwnerEmail })
|
|
);
|
|
return users.filter(
|
|
(user) => routedTeamMemberIds.includes(user.id) || user.isFixed || user.email === contactOwnerEmail
|
|
);
|
|
};
|
|
|
|
async function findMatchingTeamMembersIdsForEventRRSegment(eventType: EventType) {
|
|
if (!eventType) {
|
|
return null;
|
|
}
|
|
|
|
const isSegmentationDisabled = !eventType.assignAllTeamMembers || !eventType.assignRRMembersUsingSegment;
|
|
|
|
if (isSegmentationDisabled) {
|
|
return null;
|
|
}
|
|
|
|
if (!eventType.team || !eventType.team.parentId) {
|
|
return null;
|
|
}
|
|
|
|
const { teamMembersMatchingAttributeLogic } = await findTeamMembersMatchingAttributeLogic({
|
|
attributesQueryValue: eventType.rrSegmentQueryValue ?? null,
|
|
teamId: eventType.team.id,
|
|
orgId: eventType.team.parentId,
|
|
});
|
|
if (!teamMembersMatchingAttributeLogic) {
|
|
return teamMembersMatchingAttributeLogic;
|
|
}
|
|
return teamMembersMatchingAttributeLogic.map((member) => member.userId);
|
|
}
|
|
|
|
type BaseUser = {
|
|
id: number;
|
|
email: string;
|
|
};
|
|
|
|
type BaseHost<User extends BaseUser> = {
|
|
isFixed: boolean;
|
|
createdAt: Date;
|
|
priority?: number | null;
|
|
weight?: number | null;
|
|
weightAdjustment?: number | null;
|
|
user: User;
|
|
};
|
|
|
|
export type EventType = {
|
|
assignAllTeamMembers: boolean;
|
|
assignRRMembersUsingSegment: boolean;
|
|
rrSegmentQueryValue: AttributesQueryValue | null | undefined;
|
|
team: { id: number; parentId: number | null } | null;
|
|
};
|
|
|
|
export function getNormalizedHosts<User extends BaseUser, Host extends BaseHost<User>>({
|
|
eventType,
|
|
}: {
|
|
eventType: {
|
|
schedulingType: SchedulingType | null;
|
|
hosts?: Host[];
|
|
users: User[];
|
|
};
|
|
}) {
|
|
if (eventType.hosts?.length && eventType.schedulingType) {
|
|
return {
|
|
hosts: eventType.hosts.map((host) => ({
|
|
isFixed: host.isFixed,
|
|
user: host.user,
|
|
priority: host.priority,
|
|
weight: host.weight,
|
|
createdAt: host.createdAt,
|
|
})),
|
|
fallbackHosts: null,
|
|
};
|
|
} else {
|
|
return {
|
|
hosts: null,
|
|
fallbackHosts: eventType.users.map((user) => {
|
|
return {
|
|
isFixed: !eventType.schedulingType || eventType.schedulingType === SchedulingType.COLLECTIVE,
|
|
email: user.email,
|
|
user: user,
|
|
createdAt: null,
|
|
};
|
|
}),
|
|
};
|
|
}
|
|
}
|
|
type BaseUserWithCredentialPayload = BaseUser & { credentials: CredentialPayload[] };
|
|
export async function getNormalizedHostsWithDwdCredentials<
|
|
User extends BaseUserWithCredentialPayload,
|
|
Host extends BaseHost<User>
|
|
>({
|
|
eventType,
|
|
}: {
|
|
eventType: {
|
|
schedulingType: SchedulingType | null;
|
|
hosts?: Host[];
|
|
users: User[];
|
|
teamId?: number;
|
|
};
|
|
}) {
|
|
if (eventType.hosts?.length && eventType.schedulingType) {
|
|
const hostsWithoutDwd = eventType.hosts.map((host) => ({
|
|
isFixed: host.isFixed,
|
|
user: host.user,
|
|
priority: host.priority,
|
|
weight: host.weight,
|
|
createdAt: host.createdAt,
|
|
}));
|
|
const firstHost = hostsWithoutDwd[0];
|
|
const firstUserOrgId = await getOrgIdFromMemberOrTeamId({
|
|
memberId: firstHost?.user?.id ?? null,
|
|
teamId: eventType.teamId,
|
|
});
|
|
const hostsEnrichedWithDwd = await enrichHostsWithDwdCredentials({
|
|
orgId: firstUserOrgId ?? null,
|
|
hosts: hostsWithoutDwd ?? null,
|
|
});
|
|
return {
|
|
hosts: hostsEnrichedWithDwd,
|
|
fallbackHosts: null,
|
|
};
|
|
} else {
|
|
const hostsWithoutDwd = eventType.users.map((user) => {
|
|
return {
|
|
isFixed: !eventType.schedulingType || eventType.schedulingType === SchedulingType.COLLECTIVE,
|
|
email: user.email,
|
|
user: user,
|
|
createdAt: null,
|
|
};
|
|
});
|
|
const firstHost = hostsWithoutDwd[0];
|
|
const firstUserOrgId = await getOrgIdFromMemberOrTeamId({
|
|
memberId: firstHost?.user?.id ?? null,
|
|
teamId: eventType.teamId,
|
|
});
|
|
const hostsEnrichedWithDwd = await enrichHostsWithDwdCredentials({
|
|
orgId: firstUserOrgId ?? null,
|
|
hosts: hostsWithoutDwd ?? null,
|
|
});
|
|
return {
|
|
hosts: null,
|
|
fallbackHosts: hostsEnrichedWithDwd,
|
|
};
|
|
}
|
|
}
|
|
|
|
// We don't allow fixed hosts when segment matching is enabled
|
|
// If this ever changes, we need to update this function and return fixed hosts
|
|
export async function findMatchingHostsWithEventSegment<User extends BaseUser>({
|
|
eventType,
|
|
hosts,
|
|
}: {
|
|
eventType: EventType;
|
|
hosts: {
|
|
isFixed: boolean;
|
|
user: User;
|
|
priority?: number | null;
|
|
weight?: number | null;
|
|
createdAt: Date | null;
|
|
}[];
|
|
}) {
|
|
const matchingRRTeamMembers = await findMatchingTeamMembersIdsForEventRRSegment({
|
|
...eventType,
|
|
rrSegmentQueryValue: eventType.rrSegmentQueryValue ?? null,
|
|
});
|
|
const segmentedRoundRobinHosts = hosts.filter((host) => {
|
|
if (!matchingRRTeamMembers) return true;
|
|
return matchingRRTeamMembers.includes(host.user.id);
|
|
});
|
|
return segmentedRoundRobinHosts;
|
|
}
|