* 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>
443 lines
14 KiB
TypeScript
443 lines
14 KiB
TypeScript
import prismock from "../../../../tests/libs/__mocks__/prisma";
|
|
|
|
import { describe, expect, it, beforeEach } from "vitest";
|
|
|
|
import prisma from "@calcom/prisma";
|
|
|
|
import { SelectedCalendarRepository } from "./selectedCalendar";
|
|
|
|
describe("SelectedCalendarRepository", () => {
|
|
beforeEach(() => {
|
|
prismock.selectedCalendar.deleteMany();
|
|
});
|
|
|
|
describe("create", () => {
|
|
it("should create a selected calendar", async () => {
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.create(data);
|
|
|
|
expect(result).toEqual(expect.objectContaining(data));
|
|
});
|
|
|
|
it("should throw error if we try to create a user-level calendar with same userId_integration_externalId as an existing user-level calendar", async () => {
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null,
|
|
};
|
|
|
|
await SelectedCalendarRepository.create(data);
|
|
|
|
await expect(
|
|
SelectedCalendarRepository.create({
|
|
...data,
|
|
credentialId: 2,
|
|
})
|
|
).rejects.toThrow("Selected calendar already exists");
|
|
});
|
|
|
|
it("should allow creating a user-level calendar with same userId_integration_externalId as an existing event-type level calendar", async () => {
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: 1,
|
|
};
|
|
|
|
await SelectedCalendarRepository.create(data);
|
|
|
|
const userLevelCalendarData = {
|
|
...data,
|
|
eventTypeId: null,
|
|
};
|
|
const created = await SelectedCalendarRepository.create(userLevelCalendarData);
|
|
|
|
expect(created).toEqual(expect.objectContaining(userLevelCalendarData));
|
|
});
|
|
});
|
|
|
|
describe("update", () => {
|
|
it("should update a selected calendar and return it", async () => {
|
|
const calendarToUpdate = await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
});
|
|
|
|
const updatedCalendar = await SelectedCalendarRepository.update({
|
|
where: { userId: 1, externalId: "test@gmail.com" },
|
|
data: { integration: "office365_calendar" },
|
|
});
|
|
|
|
expect(updatedCalendar.id).toBe(calendarToUpdate.id);
|
|
expect(updatedCalendar.integration).toBe("office365_calendar");
|
|
});
|
|
|
|
it("should throw error when trying to update multiple calendars", async () => {
|
|
await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test1@gmail.com",
|
|
credentialId: 1,
|
|
});
|
|
|
|
await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar2",
|
|
externalId: "test1@gmail.com",
|
|
credentialId: 2,
|
|
});
|
|
|
|
await expect(
|
|
SelectedCalendarRepository.update({
|
|
where: { userId: 1, externalId: "test1@gmail.com" },
|
|
data: { integration: "office365_calendar" },
|
|
})
|
|
).rejects.toThrow(
|
|
"Multiple SelectedCalendar records found to update. updateMany should be used instead"
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("delete", () => {
|
|
it("should delete a selected calendar and return it", async () => {
|
|
const calendar = await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
});
|
|
|
|
const deleted = await SelectedCalendarRepository.delete({
|
|
where: {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
},
|
|
});
|
|
|
|
expect(deleted).toEqual(calendar);
|
|
const result = await SelectedCalendarRepository.findFirst({
|
|
where: { id: calendar.id },
|
|
});
|
|
|
|
expect(result).toBeNull();
|
|
});
|
|
|
|
it("should throw error when trying to delete non-existent calendar", async () => {
|
|
await expect(
|
|
SelectedCalendarRepository.delete({
|
|
where: {
|
|
userId: 999,
|
|
integration: "google_calendar",
|
|
externalId: "nonexistent@gmail.com",
|
|
credentialId: 999,
|
|
},
|
|
})
|
|
).rejects.toThrow("SelectedCalendar not found");
|
|
});
|
|
});
|
|
|
|
describe("findUserLevelUniqueOrThrow", () => {
|
|
it("should find user level calendar", async () => {
|
|
const calendar = await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null, // User level calendar
|
|
});
|
|
|
|
const result = await SelectedCalendarRepository.findUserLevelUniqueOrThrow({
|
|
where: { userId: 1, externalId: "test@gmail.com" },
|
|
});
|
|
|
|
expect(result).toEqual(
|
|
expect.objectContaining({
|
|
userId: calendar.userId,
|
|
externalId: calendar.externalId,
|
|
})
|
|
);
|
|
});
|
|
|
|
it("should not find event type level calendar", async () => {
|
|
await SelectedCalendarRepository.create({
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: 1, // Event type level calendar
|
|
});
|
|
|
|
await expect(
|
|
SelectedCalendarRepository.findUserLevelUniqueOrThrow({
|
|
where: { userId: 1, externalId: "test@gmail.com" },
|
|
})
|
|
).rejects.toThrow("SelectedCalendar not found");
|
|
});
|
|
});
|
|
|
|
describe("upsert", () => {
|
|
describe("User Level Calendar", () => {
|
|
const eventTypeId = null;
|
|
it("should update existing calendar as long as a record with same userId_integration_externalId is present for eventTypeId=null", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const updatedData = {
|
|
...initialData,
|
|
credentialId: 2,
|
|
eventTypeId,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(updatedData);
|
|
|
|
expect(result.credentialId).toBe(2);
|
|
expect(existingCalendar.id).toBe(result.id);
|
|
});
|
|
|
|
it("should create new calendar if no record with same userId_integration_externalId is present when eventTypeId=null", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const updatedData = {
|
|
...initialData,
|
|
externalId: "test2@gmail.com",
|
|
credentialId: 2,
|
|
eventTypeId,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(updatedData);
|
|
expect(await prisma.selectedCalendar.count()).toBe(2);
|
|
expect(result).toEqual(expect.objectContaining(updatedData));
|
|
expect(existingCalendar.id).not.toBe(result.id);
|
|
});
|
|
});
|
|
|
|
describe("Event Type Level Calendar", () => {
|
|
const eventTypeId = 101;
|
|
it("should update existing calendar as long as record with same userId_integration_externalId_eventTypeId is present", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const updatedData = {
|
|
...initialData,
|
|
credentialId: 2,
|
|
eventTypeId,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(updatedData);
|
|
|
|
expect(result.credentialId).toBe(2);
|
|
expect(existingCalendar.id).toBe(result.id);
|
|
});
|
|
|
|
it("should create new calendar if no record with same userId_integration_externalId_eventTypeId is present", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const updatedData = {
|
|
...initialData,
|
|
credentialId: 2,
|
|
externalId: "test2@gmail.com",
|
|
eventTypeId,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(updatedData);
|
|
expect(await prisma.selectedCalendar.count()).toBe(2);
|
|
expect(result).toEqual(expect.objectContaining(updatedData));
|
|
expect(existingCalendar.id).not.toBe(result.id);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("Domain Wide Delegation", () => {
|
|
it("should create a selected calendar with domainWideDelegationCredentialId", async () => {
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
domainWideDelegationCredentialId: "dwd-123",
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.create(data);
|
|
|
|
expect(result).toEqual(expect.objectContaining(data));
|
|
});
|
|
|
|
describe("upsert", () => {
|
|
describe("updation", () => {
|
|
it("should update existing record with domainWideDelegationCredentialId if credentialId is -1", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: -1,
|
|
domainWideDelegationCredentialId: "dwd-123",
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).not.toBe(null);
|
|
expect(result.id).toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(null);
|
|
expect(result.domainWideDelegationCredentialId).toBe(data.domainWideDelegationCredentialId);
|
|
});
|
|
|
|
it("should update existing record with credentialId if credentialId is valid(>0) even if domainWideDelegationCredentialId is set", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 2,
|
|
domainWideDelegationCredentialId: "dwd-123",
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).not.toBe(null);
|
|
expect(result.id).toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(data.credentialId);
|
|
expect(result.domainWideDelegationCredentialId).toBeNull();
|
|
});
|
|
});
|
|
|
|
describe("creation", () => {
|
|
it("should create a new record with domainWideDelegationCredentialId if credentialId is -1", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
eventTypeId: null,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "anotheremail@gmail.com",
|
|
credentialId: -1,
|
|
domainWideDelegationCredentialId: "dwd-123",
|
|
};
|
|
|
|
// It will create a new record because of unique constraint violation
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).not.toBe(null);
|
|
expect(result.id).not.toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(null);
|
|
expect(result.domainWideDelegationCredentialId).toBe(data.domainWideDelegationCredentialId);
|
|
});
|
|
});
|
|
|
|
it("shouldnt update existing domainWideDelegationCredentialId if upsert data doesn't have it", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
eventTypeId: null,
|
|
domainWideDelegationCredentialId: "dwd-123",
|
|
credentialId: 1,
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
credentialId: 1,
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(existingCalendar.credentialId);
|
|
expect(result.domainWideDelegationCredentialId).toBe(null);
|
|
});
|
|
|
|
it("shouldnt update domainWideDelegationCredentialId if it is undefined", async () => {
|
|
const initialData = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
eventTypeId: null,
|
|
domainWideDelegationCredentialId: "dwd-123",
|
|
};
|
|
|
|
const existingCalendar = await SelectedCalendarRepository.create(initialData);
|
|
|
|
const data = {
|
|
userId: 1,
|
|
integration: "google_calendar",
|
|
externalId: "test@gmail.com",
|
|
};
|
|
|
|
const result = await SelectedCalendarRepository.upsert(data);
|
|
expect(result.id).toBe(existingCalendar.id);
|
|
expect(result.credentialId).toBe(existingCalendar.credentialId);
|
|
expect(result.domainWideDelegationCredentialId).toBe(
|
|
existingCalendar.domainWideDelegationCredentialId
|
|
);
|
|
});
|
|
});
|
|
});
|
|
});
|