* 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>
209 lines
5.3 KiB
TypeScript
209 lines
5.3 KiB
TypeScript
import prisma from "../../../../../tests/libs/__mocks__/prisma";
|
|
|
|
import {
|
|
createBookingScenario,
|
|
TestData,
|
|
getOrganizer,
|
|
getScenarioData,
|
|
createOrganization,
|
|
createDwdCredential,
|
|
} from "@calcom/web/test/utils/bookingScenario/bookingScenario";
|
|
import { setupAndTeardown } from "@calcom/web/test/utils/bookingScenario/setupAndTeardown";
|
|
|
|
import { describe, it, vi, expect } from "vitest";
|
|
|
|
import { getConnectedCalendars } from "@calcom/core/CalendarManager";
|
|
import { SchedulingType, MembershipRole } from "@calcom/prisma/enums";
|
|
|
|
import { TRPCError } from "@trpc/server";
|
|
|
|
import type { TrpcSessionUser } from "../../trpc";
|
|
import { setDestinationCalendarHandler } from "./setDestinationCalendar.handler";
|
|
|
|
vi.mock("@calcom/core/CalendarManager", () => ({
|
|
getConnectedCalendars: vi.fn(),
|
|
getCalendarCredentials: vi.fn().mockImplementation((creds) => creds),
|
|
}));
|
|
|
|
describe("setDestinationCalendarHandler", () => {
|
|
setupAndTeardown();
|
|
|
|
it("should successfully set destination calendar with DWD credentials", async () => {
|
|
const org = await createOrganization({
|
|
name: "Test Org",
|
|
slug: "testorg",
|
|
});
|
|
|
|
const childTeam = {
|
|
id: 202,
|
|
name: "Team 1",
|
|
slug: "team-1",
|
|
parentId: org.id,
|
|
};
|
|
|
|
const organizer = getOrganizer({
|
|
name: "Organizer",
|
|
email: "organizer@example.com",
|
|
id: 101,
|
|
schedules: [TestData.schedules.IstWorkHours],
|
|
teams: [
|
|
{
|
|
membership: {
|
|
accepted: true,
|
|
role: MembershipRole.ADMIN,
|
|
},
|
|
team: {
|
|
id: org.id,
|
|
name: "Test Org",
|
|
slug: "testorg",
|
|
},
|
|
},
|
|
{
|
|
membership: {
|
|
accepted: true,
|
|
role: MembershipRole.ADMIN,
|
|
},
|
|
team: {
|
|
id: childTeam.id,
|
|
name: "Team 1",
|
|
slug: "team-1",
|
|
parentId: org.id,
|
|
},
|
|
},
|
|
],
|
|
});
|
|
|
|
const dwd = await createDwdCredential(org.id);
|
|
|
|
const dwdCredentialId = dwd.id;
|
|
const testExternalId = "TEST@group.calendar.google.com";
|
|
|
|
// Mock the getConnectedCalendars response
|
|
(getConnectedCalendars as jest.Mock).mockResolvedValue({
|
|
connectedCalendars: [
|
|
{
|
|
calendars: [
|
|
{
|
|
externalId: organizer.email,
|
|
integration: "google_calendar",
|
|
readOnly: false,
|
|
primary: true,
|
|
email: organizer.email,
|
|
credentialId: -1,
|
|
domainWideDelegationCredentialId: dwdCredentialId,
|
|
},
|
|
{
|
|
externalId: testExternalId,
|
|
integration: "google_calendar",
|
|
readOnly: false,
|
|
primary: null,
|
|
email: organizer.email,
|
|
credentialId: -1,
|
|
domainWideDelegationCredentialId: dwdCredentialId,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
});
|
|
|
|
await createBookingScenario(
|
|
getScenarioData(
|
|
{
|
|
organizer,
|
|
eventTypes: [
|
|
{
|
|
id: 1,
|
|
teamId: childTeam.id,
|
|
schedulingType: SchedulingType.ROUND_ROBIN,
|
|
length: 30,
|
|
hosts: [
|
|
{
|
|
userId: 101,
|
|
isFixed: false,
|
|
},
|
|
],
|
|
},
|
|
],
|
|
selectedCalendars: [
|
|
{
|
|
integration: "google_calendar",
|
|
externalId: testExternalId,
|
|
credentialId: null,
|
|
domainWideDelegationCredentialId: dwdCredentialId,
|
|
},
|
|
],
|
|
},
|
|
org
|
|
)
|
|
);
|
|
|
|
const ctx = {
|
|
user: {
|
|
id: organizer.id,
|
|
email: organizer.email,
|
|
selectedCalendars: [
|
|
{
|
|
integration: "google_calendar",
|
|
externalId: testExternalId,
|
|
credentialId: null,
|
|
domainWideDelegationCredentialId: dwdCredentialId,
|
|
},
|
|
],
|
|
} as NonNullable<TrpcSessionUser>,
|
|
};
|
|
|
|
await setDestinationCalendarHandler({
|
|
ctx,
|
|
input: {
|
|
integration: "google_calendar",
|
|
externalId: testExternalId,
|
|
},
|
|
});
|
|
|
|
// Verify the destination calendar was set correctly
|
|
const destinationCalendar = await prisma.destinationCalendar.findFirst({
|
|
where: {
|
|
userId: organizer.id,
|
|
},
|
|
});
|
|
|
|
expect(destinationCalendar).toEqual(
|
|
expect.objectContaining({
|
|
integration: "google_calendar",
|
|
externalId: testExternalId,
|
|
credentialId: null,
|
|
domainWideDelegationCredentialId: dwdCredentialId,
|
|
})
|
|
);
|
|
});
|
|
|
|
it("should throw error when calendar is not found", async () => {
|
|
const organizer = getOrganizer({
|
|
name: "Organizer",
|
|
email: "organizer@example.com",
|
|
id: 101,
|
|
});
|
|
|
|
const ctx = {
|
|
user: {
|
|
id: organizer.id,
|
|
email: organizer.email,
|
|
selectedCalendars: [],
|
|
} as NonNullable<TrpcSessionUser>,
|
|
};
|
|
|
|
await expect(
|
|
setDestinationCalendarHandler({
|
|
ctx,
|
|
input: {
|
|
integration: "google_calendar",
|
|
externalId: "non-existent-calendar",
|
|
eventTypeId: null,
|
|
},
|
|
})
|
|
).rejects.toThrow(
|
|
new TRPCError({ code: "BAD_REQUEST", message: "Could not find calendar non-existent-calendar" })
|
|
);
|
|
});
|
|
});
|