* feat: add delegation credential error webhook trigger - Add DELEGATION_CREDENTIAL_ERROR to WebhookTriggerEvents enum - Create DelegationCredentialErrorDTO type for webhook payload - Implement DelegationCredentialErrorWebhookService - Add translation for delegation_credential_error - Enable webhook for API v2 organization webhooks This webhook will send delegation credential error data to configured URLs when errors occur during calendar authentication with delegation credentials. Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * fix: add delegation credential error payload type and type guards - Add DelegationCredentialErrorPayloadType to sendPayload.ts - Update WebhookPayloadType union to include new payload type - Add isDelegationCredentialErrorPayload type guard function - Update isEventPayload to exclude delegation credential errors - Update template application logic to handle new payload type - Add corresponding payload type to dto/types.ts for consistency Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * feat: add delegation credential error handling to WebhookNotificationHandler - Add DELEGATION_CREDENTIAL_ERROR case to createPayload switch - Return payload with error, credential, and user data - Ensures exhaustive type checking passes for new trigger Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * feat: restrict DELEGATION_CREDENTIAL_ERROR to organization webhooks only - Add validation in UserWebhooksService to reject DELEGATION_CREDENTIAL_ERROR - Add validation in EventTypeWebhooksService to reject DELEGATION_CREDENTIAL_ERROR - Ensures trigger is only available for API v2 organization webhooks as requested Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * feat: wire up delegation credential error webhook emission in calendar services - Add webhook emission calls in CalendarAuth.ts for Google Calendar delegation errors - Add webhook emission calls in Office365 CalendarService.ts for Azure AD delegation errors - Implement actual webhook emission using WebhookRepository pattern - Fix pre-existing lint warnings in Office365 CalendarService.ts (unused catch variables, unsafe optional chaining) Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * test: add e2e tests for DELEGATION_CREDENTIAL_ERROR webhook trigger - Add comprehensive e2e tests for creating, retrieving, updating, and deleting webhooks with DELEGATION_CREDENTIAL_ERROR trigger - Test combining DELEGATION_CREDENTIAL_ERROR with other triggers - Fix import in triggerDelegationCredentialErrorWebhook.ts to use default import for sendPayload - Tests follow existing patterns in organizations-webhooks.e2e-spec.ts Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * refactor: remove name field from webhook payload and delete unused service - Remove name field from triggerDelegationCredentialErrorWebhook function signature and payload - Update all call sites in GoogleCalendar and Office365 calendar services - Update DelegationCredentialErrorDTO and DelegationCredentialErrorPayloadType to remove name field - Delete unused DelegationCredentialErrorWebhookService.ts (dead code - not used anywhere) - The helper function approach is more appropriate for app-store integrations without DI Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * refactor: make fire-and-forget intent explicit for webhook emission - Add void cast to all triggerDelegationCredentialErrorWebhook calls - Remove redundant .catch() handlers (helper already handles errors internally) - This makes it clear that webhook emission is non-blocking by design - Avoids delaying error propagation while webhook HTTP requests complete Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * feat: await webhook emission and add HTTP timeout for guaranteed delivery - Change all triggerDelegationCredentialErrorWebhook calls from void to await - Add 10-second timeout to webhook HTTP requests using AbortController - Remove name field from DelegationCredentialErrorPayloadType to match payload - Ensures webhooks are sent before error is thrown (per user requirement) - Prevents indefinite hangs on unresponsive webhook endpoints Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * fix: make getAuthUrl async and await all call sites - Make getAuthUrl async to support awaiting webhook emission - Add await to all 3 getAuthUrl call sites (constructor, getAzureUserId, testDelegationCredentialSetup) - Remove leftover name field from getAzureUserId webhook call - Fixes TS1308 error about await in non-async function Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * docs: add JSDoc clarifying error handling guarantees for webhook trigger Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * Revert "docs: add JSDoc clarifying error handling guarantees for webhook trigger" This reverts commit 3e33090197bfe2f2e3fb890402b32e04c44305e3. * Revert "fix: make getAuthUrl async and await all call sites" This reverts commit de28b7337149104412c861fd9b05e76fffc1fed7. * Revert "feat: await webhook emission and add HTTP timeout for guaranteed delivery" This reverts commit 9da7241f83a8373b4fadc03ccf34e097c28adf3a. * Revert "refactor: make fire-and-forget intent explicit for webhook emission" This reverts commit f4f7fa06b7dfa151bfbea29905b8783261d9f353. * feat: await webhook emission to match standard pattern - Updated all webhook call sites to await triggerDelegationCredentialErrorWebhook - Made getAuthUrl async and updated all 3 call sites to await it - Removed .catch() wrappers at call sites (error handling is in trigger function) - Matches standard pattern used in WebhookService.sendPayload with Promise.allSettled - Ensures webhooks are sent before delegation errors are thrown Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * fix: address PR feedback - add migration, remove 'as any', remove user.name - Add Prisma migration for DELEGATION_CREDENTIAL_ERROR enum - Replace 'as any' type casting with safe type-narrowing helper in CalendarAuth.ts - Remove user.name field from DelegationCredentialErrorPayloadType (email is sufficient) - Ensure all type definitions are consistent across sendPayload.ts and dto/types.ts Addresses feedback from alishaz-polymath and morgan@cal.com Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * chore: cleanup type in CalendarAuth * fix: missing DELEGATION_CREDENTIAL_ERROR in WEBHOOK_TRIGGER_EVENTS_GROUPED_BY_APP constant * fix: review * fit: import webhook dto * fit: type error * feat: add delegation credential error webhook handling to Office365 video adapter - Emit webhook before throwing delegation credential errors in Office365 video - Added webhook emission in 4 locations: 1. Missing clientId/Secret in fetchNewTokenObject 2. Missing tenantId in getAuthUrl 3. Missing clientId/Secret in getAzureUserId 4. User doesn't exist in Azure AD - Made getAuthUrl async to support webhook emission - Follows same pattern as GoogleCalendar and Office365Calendar implementations Co-Authored-By: morgan@cal.com <morgan@cal.com> Co-Authored-By: rajiv@cal.com <sahalrajiv6900@gmail.com> * fixup! Merge branch 'devin/delegation-credential-errors-webhook-1762171203' of https://git-manager.devin.ai/proxy/github.com/calcom/cal.com into devin/delegation-credential-errors-webhook-1762171203 --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: cal.com <morgan@cal.com>
309 lines
12 KiB
TypeScript
309 lines
12 KiB
TypeScript
import { calendar_v3 } from "@googleapis/calendar";
|
|
import { OAuth2Client, JWT } from "googleapis-common";
|
|
|
|
import { triggerDelegationCredentialErrorWebhook } from "@calcom/features/webhooks/lib/triggerDelegationCredentialErrorWebhook";
|
|
import {
|
|
CalendarAppDelegationCredentialClientIdNotAuthorizedError,
|
|
CalendarAppDelegationCredentialInvalidGrantError,
|
|
CalendarAppDelegationCredentialError,
|
|
} from "@calcom/lib/CalendarAppError";
|
|
import {
|
|
APP_CREDENTIAL_SHARING_ENABLED,
|
|
CREDENTIAL_SYNC_ENDPOINT,
|
|
CREDENTIAL_SYNC_SECRET,
|
|
CREDENTIAL_SYNC_SECRET_HEADER_NAME,
|
|
} from "@calcom/lib/constants";
|
|
import logger from "@calcom/lib/logger";
|
|
import type { Prisma } from "@calcom/prisma/client";
|
|
import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";
|
|
|
|
import { invalidateCredential } from "../../_utils/invalidateCredential";
|
|
import { OAuthManager } from "../../_utils/oauth/OAuthManager";
|
|
import { oAuthManagerHelper } from "../../_utils/oauth/oAuthManagerHelper";
|
|
import { OAuth2UniversalSchema } from "../../_utils/oauth/universalSchema";
|
|
import { metadata } from "../_metadata";
|
|
import { getGoogleAppKeys } from "./getGoogleAppKeys";
|
|
|
|
type DelegatedTo = NonNullable<CredentialForCalendarServiceWithEmail["delegatedTo"]>;
|
|
const log = logger.getSubLogger({ prefix: ["app-store/googlecalendar/lib/CalendarAuth"] });
|
|
|
|
class MyGoogleOAuth2Client extends OAuth2Client {
|
|
constructor(client_id: string, client_secret: string, redirect_uri: string) {
|
|
super({
|
|
clientId: client_id,
|
|
clientSecret: client_secret,
|
|
redirectUri: redirect_uri,
|
|
// default: 5 * 60 * 1000, 5 minutes
|
|
// tho, fn will never run in excess of 60 seconds
|
|
eagerRefreshThresholdMillis: 60000,
|
|
});
|
|
}
|
|
|
|
isTokenExpiring() {
|
|
return super.isTokenExpiring();
|
|
}
|
|
|
|
async refreshToken(token: string | null | undefined) {
|
|
return super.refreshToken(token);
|
|
}
|
|
}
|
|
|
|
export class CalendarAuth {
|
|
private credential: CredentialForCalendarServiceWithEmail;
|
|
private jwtAuthClient: JWT | null = null;
|
|
private oAuthClient: MyGoogleOAuth2Client | null = null;
|
|
public authManager!: OAuthManager;
|
|
private authMechanism: ReturnType<CalendarAuth["initAuthMechanism"]>;
|
|
|
|
constructor(credential: CredentialForCalendarServiceWithEmail) {
|
|
this.credential = credential;
|
|
this.authMechanism = this.initAuthMechanism(credential);
|
|
}
|
|
|
|
private getAuthStrategy(): "jwt" | "oauth" {
|
|
return this.credential.delegatedToId ? "jwt" : "oauth";
|
|
}
|
|
|
|
private async getOAuthClientSingleton() {
|
|
if (this.oAuthClient) {
|
|
log.debug("Reusing existing oAuthClient");
|
|
return this.oAuthClient;
|
|
}
|
|
log.debug("Creating new oAuthClient");
|
|
const { client_id, client_secret, redirect_uris } = await getGoogleAppKeys();
|
|
const googleCredentials = OAuth2UniversalSchema.parse(this.credential.key);
|
|
this.oAuthClient = new MyGoogleOAuth2Client(client_id, client_secret, redirect_uris[0]);
|
|
this.oAuthClient.setCredentials(googleCredentials);
|
|
return this.oAuthClient;
|
|
}
|
|
|
|
private async getJwtClientSingleton({
|
|
emailToImpersonate,
|
|
delegatedTo,
|
|
}: {
|
|
emailToImpersonate: string | null;
|
|
delegatedTo: DelegatedTo;
|
|
}) {
|
|
if (!emailToImpersonate) {
|
|
log.error("DelegatedTo: No email to impersonate found for delegation credential");
|
|
return null;
|
|
}
|
|
const oauthClientIdAliasRegex = /\+[a-zA-Z0-9]{25}/;
|
|
if (!this.jwtAuthClient) {
|
|
log.debug("Creating new delegation credential authClient");
|
|
const authClient = new JWT({
|
|
email: delegatedTo.serviceAccountKey.client_email,
|
|
key: delegatedTo.serviceAccountKey.private_key,
|
|
scopes: ["https://www.googleapis.com/auth/calendar"],
|
|
subject: emailToImpersonate.replace(oauthClientIdAliasRegex, ""),
|
|
});
|
|
this.jwtAuthClient = authClient;
|
|
} else {
|
|
log.debug("Reusing existing delegation credential authClient");
|
|
}
|
|
return this.jwtAuthClient;
|
|
}
|
|
|
|
private async refreshOAuthToken({ refreshToken }: { refreshToken: string | null }) {
|
|
const oAuthClient = await this.getOAuthClientSingleton();
|
|
return oAuthClient.refreshToken(refreshToken);
|
|
}
|
|
|
|
private refreshJwtToken = async ({ delegatedTo }: { delegatedTo: DelegatedTo }) => {
|
|
log.debug("Attempting to authorize using JWT auth");
|
|
const { user } = this.credential;
|
|
const emailToImpersonate = user?.email ?? null;
|
|
const authClient = await this.getJwtClientSingleton({ delegatedTo, emailToImpersonate });
|
|
if (!authClient) {
|
|
log.error("JWT auth: No auth client found");
|
|
return null;
|
|
}
|
|
try {
|
|
log.debug("Authorizing using JWT auth");
|
|
return await authClient.authorize();
|
|
} catch (error) {
|
|
log.error("DelegatedTo: Error authorizing using JWT auth", JSON.stringify(error));
|
|
|
|
let delegationError: CalendarAppDelegationCredentialError;
|
|
|
|
const errorCode = (error as { response?: { data?: { error?: string } } }).response?.data?.error;
|
|
if (errorCode === "unauthorized_client") {
|
|
delegationError = new CalendarAppDelegationCredentialClientIdNotAuthorizedError(
|
|
"Make sure that the Client ID for the delegation credential is added to the Google Workspace Admin Console"
|
|
);
|
|
} else if (errorCode === "invalid_grant") {
|
|
delegationError = new CalendarAppDelegationCredentialInvalidGrantError(
|
|
`User ${emailToImpersonate} might not exist in Google Workspace`
|
|
);
|
|
} else {
|
|
// Catch all error
|
|
delegationError = new CalendarAppDelegationCredentialError("Error authorizing delegation credential");
|
|
}
|
|
|
|
if (user && user.email && this.credential.appId) {
|
|
await triggerDelegationCredentialErrorWebhook({
|
|
error: delegationError,
|
|
credential: {
|
|
id: this.credential.id,
|
|
type: this.credential.type,
|
|
appId: this.credential.appId,
|
|
},
|
|
user: {
|
|
id: this.credential.userId ?? 0,
|
|
email: user.email,
|
|
},
|
|
orgId: this.credential.teamId,
|
|
});
|
|
}
|
|
|
|
throw delegationError;
|
|
}
|
|
};
|
|
|
|
private initAuthMechanism(credential: CredentialForCalendarServiceWithEmail) {
|
|
const authStrategy = this.getAuthStrategy();
|
|
const authManager = new OAuthManager({
|
|
// Keep it false for oauth because Google's OAuth2Client library that we use supports token expiry check, itself when we use the client to make any request
|
|
// We keep it true for jwt because JWT Client doesn't support token expiry check and we do it ourselves
|
|
autoCheckTokenExpiryOnRequest: authStrategy !== "oauth",
|
|
...(authStrategy === "oauth"
|
|
? {
|
|
// Use Google's OAuth2Client library itself to check if the token is expiring
|
|
// For JWT, OAuthManager will do it itself
|
|
isTokenExpiring: async () => {
|
|
const oAuthClient = await this.getOAuthClientSingleton();
|
|
return oAuthClient.isTokenExpiring();
|
|
},
|
|
}
|
|
: {}),
|
|
credentialSyncVariables: {
|
|
APP_CREDENTIAL_SHARING_ENABLED: APP_CREDENTIAL_SHARING_ENABLED,
|
|
CREDENTIAL_SYNC_ENDPOINT: CREDENTIAL_SYNC_ENDPOINT,
|
|
CREDENTIAL_SYNC_SECRET: CREDENTIAL_SYNC_SECRET,
|
|
CREDENTIAL_SYNC_SECRET_HEADER_NAME: CREDENTIAL_SYNC_SECRET_HEADER_NAME,
|
|
},
|
|
resourceOwner: {
|
|
type: "user",
|
|
id: credential.userId,
|
|
},
|
|
appSlug: metadata.slug,
|
|
getCurrentTokenObject: async () => {
|
|
return oAuthManagerHelper.getCurrentTokenObject(this.credential);
|
|
},
|
|
fetchNewTokenObject: async ({ refreshToken }: { refreshToken: string | null }) => {
|
|
let result;
|
|
if (authStrategy === "jwt" && this.credential.delegatedTo) {
|
|
log.debug("Fetching new token object for JWT auth");
|
|
result = {
|
|
// In case of JWT Token flow, there is no refresh token, so we need to refresh the token using Service Account
|
|
tokenObject: await this.refreshJwtToken({ delegatedTo: this.credential.delegatedTo }),
|
|
status: 200,
|
|
statusText: "OK",
|
|
};
|
|
}
|
|
|
|
if (!result || !result.tokenObject) {
|
|
log.debug("Fetching new token object for my Google Auth");
|
|
const tokenFetchedResult = await this.refreshOAuthToken({ refreshToken });
|
|
result = {
|
|
tokenObject: tokenFetchedResult.res?.data ?? null,
|
|
status: tokenFetchedResult.res?.status,
|
|
statusText: tokenFetchedResult.res?.statusText,
|
|
};
|
|
}
|
|
return new Response(JSON.stringify(result.tokenObject), {
|
|
status: result.status,
|
|
statusText: result.statusText,
|
|
});
|
|
},
|
|
isTokenObjectUnusable: async function (response) {
|
|
// TODO: Confirm that if this logic should go to isAccessTokenUnusable
|
|
if (!response.ok || (response.status < 200 && response.status >= 300)) {
|
|
const responseBody = await response.json();
|
|
if (responseBody.error === "invalid_grant") {
|
|
return {
|
|
reason: "invalid_grant",
|
|
};
|
|
}
|
|
}
|
|
return null;
|
|
},
|
|
isAccessTokenUnusable: async () => {
|
|
// As long as refresh_token is valid, access_token is regenerated and fixed automatically by Google Calendar when a problem with it is detected
|
|
// So, a situation where access_token is invalid but refresh_token is valid should not happen
|
|
return null;
|
|
},
|
|
invalidateTokenObject: () => invalidateCredential(this.credential.id),
|
|
expireAccessToken: async () => {
|
|
await oAuthManagerHelper.markTokenAsExpired(this.credential);
|
|
},
|
|
updateTokenObject: async (token) => {
|
|
await oAuthManagerHelper.updateTokenObjectInDb({
|
|
tokenObject: token,
|
|
authStrategy: this.getAuthStrategy(),
|
|
credentialId: this.credential.id,
|
|
userId: this.credential.userId ?? null,
|
|
delegatedToId: this.credential.delegatedToId ?? null,
|
|
credentialType: this.credential.type,
|
|
appId: metadata.slug,
|
|
});
|
|
if (this.oAuthClient) {
|
|
this.oAuthClient.setCredentials(token);
|
|
}
|
|
|
|
// Update cached credential as well
|
|
this.credential.key = token as Prisma.JsonValue;
|
|
},
|
|
});
|
|
this.authManager = authManager;
|
|
|
|
return {
|
|
getOAuthClientWithRefreshedToken: async () => {
|
|
const { token } = await authManager.getTokenObjectOrFetch();
|
|
if (!token) {
|
|
throw new Error("Invalid grant for Google Calendar app");
|
|
}
|
|
const oAuthClient = await this.getOAuthClientSingleton();
|
|
return oAuthClient;
|
|
},
|
|
getJwtClientWithRefreshedToken: async ({ delegatedTo }: { delegatedTo: DelegatedTo }) => {
|
|
log.debug("Getting JWT client with refreshed token");
|
|
await authManager.getTokenObjectOrFetch();
|
|
return this.getJwtClientSingleton({
|
|
emailToImpersonate: this.credential.user?.email ?? null,
|
|
delegatedTo,
|
|
});
|
|
},
|
|
};
|
|
}
|
|
|
|
/**
|
|
* Returns a Google Calendar client that is authenticated with the user's credentials.
|
|
* If the user is delegated, it will use the delegation credential.
|
|
* If the user is not delegated, it will use the user's OAuth credentials.
|
|
*/
|
|
public async getClient(): Promise<calendar_v3.Calendar> {
|
|
log.debug("Getting authed calendar client");
|
|
let googleAuthClient;
|
|
const authStrategy = this.getAuthStrategy();
|
|
|
|
if (authStrategy === "jwt" && this.credential.delegatedTo) {
|
|
googleAuthClient = await this.authMechanism.getJwtClientWithRefreshedToken({
|
|
delegatedTo: this.credential.delegatedTo,
|
|
});
|
|
}
|
|
|
|
if (!googleAuthClient) {
|
|
googleAuthClient = await this.authMechanism.getOAuthClientWithRefreshedToken();
|
|
}
|
|
|
|
if (!googleAuthClient) {
|
|
throw new Error("Failed to initialize Google Auth client");
|
|
}
|
|
|
|
return new calendar_v3.Calendar({
|
|
auth: googleAuthClient,
|
|
});
|
|
}
|
|
}
|