diff --git a/packages/twenty-zapier/package.json b/packages/twenty-zapier/package.json index c34b0584b6..8e1b53ae12 100644 --- a/packages/twenty-zapier/package.json +++ b/packages/twenty-zapier/package.json @@ -27,6 +27,8 @@ "zapier-platform-core": "15.5.1" }, "devDependencies": { + "jest": "29.7.0", + "rimraf": "^3.0.2", "zapier-platform-cli": "^15.4.1" }, "installConfig": { diff --git a/packages/twenty-zapier/src/test/authentication.test.ts b/packages/twenty-zapier/src/test/authentication.test.ts index f0abbcf25e..587803c44a 100644 --- a/packages/twenty-zapier/src/test/authentication.test.ts +++ b/packages/twenty-zapier/src/test/authentication.test.ts @@ -1,5 +1,6 @@ -import App from '../index'; import { Bundle, createAppTester, tools, ZObject } from 'zapier-platform-core'; + +import App from '../index'; import getBundle from '../utils/getBundle'; import handleQueryParams from '../utils/handleQueryParams'; import requestDb from '../utils/requestDb'; @@ -43,7 +44,7 @@ describe('custom auth', () => { try { await appTester(App.authentication.test, bundle); } catch (error: any) { - expect(error.message).toContain('Unauthorized'); + expect(error.message).toContain('Unauthenticated'); return; } throw new Error('appTester should have thrown'); @@ -70,7 +71,7 @@ describe('custom auth', () => { try { await appTester(App.authentication.test, bundleWithExpiredApiKey); } catch (error: any) { - expect(error.message).toContain('Unauthorized'); + expect(error.message).toContain('Unauthenticated'); return; } throw new Error('appTester should have thrown'); diff --git a/packages/twenty-zapier/src/triggers/trigger_record.ts b/packages/twenty-zapier/src/triggers/trigger_record.ts index 2046dd3348..3e589fa8ea 100644 --- a/packages/twenty-zapier/src/triggers/trigger_record.ts +++ b/packages/twenty-zapier/src/triggers/trigger_record.ts @@ -52,12 +52,10 @@ export default { sample: { id: 'f75f6b2e-9442-4c72-aa95-47d8e5ec8cb3', createdAt: '2023-10-19T07:37:25.306Z', - workspaceId: 'c8b070fc-c969-4ca5-837a-e7c3735734d2', }, outputFields: [ { key: 'id', label: 'ID' }, { key: 'createdAt', label: 'Created At' }, - { key: 'workspaceId', label: 'Workspace ID' }, ], }, }; diff --git a/packages/twenty-zapier/src/utils/creates/creates.utils.ts b/packages/twenty-zapier/src/utils/creates/creates.utils.ts index 7df8925a39..4d940cbb32 100644 --- a/packages/twenty-zapier/src/utils/creates/creates.utils.ts +++ b/packages/twenty-zapier/src/utils/creates/creates.utils.ts @@ -2,6 +2,7 @@ import { Bundle, ZObject } from 'zapier-platform-core'; import { computeInputFields } from '../../utils/computeInputFields'; import { requestSchema } from '../../utils/requestDb'; +import { capitalize } from '../capitalize'; export const recordInputFields = async ( z: ZObject, @@ -9,7 +10,8 @@ export const recordInputFields = async ( idRequired = false, ) => { const schema = await requestSchema(z, bundle); - const infos = schema.components.schemas[bundle.inputData.nameSingular]; + const infos = + schema.components.schemas[capitalize(bundle.inputData.nameSingular)]; return computeInputFields(infos, idRequired); }; diff --git a/packages/twenty-zapier/src/utils/triggers/triggers.utils.ts b/packages/twenty-zapier/src/utils/triggers/triggers.utils.ts index 8cb4a656f5..8284f7310b 100644 --- a/packages/twenty-zapier/src/utils/triggers/triggers.utils.ts +++ b/packages/twenty-zapier/src/utils/triggers/triggers.utils.ts @@ -40,7 +40,20 @@ export const performUnsubscribe = async (z: ZObject, bundle: Bundle) => { }; export const perform = (z: ZObject, bundle: Bundle) => { - return [bundle.cleanedRequest.record]; + const record = bundle.cleanedRequest.record; + if (record.createdAt) { + record.createdAt = record.createdAt + 'Z'; + } + if (record.updatedAt) { + record.updatedAt = record.updatedAt + 'Z'; + } + if (record.revokedAt) { + record.revokedAt = record.revokedAt + 'Z'; + } + if (record.expiresAt) { + record.expiresAt = record.expiresAt + 'Z'; + } + return [record]; }; const getNamePluralFromNameSingular = async ( diff --git a/yarn.lock b/yarn.lock index 45da2979c5..fbbc23590f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -43225,6 +43225,8 @@ __metadata: version: 0.0.0-use.local resolution: "twenty-zapier@workspace:packages/twenty-zapier" dependencies: + jest: "npm:29.7.0" + rimraf: "npm:^3.0.2" zapier-platform-cli: "npm:^15.4.1" zapier-platform-core: "npm:15.5.1" languageName: unknown