* perf: implement quick app store loading optimizations - Add conditional app store imports in videoClient and handlePayment - Implement lazy calendar manager pattern in CalendarManager - Enhance createCachedImport with better concurrency handling - Create calendar-only registry for common calendar operations - Add performance instrumentation for debugging These optimizations reduce initial app store loading time by avoiding module-level imports and creating smaller, focused registries for calendar operations. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: revert getCalendar to use appStore for proper test mocking - Reverted getCalendar.ts to use main appStore instead of calendarStore - This ensures test mocking system works properly with existing appStoreMock - Fixes unit test failures where Google Calendar references were getting null values - All collective scheduling tests now pass Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * perf: implement CalendarServiceMap for optimized calendar loading - Add CalendarServiceMap generation following CrmServiceMap pattern - Update getCalendar.ts to use generated calendar service map - Remove manual calendar-registry.ts in favor of auto-generated approach - Reduces calendar initialization from loading 48+ apps to ~10 calendar apps Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update test mocks for CalendarServiceMap compatibility - Add missing SelectedCalendar fields (createdAt, updatedAt, lastErrorAt, watchAttempts, etc.) - Fix CredentialPayload type errors by adding user.email and delegationCredentialId - Mock CalendarServiceMap to use vi.importActual for real calendar services - Ensure calendar service tests work with new lazy loading approach Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: resolve CalendarServiceMap test compatibility issues - Update getCalendarsEvents.test.ts mocks to work with CalendarServiceMap dynamic imports - Add missing SelectedCalendar fields (createdAt, updatedAt, lastErrorAt, watchAttempts, etc.) - Fix CredentialPayload type errors by adding user.email and delegationCredentialId - Use type assertion in getCalendar.ts to resolve credential type conflicts - Ensure calendar service tests work with new lazy loading approach Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update test mocking for CalendarServiceMap compatibility - Add comprehensive vi.mock for calendar.services.generated in delegation-credential tests - Mock GoogleCalendarService and Office365CalendarService with proper return values - Update all test files to use await with mockCalendarToHaveNoBusySlots - Ensure calendar events return expected meetingId, meetingPassword, meetingUrl values - Fix async/await compatibility issues in booking scenario test utilities Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: resolve TypeScript errors in CalendarServiceMap mocking - Extract CalendarServiceMap promise to variable to fix 'always true' condition - Ensure vi.mocked is called on Promise type for proper mockResolvedValue access - Add await keywords to calendar mock calls in test files - Maintain existing functionality while making code type-safe Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Remove Exchange 2013 and 2016 * Mock Exchange in all tests * Fix tests * Remove exchange 2013 and 2016 from app store index * Fix merge error * Await when getting calendar service * Fix selectedSlot test * Add missing variable * Update openapi.json * Updated CalendarService imports * try again * WIP migrate calendar apps to ES6 * Revert "WIP migrate calendar apps to ES6" This reverts commit 15bf2c83305e82050779d0bca3380fa9573db1e0. * Revert changes back to e23991024a5a455c14aa05f100a5b56288db343a This reverts all calendar service changes that were causing circular dependency issues during builds and E2E tests. * Remove circular dependency for location constants * Update yarn.lock with removed package * Add empty map when running E2E * Type fies * Fix merge conflict * Remove logging statements * Throw error and reset state if failing to load app * Revert "Remove Exchange 2013 and 2016" This reverts commit fedaf6346bd9e4c63337276d5a6f9e8c3943056c. * Re-introduce exchange{2013,2016} Revert the removal in app-store/index.ts also. * Trying to fix tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com>
785 lines
22 KiB
TypeScript
785 lines
22 KiB
TypeScript
import type { SelectedCalendar } from "@prisma/client";
|
|
import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
|
|
|
|
import GoogleCalendarService from "@calcom/app-store/googlecalendar/lib/CalendarService";
|
|
import OfficeCalendarService from "@calcom/app-store/office365calendar/lib/CalendarService";
|
|
import logger from "@calcom/lib/logger";
|
|
import type { EventBusyDate } from "@calcom/types/Calendar";
|
|
import type { CredentialForCalendarService, CredentialPayload } from "@calcom/types/Credential";
|
|
|
|
import { symmetricDecrypt } from "./crypto";
|
|
import getCalendarsEvents, {
|
|
getCalendarsEventsWithTimezones,
|
|
filterSelectedCalendarsForCredential,
|
|
} from "./getCalendarsEvents";
|
|
|
|
vi.mock("./crypto", () => ({
|
|
symmetricDecrypt: vi.fn(),
|
|
}));
|
|
|
|
const mockedSymmetricDecrypt = vi.mocked(symmetricDecrypt);
|
|
|
|
vi.mock("@calcom/app-store/calendar.services.generated", () => {
|
|
class MockGoogleCalendarService {
|
|
constructor(credential: any) {
|
|
this.credential = credential;
|
|
}
|
|
|
|
getCredentialId() {
|
|
return this.credential.id;
|
|
}
|
|
|
|
async createEvent() {
|
|
return {};
|
|
}
|
|
|
|
async updateEvent() {
|
|
return {};
|
|
}
|
|
|
|
async deleteEvent() {
|
|
return {};
|
|
}
|
|
|
|
async getAvailability() {
|
|
return [];
|
|
}
|
|
|
|
async getAvailabilityWithTimeZones() {
|
|
return [];
|
|
}
|
|
|
|
async listCalendars() {
|
|
return [];
|
|
}
|
|
}
|
|
|
|
class MockOfficeCalendarService {
|
|
constructor(credential: any) {
|
|
this.credential = credential;
|
|
}
|
|
|
|
getCredentialId() {
|
|
return this.credential.id;
|
|
}
|
|
|
|
async createEvent() {
|
|
return {};
|
|
}
|
|
|
|
async updateEvent() {
|
|
return {};
|
|
}
|
|
|
|
async deleteEvent() {
|
|
return {};
|
|
}
|
|
|
|
async getAvailability() {
|
|
return [];
|
|
}
|
|
|
|
async getAvailabilityWithTimeZones() {
|
|
return [];
|
|
}
|
|
|
|
async listCalendars() {
|
|
return [];
|
|
}
|
|
}
|
|
|
|
return {
|
|
CalendarServiceMap: {
|
|
googlecalendar: vi.importActual("@calcom/app-store/googlecalendar/lib/CalendarService"),
|
|
office365calendar: vi.importActual("@calcom/app-store/office365calendar/lib/CalendarService"),
|
|
},
|
|
};
|
|
});
|
|
|
|
function buildDelegationCredential(credential: CredentialPayload): CredentialForCalendarService {
|
|
return {
|
|
...credential,
|
|
id: -1,
|
|
delegatedTo: {
|
|
serviceAccountKey: {
|
|
client_email: "client_email",
|
|
tenant_id: "tenant_id",
|
|
client_id: "client_id",
|
|
private_key: "private_key",
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
function buildRegularCredential(credential: CredentialPayload): CredentialForCalendarService {
|
|
return {
|
|
...credential,
|
|
delegatedTo: null,
|
|
delegatedToId: null,
|
|
};
|
|
}
|
|
|
|
function buildSelectedCalendar(credential: {
|
|
credentialId: number;
|
|
externalId: string;
|
|
integration: string;
|
|
userId: number;
|
|
id: string;
|
|
}): SelectedCalendar {
|
|
return {
|
|
googleChannelId: null,
|
|
googleChannelKind: null,
|
|
googleChannelResourceId: null,
|
|
eventTypeId: null,
|
|
googleChannelResourceUri: null,
|
|
googleChannelExpiration: null,
|
|
delegationCredentialId: null,
|
|
domainWideDelegationCredentialId: null,
|
|
error: null,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
lastErrorAt: null,
|
|
watchAttempts: 0,
|
|
unwatchAttempts: 0,
|
|
maxAttempts: 3,
|
|
...credential,
|
|
};
|
|
}
|
|
|
|
describe("getCalendarsEvents", () => {
|
|
let credential: CredentialPayload;
|
|
|
|
beforeEach(() => {
|
|
vi.spyOn(logger.constructor.prototype, "debug");
|
|
|
|
credential = {
|
|
id: 303,
|
|
type: "google_calendar",
|
|
key: {
|
|
scope: "example scope",
|
|
token_type: "Bearer",
|
|
expiry_date: Date.now() + 84000,
|
|
access_token: "access token",
|
|
refresh_token: "refresh token",
|
|
},
|
|
userId: 808,
|
|
teamId: null,
|
|
user: {
|
|
email: "test@example.com",
|
|
},
|
|
appId: "exampleApp",
|
|
invalid: false,
|
|
delegationCredentialId: null,
|
|
};
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.restoreAllMocks();
|
|
});
|
|
|
|
describe("Regular Credentials", () => {
|
|
it("should return empty array if no calendar credentials", async () => {
|
|
const result = await getCalendarsEvents(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "totally_unrelated",
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-02",
|
|
[]
|
|
);
|
|
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it("should return unknown calendars as empty", async () => {
|
|
const result = await getCalendarsEvents(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "unknown_calendar",
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-02",
|
|
[]
|
|
);
|
|
|
|
expect(result).toEqual([[]]);
|
|
});
|
|
|
|
it("should return unmatched calendars as empty", async () => {
|
|
const selectedCalendar: SelectedCalendar = buildSelectedCalendar({
|
|
credentialId: 100,
|
|
externalId: "externalId",
|
|
integration: "office365_calendar",
|
|
userId: 200,
|
|
id: "id",
|
|
});
|
|
const result = await getCalendarsEvents(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "google_calendar",
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-02",
|
|
[selectedCalendar]
|
|
);
|
|
|
|
expect(result).toEqual([[]]);
|
|
});
|
|
|
|
it("should return availability from selected calendar", async () => {
|
|
const availability: EventBusyDate[] = [
|
|
{
|
|
start: new Date(2010, 11, 2),
|
|
end: new Date(2010, 11, 3),
|
|
},
|
|
{
|
|
start: new Date(2010, 11, 2, 4),
|
|
end: new Date(2010, 11, 2, 16),
|
|
},
|
|
];
|
|
|
|
const getAvailabilitySpy = vi
|
|
.spyOn(GoogleCalendarService.prototype, "getAvailability")
|
|
.mockReturnValue(Promise.resolve(availability));
|
|
|
|
const selectedCalendar: SelectedCalendar = buildSelectedCalendar({
|
|
credentialId: 100,
|
|
externalId: "externalId",
|
|
integration: "google_calendar",
|
|
userId: 200,
|
|
id: "id",
|
|
});
|
|
const result = await getCalendarsEvents(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "google_calendar",
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-04",
|
|
[selectedCalendar]
|
|
);
|
|
|
|
expect(getAvailabilitySpy).toHaveBeenCalledWith(
|
|
"2010-12-01",
|
|
"2010-12-04",
|
|
[selectedCalendar],
|
|
undefined,
|
|
false
|
|
);
|
|
expect(result).toEqual([
|
|
availability.map((av) => ({
|
|
...av,
|
|
source: "exampleApp",
|
|
})),
|
|
]);
|
|
});
|
|
|
|
it("should return availability from multiple calendars", async () => {
|
|
const googleAvailability: EventBusyDate[] = [
|
|
{
|
|
start: new Date(2010, 11, 2),
|
|
end: new Date(2010, 11, 3),
|
|
},
|
|
];
|
|
const officeAvailability: EventBusyDate[] = [
|
|
{
|
|
start: new Date(2010, 11, 2, 4),
|
|
end: new Date(2010, 11, 2, 16),
|
|
},
|
|
];
|
|
|
|
const getGoogleAvailabilitySpy = vi
|
|
.spyOn(GoogleCalendarService.prototype, "getAvailability")
|
|
.mockReturnValue(Promise.resolve(googleAvailability));
|
|
const getOfficeAvailabilitySpy = vi
|
|
.spyOn(OfficeCalendarService.prototype, "getAvailability")
|
|
.mockReturnValue(Promise.resolve(officeAvailability));
|
|
|
|
const selectedGoogleCalendar: SelectedCalendar = buildSelectedCalendar({
|
|
credentialId: 100,
|
|
externalId: "externalId",
|
|
integration: "google_calendar",
|
|
userId: 200,
|
|
id: "id",
|
|
});
|
|
const selectedOfficeCalendar: SelectedCalendar = buildSelectedCalendar({
|
|
credentialId: 100,
|
|
externalId: "externalId",
|
|
integration: "office365_calendar",
|
|
userId: 200,
|
|
id: "id",
|
|
});
|
|
const result = await getCalendarsEvents(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "google_calendar",
|
|
}),
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "office365_calendar",
|
|
key: {
|
|
access_token: "access",
|
|
refresh_token: "refresh",
|
|
expires_in: Date.now() + 86400,
|
|
},
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-04",
|
|
[selectedGoogleCalendar, selectedOfficeCalendar]
|
|
);
|
|
|
|
expect(getGoogleAvailabilitySpy).toHaveBeenCalledWith(
|
|
"2010-12-01",
|
|
"2010-12-04",
|
|
[selectedGoogleCalendar],
|
|
undefined,
|
|
false
|
|
);
|
|
expect(getOfficeAvailabilitySpy).toHaveBeenCalledWith(
|
|
"2010-12-01",
|
|
"2010-12-04",
|
|
[selectedOfficeCalendar],
|
|
undefined,
|
|
false
|
|
);
|
|
expect(result).toEqual([
|
|
googleAvailability.map((av) => ({
|
|
...av,
|
|
source: "exampleApp",
|
|
})),
|
|
officeAvailability.map((av) => ({
|
|
...av,
|
|
source: "exampleApp",
|
|
})),
|
|
]);
|
|
});
|
|
|
|
it("should not call getAvailability if selectedCalendars is empty", async () => {
|
|
const getAvailabilitySpy = vi
|
|
.spyOn(GoogleCalendarService.prototype, "getAvailability")
|
|
.mockReturnValue(Promise.resolve([]));
|
|
|
|
const result = await getCalendarsEvents(
|
|
[buildRegularCredential(credential)],
|
|
"2010-12-01",
|
|
"2010-12-02",
|
|
[]
|
|
);
|
|
|
|
expect(getAvailabilitySpy).not.toHaveBeenCalled();
|
|
expect(result).toEqual([[]]);
|
|
});
|
|
});
|
|
|
|
describe("Delegation Credentials", () => {
|
|
it("should allow getAvailability call even without any selected calendars with allowFallbackToPrimary=true", async () => {
|
|
const startDate = "2010-12-01";
|
|
const endDate = "2010-12-02";
|
|
const delegationCredential: CredentialForCalendarService = buildDelegationCredential(credential);
|
|
const credentials = [delegationCredential];
|
|
const getAvailabilitySpy = vi
|
|
.spyOn(GoogleCalendarService.prototype, "getAvailability")
|
|
.mockReturnValue(Promise.resolve([]));
|
|
|
|
const result = await getCalendarsEvents(credentials, startDate, endDate, []);
|
|
|
|
expect(getAvailabilitySpy).toHaveBeenCalledWith(startDate, endDate, [], undefined, true);
|
|
expect(result).toEqual([[]]);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("getCalendarsEventsWithTimezones", () => {
|
|
let credential: CredentialPayload;
|
|
|
|
beforeEach(() => {
|
|
vi.spyOn(logger.constructor.prototype, "debug");
|
|
|
|
credential = {
|
|
id: 303,
|
|
type: "google_calendar",
|
|
key: {
|
|
scope: "example scope",
|
|
token_type: "Bearer",
|
|
expiry_date: Date.now() + 84000,
|
|
access_token: "access token",
|
|
refresh_token: "refresh token",
|
|
},
|
|
userId: 808,
|
|
teamId: null,
|
|
user: {
|
|
email: "test@example.com",
|
|
},
|
|
appId: "exampleApp",
|
|
invalid: false,
|
|
delegationCredentialId: null,
|
|
};
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.restoreAllMocks();
|
|
});
|
|
|
|
describe("Regular Credentials", () => {
|
|
it("should return empty array if no calendar credentials", async () => {
|
|
const result = await getCalendarsEventsWithTimezones(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "totally_unrelated",
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-02",
|
|
[]
|
|
);
|
|
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it("should return unknown calendars as empty", async () => {
|
|
const result = await getCalendarsEventsWithTimezones(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "unknown_calendar",
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-02",
|
|
[]
|
|
);
|
|
|
|
expect(result).toEqual([]);
|
|
});
|
|
|
|
it("should return unmatched calendars as empty", async () => {
|
|
const selectedCalendar: SelectedCalendar = buildSelectedCalendar({
|
|
credentialId: 100,
|
|
externalId: "externalId",
|
|
integration: "office365_calendar",
|
|
userId: 200,
|
|
id: "id",
|
|
});
|
|
const result = await getCalendarsEventsWithTimezones(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "google_calendar",
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-02",
|
|
[selectedCalendar]
|
|
);
|
|
|
|
expect(result).toEqual([[]]);
|
|
});
|
|
|
|
it("should return availability from selected calendar", async () => {
|
|
const availability = [
|
|
{
|
|
start: new Date(2010, 11, 2),
|
|
end: new Date(2010, 11, 3),
|
|
timeZone: "America/New_York",
|
|
},
|
|
{
|
|
start: new Date(2010, 11, 2, 4),
|
|
end: new Date(2010, 11, 2, 16),
|
|
timeZone: "America/New_York",
|
|
},
|
|
];
|
|
|
|
const getAvailabilityWithTimezonesSpy = vi
|
|
.spyOn(GoogleCalendarService.prototype, "getAvailabilityWithTimeZones")
|
|
.mockReturnValue(Promise.resolve(availability));
|
|
|
|
const selectedCalendar: SelectedCalendar = buildSelectedCalendar({
|
|
credentialId: 100,
|
|
externalId: "externalId",
|
|
integration: "google_calendar",
|
|
userId: 200,
|
|
id: "id",
|
|
});
|
|
const result = await getCalendarsEventsWithTimezones(
|
|
[
|
|
buildRegularCredential({
|
|
...credential,
|
|
type: "google_calendar",
|
|
}),
|
|
],
|
|
"2010-12-01",
|
|
"2010-12-04",
|
|
[selectedCalendar]
|
|
);
|
|
|
|
expect(getAvailabilityWithTimezonesSpy).toHaveBeenCalledWith(
|
|
"2010-12-01",
|
|
"2010-12-04",
|
|
[selectedCalendar],
|
|
false
|
|
);
|
|
expect(result).toEqual([
|
|
availability.map((av) => ({
|
|
...av,
|
|
})),
|
|
]);
|
|
});
|
|
|
|
it("should not call getAvailabilityWithTimezones if selectedCalendars is empty", async () => {
|
|
const getAvailabilityWithTimezonesSpy = vi
|
|
.spyOn(GoogleCalendarService.prototype, "getAvailabilityWithTimeZones")
|
|
.mockReturnValue(Promise.resolve([]));
|
|
|
|
const result = await getCalendarsEventsWithTimezones(
|
|
[buildRegularCredential(credential)],
|
|
"2010-12-01",
|
|
"2010-12-02",
|
|
[]
|
|
);
|
|
|
|
expect(getAvailabilityWithTimezonesSpy).not.toHaveBeenCalled();
|
|
expect(result).toEqual([[]]);
|
|
});
|
|
});
|
|
|
|
describe("Delegation Credentials", () => {
|
|
it("should allow getAvailabilityWithTimezones call even without any selected calendars with allowFallbackToPrimary=true", async () => {
|
|
const startDate = "2010-12-01";
|
|
const endDate = "2010-12-02";
|
|
const delegationCredential: CredentialForCalendarService = buildDelegationCredential(credential);
|
|
const credentials = [delegationCredential];
|
|
const getAvailabilityWithTimezonesSpy = vi
|
|
.spyOn(GoogleCalendarService.prototype, "getAvailabilityWithTimeZones")
|
|
.mockReturnValue(Promise.resolve([]));
|
|
|
|
const result = await getCalendarsEventsWithTimezones(credentials, startDate, endDate, []);
|
|
|
|
expect(getAvailabilityWithTimezonesSpy).toHaveBeenCalledWith(startDate, endDate, [], true);
|
|
expect(result).toEqual([[]]);
|
|
});
|
|
});
|
|
});
|
|
|
|
// CalDAV Credential Leak Prevention Tests
|
|
describe("CalDAV credential leak prevention", () => {
|
|
function buildCalDAVCredential(data: {
|
|
id: number;
|
|
key: string;
|
|
userId?: number;
|
|
}): CredentialForCalendarService {
|
|
return {
|
|
id: data.id,
|
|
type: "caldav_calendar",
|
|
key: data.key,
|
|
userId: data.userId || 1,
|
|
user: { email: "test@example.com" },
|
|
teamId: null,
|
|
appId: "caldav-calendar",
|
|
invalid: false,
|
|
delegatedTo: null,
|
|
delegationCredentialId: null,
|
|
};
|
|
}
|
|
|
|
function buildCalDAVSelectedCalendar(data: {
|
|
id: string;
|
|
externalId: string;
|
|
credentialId?: number;
|
|
}): SelectedCalendar {
|
|
return {
|
|
id: data.id,
|
|
userId: 1,
|
|
integration: "caldav_calendar",
|
|
externalId: data.externalId,
|
|
credentialId: data.credentialId || null,
|
|
createdAt: new Date(),
|
|
updatedAt: new Date(),
|
|
googleChannelId: null,
|
|
googleChannelKind: null,
|
|
googleChannelResourceId: null,
|
|
googleChannelResourceUri: null,
|
|
googleChannelExpiration: null,
|
|
delegationCredentialId: null,
|
|
domainWideDelegationCredentialId: null,
|
|
error: null,
|
|
lastErrorAt: null,
|
|
watchAttempts: 0,
|
|
unwatchAttempts: 0,
|
|
maxAttempts: 3,
|
|
eventTypeId: null,
|
|
};
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
describe("filterSelectedCalendarsForCredential", () => {
|
|
it("prevents CalDAV credential leak by matching server URLs", () => {
|
|
// Setup: Two CalDAV servers with different URLs
|
|
const serverACredential = buildCalDAVCredential({
|
|
id: 1,
|
|
key: "encrypted_server_a_key",
|
|
});
|
|
|
|
const serverBCredential = buildCalDAVCredential({
|
|
id: 2,
|
|
key: "encrypted_server_b_key",
|
|
});
|
|
|
|
// Mock encrypted credential data for different servers
|
|
mockedSymmetricDecrypt
|
|
.mockReturnValueOnce(
|
|
JSON.stringify({
|
|
username: "user_a",
|
|
password: "pass_a",
|
|
url: "https://server-a.example.com/dav/calendars/user/",
|
|
})
|
|
)
|
|
.mockReturnValueOnce(
|
|
JSON.stringify({
|
|
username: "user_b",
|
|
password: "pass_b",
|
|
url: "https://server-b.example.com/dav/calendars/user/",
|
|
})
|
|
);
|
|
|
|
// Selected calendars from both servers
|
|
const selectedCalendars = [
|
|
buildCalDAVSelectedCalendar({
|
|
id: "cal_1",
|
|
externalId: "https://server-a.example.com/dav/calendars/user/calendar1/",
|
|
credentialId: 1,
|
|
}),
|
|
buildCalDAVSelectedCalendar({
|
|
id: "cal_2",
|
|
externalId: "https://server-b.example.com/dav/calendars/user/calendar2/",
|
|
credentialId: 2,
|
|
}),
|
|
];
|
|
|
|
// Test Server A credential - should only return Server A calendars
|
|
const serverACalendars = filterSelectedCalendarsForCredential(selectedCalendars, serverACredential);
|
|
expect(serverACalendars).toHaveLength(1);
|
|
expect(serverACalendars[0].externalId).toBe(
|
|
"https://server-a.example.com/dav/calendars/user/calendar1/"
|
|
);
|
|
|
|
// Test Server B credential - should only return Server B calendars
|
|
const serverBCalendars = filterSelectedCalendarsForCredential(selectedCalendars, serverBCredential);
|
|
expect(serverBCalendars).toHaveLength(1);
|
|
expect(serverBCalendars[0].externalId).toBe(
|
|
"https://server-b.example.com/dav/calendars/user/calendar2/"
|
|
);
|
|
});
|
|
|
|
it("demonstrates the credential leak that existed before the fix", () => {
|
|
// This test shows what WOULD happen with naive filtering (integration type only)
|
|
const serverACredential = buildCalDAVCredential({
|
|
id: 1,
|
|
key: "encrypted_server_a_key",
|
|
});
|
|
|
|
const selectedCalendars = [
|
|
buildCalDAVSelectedCalendar({
|
|
id: "cal_1",
|
|
externalId: "https://server-a.example.com/dav/calendars/user/calendar1/",
|
|
credentialId: 1,
|
|
}),
|
|
buildCalDAVSelectedCalendar({
|
|
id: "cal_2",
|
|
externalId: "https://server-b.example.com/dav/calendars/user/calendar2/",
|
|
credentialId: 2,
|
|
}),
|
|
];
|
|
|
|
// Legacy filtering (type-only) would return ALL CalDAV calendars
|
|
const legacyFiltering = selectedCalendars.filter((sc) => sc.integration === "caldav_calendar");
|
|
expect(legacyFiltering).toHaveLength(2); // This demonstrates the leak - both calendars returned
|
|
|
|
// Our new filtering prevents this
|
|
mockedSymmetricDecrypt.mockReturnValue(
|
|
JSON.stringify({
|
|
username: "user_a",
|
|
password: "pass_a",
|
|
url: "https://server-a.example.com/dav/calendars/user/",
|
|
})
|
|
);
|
|
|
|
const secureFiltering = filterSelectedCalendarsForCredential(selectedCalendars, serverACredential);
|
|
expect(secureFiltering).toHaveLength(1); // Only calendars from matching server
|
|
expect(secureFiltering[0].externalId).toContain("server-a.example.com");
|
|
});
|
|
|
|
it("handles non-CalDAV calendars normally", () => {
|
|
const googleCredential: CredentialForCalendarService = {
|
|
id: 1,
|
|
type: "google_calendar",
|
|
key: "google_key",
|
|
userId: 1,
|
|
user: { email: "test@example.com" },
|
|
teamId: null,
|
|
appId: "google-calendar",
|
|
invalid: false,
|
|
delegatedTo: null,
|
|
delegationCredentialId: null,
|
|
};
|
|
|
|
const selectedCalendars = [
|
|
buildCalDAVSelectedCalendar({
|
|
id: "cal_1",
|
|
externalId: "https://server-a.example.com/dav/calendars/user/calendar1/",
|
|
}),
|
|
{
|
|
...buildCalDAVSelectedCalendar({
|
|
id: "cal_2",
|
|
externalId: "primary",
|
|
}),
|
|
integration: "google_calendar",
|
|
},
|
|
];
|
|
|
|
const googleCalendars = filterSelectedCalendarsForCredential(selectedCalendars, googleCredential);
|
|
expect(googleCalendars).toHaveLength(1);
|
|
expect(googleCalendars[0].integration).toBe("google_calendar");
|
|
});
|
|
|
|
it("handles invalid CalDAV credential URLs gracefully", () => {
|
|
const invalidCredential = buildCalDAVCredential({
|
|
id: 1,
|
|
key: "encrypted_invalid_key",
|
|
});
|
|
|
|
mockedSymmetricDecrypt.mockReturnValue(
|
|
JSON.stringify({
|
|
username: "user",
|
|
password: "pass",
|
|
url: "invalid-url-format",
|
|
})
|
|
);
|
|
|
|
const selectedCalendars = [
|
|
buildCalDAVSelectedCalendar({
|
|
id: "cal_1",
|
|
externalId: "https://server-a.example.com/dav/calendars/user/calendar1/",
|
|
}),
|
|
];
|
|
|
|
const result = filterSelectedCalendarsForCredential(selectedCalendars, invalidCredential);
|
|
expect(result).toHaveLength(0); // Should return empty array for safety
|
|
});
|
|
});
|
|
});
|