* perf(app-store): convert services to factory functions to narrow SDK type exports This change converts CRM, Calendar, Payment, and Analytics services from exporting classes to exporting factory functions that return interface types. This prevents SDK types (HubSpot, Stripe, etc.) from leaking into the type system when TypeScript emits .d.ts files. Services modified: - CRM: hubspot, salesforce, closecom, pipedrive-crm, zoho-bigin, zohocrm - Calendar: all 13 calendar services - Payment: stripe, paypal, alby, btcpayserver, hitpay, mock-payment-app - Analytics: dub Video adapters were audited and already use factory pattern. WIP: Salesforce CRM service has a type error that needs fixing. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(salesforce): add type assertion for appOptions in factory function Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update remaining consumers to use factory functions - getAnalytics.ts: call factory function instead of new - getConnectedApps.ts: call factory function instead of new - salesforce/CrmService.ts: fix type assertion with default value - salesforce/routingForm/incompleteBookingAction.ts: use factory function - salesforce/routingFormBookingFormHandler.ts: use factory function Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(salesforce): add SalesforceCRM interface for Salesforce-specific methods - Create SalesforceCRM interface extending CRM with findUserEmailFromLookupField and incompleteBookingWriteToRecord methods - Add createSalesforceCrmServiceWithSalesforceType factory function for internal Salesforce modules - Update routing form files to use the new factory function with proper typing Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(salesforce): correct return type in SalesforceCRM interface The findUserEmailFromLookupField method returns { email: string; recordType: RoutingReasons } | undefined, not string | undefined. Updated the interface to match the actual implementation. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update all call sites to use factory functions - Update calendar API add files to use factory functions (7 files) - Update Google Calendar test files to use factory functions (3 files) - Update Salesforce test files to use SalesforceCRM interface - Add testMode parameter to createSalesforceCrmServiceWithSalesforceType - Remove unused @ts-expect-error directive in bookingScenario.ts Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add GoogleCalendar interface and update factory functions for service-specific methods Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: add type annotation to attendee parameter in google-calendar.e2e.ts Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update selected-calendars/route.ts to use GoogleCalendar factory function Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update remaining GoogleCalendarService call sites to use factory function Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: remove explicit type annotation in google-calendar.e2e.ts to fix type error Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: update test mocks to use factory function pattern for calendar and payment services Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix: convert MockPaymentService to factory function in setupVitest.ts Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(api-v2): call calendar service factory functions instead of using new Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * perf(trpc): add TypeScript project references to reduce build file count - Add tsconfig.build.json to app-store with composite settings for declaration emit - Add tsconfig.server.build.json to trpc with project references - Add types and typesVersions to app-store package.json to redirect type resolution to dist-types - Add build:types script to app-store for generating declarations - Add dist-types to .gitignore This reduces the tRPC build file count from 7,733 to 5,618 files (27% reduction) by having TypeScript resolve to prebuilt .d.ts files instead of source files. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(app-store): add fallback to typesVersions for CI compatibility The typesVersions now prefers dist-types but falls back to source files when dist-types don't exist. This fixes CI type-check failures while still allowing the optimization when dist-types are built. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Added build dependency for tRPC on app-store * fix(app-store): exclude test directories from tsconfig.build.json Exclude __tests__, __mocks__, and tests directories from the build config to prevent test utility files (which import from outside rootDir) from being included in the declaration emit. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(turbo): add build:types task definition for app-store Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(turbo): remove circular build dependency between trpc and app-store The build:types task for app-store transitively imports from @calcom/features, which imports from @calcom/trpc. This creates a circular build dependency when @calcom/trpc#build depends on @calcom/app-store#build:types. Solution: Remove the turbo dependency. The typesVersions fallback pattern ['./dist-types/*', './*'] will use source files when dist-types/ doesn't exist, and use prebuilt declarations when they do exist (for faster builds). Also exclude dist-types from regular tsconfig.json to prevent 'Cannot write file' errors when dist-types/ exists. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor(app-store): rename dist-types to types for consistency Rename the prebuilt TypeScript declarations folder from dist-types to types to match the convention used by @calcom/trpc and other packages in the monorepo. Updated files: - tsconfig.build.json: declarationDir and exclude - tsconfig.json: exclude - package.json: typesVersions paths - turbo.json: build:types outputs - .gitignore: ignore path Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(api-v2): update ICS calendar test to mock factory function instead of class prototype The IcsFeedCalendarService is now a factory function, not a class, so jest.spyOn(IcsFeedCalendarService.prototype, 'listCalendars') no longer works. Updated to use jest.spyOn(appStore, 'IcsFeedCalendarService').mockImplementation() to mock the factory function return value instead. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor(app-store): rename factory functions to Build* naming convention - Rename Calendar factory functions from create*CalendarService to BuildCalendarService - Rename CRM factory functions from create*CrmService to BuildCrmService - Rename Payment factory functions from PaymentService to BuildPaymentService - Rename Analytics factory function from createDubAnalyticsService to BuildAnalyticsService - Update all index.ts re-exports to use new names - Update all call sites throughout the codebase - Update test mocks to use new factory function names This makes it clear that these are factory functions, not class constructors. Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(app-store): update remaining CalendarService and PaymentService imports to Build* names - Update api/add.ts files for applecalendar, caldavcalendar, exchange2013calendar, exchange2016calendar, exchangecalendar, ics-feedcalendar - Update mock-payment-app index.ts to export BuildPaymentService - Fix googlecalendar test import alias for createInMemoryDelegationCredentialForBuildCalendarService Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(tests): update payment service mocks to use BuildPaymentService - Update setupVitest.ts to use BuildPaymentService instead of PaymentService - Update handlePayment.test.ts mock to use BuildPaymentService Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor: address PR review comments - rename to Build* and remove unused code Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * refactor: remove explanatory comments and fix indentation Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * chore: update .gitignore to use *.tsbuildinfo pattern Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * fix(api-v2): update IcsFeedCalendarService to BuildIcsFeedCalendarService in e2e test Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * style: format CalendarService.test.ts Co-Authored-By: keith@cal.com <keithwillcode@gmail.com> * Delete apps/ui-playground/next-env.d.ts --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
313 lines
11 KiB
TypeScript
313 lines
11 KiB
TypeScript
import prismock from "@calcom/testing/lib/__mocks__/prisma";
|
|
import "../__mocks__/features.repository";
|
|
import "../__mocks__/getGoogleAppKeys";
|
|
import {
|
|
setCredentialsMock,
|
|
calendarListMock,
|
|
getLastCreatedJWT,
|
|
getLastCreatedOAuth2Client,
|
|
setLastCreatedJWT,
|
|
setLastCreatedOAuth2Client,
|
|
calendarMock,
|
|
adminMock,
|
|
MOCK_JWT_TOKEN,
|
|
MOCK_OAUTH2_TOKEN,
|
|
} from "../__mocks__/googleapis";
|
|
|
|
import { expect, test, beforeEach, vi, describe } from "vitest";
|
|
import "vitest-fetch-mock";
|
|
|
|
import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";
|
|
|
|
import BuildCalendarService from "../CalendarService";
|
|
import {
|
|
createMockJWTInstance,
|
|
createInMemoryDelegationCredentialForCalendarService as createInMemoryDelegationCredentialForBuildCalendarService,
|
|
defaultDelegatedCredential,
|
|
createCredentialForCalendarService,
|
|
} from "./utils";
|
|
|
|
function expectJWTInstanceToBeCreated() {
|
|
expect(getLastCreatedJWT()).toBeDefined();
|
|
expect(setCredentialsMock).not.toHaveBeenCalled();
|
|
}
|
|
|
|
function expectOAuth2InstanceToBeCreated() {
|
|
expect(setCredentialsMock).toHaveBeenCalled();
|
|
expect(getLastCreatedJWT()).toBeNull();
|
|
}
|
|
|
|
function mockSuccessfulCalendarListFetch() {
|
|
calendarListMock.mockImplementation(() => {
|
|
return {
|
|
data: { items: [] },
|
|
};
|
|
});
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.clearAllMocks();
|
|
setCredentialsMock.mockClear();
|
|
calendarMock.calendar_v3.Calendar.mockClear();
|
|
adminMock.admin_directory_v1.Admin.mockClear();
|
|
|
|
setLastCreatedJWT(null);
|
|
setLastCreatedOAuth2Client(null);
|
|
createMockJWTInstance({});
|
|
});
|
|
|
|
async function expectNoCredentialsInDb() {
|
|
const credentials = await prismock.credential.findMany({});
|
|
expect(credentials).toHaveLength(0);
|
|
}
|
|
|
|
async function expectCredentialsInDb(credentials: CredentialForCalendarServiceWithEmail[]) {
|
|
const credentialsInDb = await prismock.credential.findMany({});
|
|
expect(credentialsInDb.length).toBe(credentials.length);
|
|
expect(credentialsInDb).toEqual(expect.arrayContaining(credentials));
|
|
}
|
|
|
|
describe("GoogleCalendarService credential handling", () => {
|
|
describe("Delegation Credential", () => {
|
|
test("uses JWT auth with impersonation when listCalendars is called and creates a new credential in DB with the key as JWT token if it doesn't exist", async () => {
|
|
const credentialWithDelegation = await createInMemoryDelegationCredentialForBuildCalendarService({
|
|
user: { email: "user@example.com" },
|
|
delegatedTo: defaultDelegatedCredential,
|
|
delegationCredentialId: "delegation-credential-id-1",
|
|
});
|
|
|
|
mockSuccessfulCalendarListFetch();
|
|
expectNoCredentialsInDb();
|
|
const calendarService = BuildCalendarService(credentialWithDelegation);
|
|
await calendarService.listCalendars();
|
|
expectJWTInstanceToBeCreated();
|
|
await expectCredentialsInDb([
|
|
expect.objectContaining({
|
|
delegationCredentialId: credentialWithDelegation.delegationCredentialId,
|
|
key: MOCK_JWT_TOKEN,
|
|
userId: credentialWithDelegation.userId,
|
|
}),
|
|
]);
|
|
});
|
|
|
|
test("uses JWT auth with impersonation when listCalendars is called and updates the credential in DB with the new JWT token if it exists", async () => {
|
|
const credentialWithDelegation = await createInMemoryDelegationCredentialForBuildCalendarService({
|
|
user: { email: "user@example.com" },
|
|
delegatedTo: defaultDelegatedCredential,
|
|
delegationCredentialId: "delegation-credential-id-1",
|
|
});
|
|
|
|
mockSuccessfulCalendarListFetch();
|
|
const existingCredential = await prismock.credential.create({
|
|
data: {
|
|
type: "google_calendar",
|
|
delegationCredentialId: credentialWithDelegation.delegationCredentialId,
|
|
userId: credentialWithDelegation.userId,
|
|
key: {
|
|
access_token: "CURRENT_ACCESS_TOKEN",
|
|
},
|
|
},
|
|
});
|
|
const calendarService = BuildCalendarService(credentialWithDelegation);
|
|
await calendarService.listCalendars();
|
|
expectJWTInstanceToBeCreated();
|
|
await expectCredentialsInDb([
|
|
expect.objectContaining({
|
|
id: existingCredential.id,
|
|
delegationCredentialId: credentialWithDelegation.delegationCredentialId,
|
|
key: MOCK_JWT_TOKEN,
|
|
userId: credentialWithDelegation.userId,
|
|
}),
|
|
]);
|
|
});
|
|
|
|
test("JWT token is reused when not expired when listCalendars is called again on a new instance of CalendarService", async () => {
|
|
const jwtTokenThatHasNotExpired = {
|
|
...MOCK_JWT_TOKEN,
|
|
expiry_date: Date.now() + 1000 * 60 * 60 * 24,
|
|
};
|
|
createMockJWTInstance({
|
|
tokenExpiryDate: jwtTokenThatHasNotExpired.expiry_date,
|
|
});
|
|
const credentialWithDelegation = await createInMemoryDelegationCredentialForBuildCalendarService({
|
|
user: { email: "user@example.com" },
|
|
delegatedTo: defaultDelegatedCredential,
|
|
delegationCredentialId: "delegation-credential-id-1",
|
|
});
|
|
|
|
console.log("TESTS: credentialWithDelegation", credentialWithDelegation);
|
|
|
|
mockSuccessfulCalendarListFetch();
|
|
await expectNoCredentialsInDb();
|
|
console.log("TESTS: First instance of CalendarService");
|
|
const calendarService1 = BuildCalendarService({
|
|
...credentialWithDelegation,
|
|
});
|
|
await calendarService1.listCalendars();
|
|
await expectCredentialsInDb([
|
|
expect.objectContaining({
|
|
delegationCredentialId: credentialWithDelegation.delegationCredentialId,
|
|
key: jwtTokenThatHasNotExpired,
|
|
userId: credentialWithDelegation.userId,
|
|
}),
|
|
]);
|
|
|
|
const existingCredential = await prismock.credential.findFirst({
|
|
where: {
|
|
delegationCredentialId: credentialWithDelegation.delegationCredentialId,
|
|
userId: credentialWithDelegation.userId,
|
|
},
|
|
});
|
|
expect(existingCredential).toBeDefined();
|
|
console.log("TESTS: Second instance of CalendarService");
|
|
createMockJWTInstance({
|
|
authorizeError: {
|
|
response: {
|
|
data: {
|
|
error: "I_WOULD_ERROR_IF_YOU_USE_ME",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
const calendarService2 = BuildCalendarService({
|
|
...credentialWithDelegation,
|
|
});
|
|
await calendarService2.listCalendars();
|
|
await expectCredentialsInDb([
|
|
expect.objectContaining({
|
|
// Same credential should be reused
|
|
id: existingCredential?.id,
|
|
delegationCredentialId: credentialWithDelegation.delegationCredentialId,
|
|
key: jwtTokenThatHasNotExpired,
|
|
}),
|
|
]);
|
|
});
|
|
});
|
|
|
|
describe("Non-Delegation Credential", () => {
|
|
test("uses OAuth2 auth when listCalendars is called", async () => {
|
|
const regularCredential = await createCredentialForCalendarService();
|
|
mockSuccessfulCalendarListFetch();
|
|
const calendarService = BuildCalendarService(regularCredential);
|
|
await calendarService.listCalendars();
|
|
|
|
expectOAuth2InstanceToBeCreated();
|
|
|
|
expect(calendarMock.calendar_v3.Calendar).toHaveBeenCalledWith({
|
|
auth: getLastCreatedOAuth2Client(),
|
|
});
|
|
await expectCredentialsInDb([
|
|
expect.objectContaining({
|
|
id: regularCredential.id,
|
|
key: MOCK_OAUTH2_TOKEN,
|
|
}),
|
|
]);
|
|
});
|
|
});
|
|
|
|
describe("Delegation Credential Error handling", () => {
|
|
test("handles clientId not added to Google Workspace Admin Console error", async () => {
|
|
const credentialWithDelegation = await createInMemoryDelegationCredentialForBuildCalendarService({
|
|
user: { email: "user@example.com" },
|
|
delegatedTo: defaultDelegatedCredential,
|
|
delegationCredentialId: "delegation-credential-id-1",
|
|
});
|
|
|
|
createMockJWTInstance({
|
|
authorizeError: {
|
|
response: {
|
|
data: {
|
|
error: "unauthorized_client",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
const calendarService = BuildCalendarService(credentialWithDelegation);
|
|
|
|
await expect(calendarService.listCalendars()).rejects.toThrow(
|
|
"Make sure that the Client ID for the delegation credential is added to the Google Workspace Admin Console"
|
|
);
|
|
});
|
|
|
|
test("handles DelegationCredential authorization errors appropriately", async () => {
|
|
const credentialWithDelegation = await createInMemoryDelegationCredentialForBuildCalendarService({
|
|
user: { email: "user@example.com" },
|
|
delegatedTo: defaultDelegatedCredential,
|
|
delegationCredentialId: "delegation-credential-id-1",
|
|
});
|
|
|
|
createMockJWTInstance({
|
|
authorizeError: {
|
|
response: {
|
|
data: {
|
|
error: "unauthorized_client",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
const calendarService = BuildCalendarService(credentialWithDelegation);
|
|
|
|
await expect(calendarService.listCalendars()).rejects.toThrow(
|
|
"Make sure that the Client ID for the delegation credential is added to the Google Workspace Admin Console"
|
|
);
|
|
});
|
|
|
|
test("handles invalid_grant error (user not in workspace) appropriately", async () => {
|
|
const credentialWithDelegation = await createInMemoryDelegationCredentialForBuildCalendarService({
|
|
user: { email: "user@example.com" },
|
|
delegatedTo: defaultDelegatedCredential,
|
|
delegationCredentialId: "delegation-credential-id-1",
|
|
});
|
|
|
|
createMockJWTInstance({
|
|
authorizeError: {
|
|
response: {
|
|
data: {
|
|
error: "invalid_grant",
|
|
},
|
|
},
|
|
},
|
|
});
|
|
|
|
const calendarService = BuildCalendarService(credentialWithDelegation);
|
|
|
|
await expect(calendarService.listCalendars()).rejects.toThrow(
|
|
`User ${credentialWithDelegation.user?.email} might not exist in Google Workspace`
|
|
);
|
|
});
|
|
|
|
test("handles DelegationCredential authorization errors appropriately", async () => {
|
|
const credentialWithDelegation = await createInMemoryDelegationCredentialForBuildCalendarService({
|
|
user: { email: "user@example.com" },
|
|
delegatedTo: defaultDelegatedCredential,
|
|
delegationCredentialId: "delegation-credential-id-1",
|
|
});
|
|
|
|
createMockJWTInstance({
|
|
authorizeError: new Error("Some unexpected error"),
|
|
});
|
|
|
|
const calendarService = BuildCalendarService(credentialWithDelegation);
|
|
|
|
await expect(calendarService.listCalendars()).rejects.toThrow(
|
|
"Error authorizing delegation credential"
|
|
);
|
|
});
|
|
|
|
test("On missing user email for DelegationCredential, it should fallback to OAuth2 auth", async () => {
|
|
const credentialWithDelegation = await createInMemoryDelegationCredentialForBuildCalendarService({
|
|
user: { email: null },
|
|
delegatedTo: defaultDelegatedCredential,
|
|
delegationCredentialId: "delegation-credential-id-1",
|
|
});
|
|
|
|
const calendarService = BuildCalendarService(credentialWithDelegation);
|
|
mockSuccessfulCalendarListFetch();
|
|
await calendarService.listCalendars();
|
|
expectOAuth2InstanceToBeCreated();
|
|
});
|
|
});
|
|
});
|