The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Let Granola uninstall when no API key was saved (#28680)
Charles Bochetee1309b037f5
diff --git a/packages/twenty-apps/public/granola/package.json b/packages/twenty-apps/public/granola/package.jsonindex b9a465a946f..abc05fdaf75 100644--- a/packages/twenty-apps/public/granola/package.json+++ b/packages/twenty-apps/public/granola/package.json@@ -1,6 +1,6 @@{"name": "@twentyhq/granola",- "version": "1.0.0",+ "version": "1.0.1","description": "Sync Granola meeting notes into Twenty Call Recordings","license": "MIT","engines": {diff --git a/packages/twenty-apps/public/granola/src/logic-functions/__tests__/granola-uninstall.test.ts b/packages/twenty-apps/public/granola/src/logic-functions/__tests__/granola-uninstall.test.tsnew file mode 100644index 00000000000..172190433e9--- /dev/null+++ b/packages/twenty-apps/public/granola/src/logic-functions/__tests__/granola-uninstall.test.ts@@ -0,0 +1,50 @@+import { afterEach, describe, expect, it, vi } from 'vitest';++import { GRANOLA_WEBHOOK_REGISTRATION_KEY } from 'src/constants/granola.constant';+import { granolaUninstallHandler } from 'src/logic-functions/granola-uninstall';+import { GRANOLA_API_KEY_ENV_VAR_NAME } from 'src/logic-functions/constants/granola-api-key-env-var-name';++const { kvStore } = vi.hoisted(() => ({ kvStore: new Map<string, unknown>() }));++vi.mock('twenty-sdk/logic-function', async (importOriginal) => ({+ ...(await importOriginal<typeof import('twenty-sdk/logic-function')>()),+ kv: {+ get: vi.fn(async (key: string) => kvStore.get(key)),+ delete: vi.fn(async (key: string) => {+ kvStore.delete(key);+ }),+ },+}));++afterEach(() => {+ kvStore.clear();+ vi.unstubAllEnvs();+ vi.unstubAllGlobals();+});++describe('granolaUninstallHandler', () => {+ it('uninstalls without calling Granola when no API key was saved', async () => {+ vi.stubEnv(GRANOLA_API_KEY_ENV_VAR_NAME, '');+ const mockedFetch = vi.fn<typeof fetch>();+ vi.stubGlobal('fetch', mockedFetch);++ await expect(granolaUninstallHandler()).resolves.toEqual({+ deletedWebhookCount: 0,+ });+ expect(mockedFetch).not.toHaveBeenCalled();+ });++ it('clears a leftover registration when the API key was removed', async () => {+ vi.stubEnv(GRANOLA_API_KEY_ENV_VAR_NAME, '');+ vi.spyOn(console, 'error').mockImplementation(() => undefined);+ kvStore.set(GRANOLA_WEBHOOK_REGISTRATION_KEY, {+ registrationId: 'registration-id',+ webhookEndpointId: 'whe_example',+ });++ await expect(granolaUninstallHandler()).resolves.toEqual({+ deletedWebhookCount: 0,+ });+ expect(kvStore.has(GRANOLA_WEBHOOK_REGISTRATION_KEY)).toBe(false);+ });+});diff --git a/packages/twenty-apps/public/granola/src/logic-functions/granola-uninstall.ts b/packages/twenty-apps/public/granola/src/logic-functions/granola-uninstall.tsindex bd11d26c54f..f976cae152d 100644--- a/packages/twenty-apps/public/granola/src/logic-functions/granola-uninstall.ts+++ b/packages/twenty-apps/public/granola/src/logic-functions/granola-uninstall.ts@@ -1,27 +1,34 @@import { defineUninstallLogicFunction } from 'twenty-sdk/define';import { kv } from 'twenty-sdk/logic-function';+import { isDefined } from 'twenty-sdk/utils';import { GRANOLA_HISTORY_SCHEDULE_KEY } from 'src/constants/granola.constant';import { GRANOLA_UNINSTALL_UNIVERSAL_IDENTIFIER } from 'src/constants/universal-identifiers';import { cleanupPendingGranolaRegistrationOrThrow } from 'src/logic-functions/utils/cleanup-pending-granola-registration-or-throw.util';import { createGranolaClientOrThrow } from 'src/logic-functions/utils/create-granola-client-or-throw.util';+import { isGranolaApiKeySet } from 'src/logic-functions/utils/is-granola-api-key-set.util';import { removeGranolaWebhookRegistration } from 'src/logic-functions/utils/remove-granola-webhook-registration.util';import { toErrorMessage } from 'src/logic-functions/utils/to-error-message.util';export const granolaUninstallHandler = async () => {- const client = createGranolaClientOrThrow();- try {- const { webhook_endpoints: endpoints } =- await client.listWebhookEndpoints();- await cleanupPendingGranolaRegistrationOrThrow({- client,- endpoints,- apiUrl: process.env.TWENTY_API_URL,- });- } catch (error) {- console.error(- `[granola] Could not clean up the pending registration during uninstall; check Granola webhook settings. ${toErrorMessage(error)}`,- );+ const client = isGranolaApiKeySet()+ ? createGranolaClientOrThrow()+ : undefined;++ if (isDefined(client)) {+ try {+ const { webhook_endpoints: endpoints } =+ await client.listWebhookEndpoints();+ await cleanupPendingGranolaRegistrationOrThrow({+ client,+ endpoints,+ apiUrl: process.env.TWENTY_API_URL,+ });+ } catch (error) {+ console.error(+ `[granola] Could not clean up the pending registration during uninstall; check Granola webhook settings. ${toErrorMessage(error)}`,+ );+ }}await kv.delete(GRANOLA_HISTORY_SCHEDULE_KEY);diff --git a/packages/twenty-apps/public/granola/src/logic-functions/utils/remove-granola-webhook-registration.util.ts b/packages/twenty-apps/public/granola/src/logic-functions/utils/remove-granola-webhook-registration.util.tsindex 5baec4e9a1b..7b803be4b89 100644--- a/packages/twenty-apps/public/granola/src/logic-functions/utils/remove-granola-webhook-registration.util.ts+++ b/packages/twenty-apps/public/granola/src/logic-functions/utils/remove-granola-webhook-registration.util.ts@@ -14,7 +14,7 @@ import { toErrorMessage } from 'src/logic-functions/utils/to-error-message.util'export const removeGranolaWebhookRegistration = async ({client,}: {- client: Pick<+ client?: Pick<ReturnType<typeof createGranolaClientOrThrow>,'deleteWebhookEndpoint'>;@@ -31,15 +31,21 @@ export const removeGranolaWebhookRegistration = async ({let deletedWebhookCount = 0;- try {- await deleteStaleGranolaWebhookEndpointOrThrow({- client,- webhookEndpointId: registration.webhookEndpointId,- });- deletedWebhookCount = 1;- } catch (error) {+ if (isDefined(client)) {+ try {+ await deleteStaleGranolaWebhookEndpointOrThrow({+ client,+ webhookEndpointId: registration.webhookEndpointId,+ });+ deletedWebhookCount = 1;+ } catch (error) {+ console.error(+ `[granola] Could not remove endpoint ${registration.webhookEndpointId}; remove it in Granola settings. ${toErrorMessage(error)}`,+ );+ }+ } else {console.error(- `[granola] Could not remove endpoint ${registration.webhookEndpointId}; remove it in Granola settings. ${toErrorMessage(error)}`,+ `[granola] Could not remove endpoint ${registration.webhookEndpointId} without an API key; remove it in Granola settings.`,);}