Skip to content

The open alternative to Salesforce, designed for AI.

Restore workflowRun.updated webhooks for explicit subscriptions (#25601)

Thomas Trompette646f6860e2d5
diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
index c5706eb8243..86876782e47 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/listeners/entity-events-to-db.listener.ts
@@ -88,34 +88,24 @@ export class EntityEventsToDbListener {
workspaceId: batchEvent.workspaceId,
}));
- const isWorkflowRunUpdate =
- action === DatabaseEventAction.UPDATED &&
- batchEvent.objectMetadata.universalIdentifier ===
- STANDARD_OBJECTS.workflowRun.universalIdentifier;
-
- const promises: Promise<void | string | undefined>[] = [
+ const batchEventForWebhook = {
+ ...batchEvent,
+ objectMetadata: {
+ id: batchEvent.objectMetadata.id,
+ nameSingular: batchEvent.objectMetadata.nameSingular,
+ },
+ };
+
+ const promises = [
this.objectRecordEventPublisher.publish(batchEvent),
- ];
-
- if (!isWorkflowRunUpdate) {
- const batchEventForWebhook = {
- ...batchEvent,
- objectMetadata: {
- id: batchEvent.objectMetadata.id,
- nameSingular: batchEvent.objectMetadata.nameSingular,
+ this.webhookQueueService.add<WorkspaceEventBatchForWebhook<T>>(
+ CallWebhookJobsJob.name,
+ batchEventForWebhook,
+ {
+ retryLimit: 3,
},
- };
-
- promises.push(
- this.webhookQueueService.add<WorkspaceEventBatchForWebhook<T>>(
- CallWebhookJobsJob.name,
- batchEventForWebhook,
- {
- retryLimit: 3,
- },
- ),
- );
- }
+ ),
+ ];
promises.push(
this.triggerQueueService.add<WorkspaceEventBatch<T>>(
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
index 718830660cf..dab93cc77de 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/jobs/call-webhook-jobs.job.ts
@@ -12,6 +12,7 @@ import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queu
import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
import { CallWebhookJob } from 'src/engine/metadata-modules/webhook/jobs/call-webhook.job';
import { type CallWebhookJobData } from 'src/engine/metadata-modules/webhook/types/webhook-job-data.type';
+import { computeWebhookOperationsToMatch } from 'src/engine/metadata-modules/webhook/utils/compute-webhook-operations-to-match.util';
import { transformEventBatchToWebhookEvents } from 'src/engine/metadata-modules/webhook/utils/transform-event-batch-to-webhook-events';
import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
import { WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
@@ -38,12 +39,10 @@ export class CallWebhookJobsJob {
const [nameSingular, operation] = workspaceEventBatch.name.split('.');
- const operationsToMatch = [
- `${nameSingular}.${operation}`,
- `*.${operation}`,
- `${nameSingular}.*`,
- '*.*',
- ];
+ const operationsToMatch = computeWebhookOperationsToMatch({
+ nameSingular,
+ operation,
+ });
const { flatWebhookMaps } = await this.workspaceCacheService.getOrRecompute(
workspaceEventBatch.workspaceId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/create-webhook.tool.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/create-webhook.tool.ts
index f33f131d1f1..1e554cb162e 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/create-webhook.tool.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/create-webhook.tool.ts
@@ -34,7 +34,7 @@ export const createCreateWebhookTool = (
Operations are structured entries discriminated by 'kind':
- {kind:'record', object:'person', event:'created'} → fires when a person is created (compiles to 'person.created').
-- {kind:'record', object:'*', event:'*'} → fires on every record event.
+- {kind:'record', object:'*', event:'*'} → fires on every record event except 'workflowRun.updated', which only matches an explicit {kind:'record', object:'workflowRun', event:'updated'} entry.
- {kind:'metadata', metadataName:'workflow', operation:'updated'} → fires when a workflow definition is updated (compiles to 'metadata.workflow.updated').
- {kind:'metadata', metadataName:'*', operation:'*'} → fires on every metadata change.
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/schemas/webhook-operation.schema.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/schemas/webhook-operation.schema.ts
index 78716098df4..caff8305b33 100644
--- a/packages/twenty-server/src/engine/metadata-modules/webhook/tools/schemas/webhook-operation.schema.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/tools/schemas/webhook-operation.schema.ts
@@ -41,5 +41,5 @@ export const webhookOperationSchema = z
)
.min(1)
.describe(
- "Events that trigger the webhook. Record events compile to '<object>.<event>' (e.g. 'person.created'). Metadata events compile to 'metadata.<metadataName>.<operation>' (e.g. 'metadata.workflow.updated'). Use [{kind:'record',object:'*',event:'*'}] to subscribe to all record events.",
+ "Events that trigger the webhook. Record events compile to '<object>.<event>' (e.g. 'person.created'). Metadata events compile to 'metadata.<metadataName>.<operation>' (e.g. 'metadata.workflow.updated'). Use [{kind:'record',object:'*',event:'*'}] to subscribe to all record events. Exception: 'workflowRun.updated' never matches wildcards and requires an explicit {kind:'record',object:'workflowRun',event:'updated'} entry.",
);
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/utils/__tests__/compute-webhook-operations-to-match.spec.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/utils/__tests__/compute-webhook-operations-to-match.spec.ts
new file mode 100644
index 00000000000..d9eb827cba4
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/utils/__tests__/compute-webhook-operations-to-match.spec.ts
@@ -0,0 +1,30 @@
+import { computeWebhookOperationsToMatch } from 'src/engine/metadata-modules/webhook/utils/compute-webhook-operations-to-match.util';
+
+describe('computeWebhookOperationsToMatch', () => {
+ it('matches exact and wildcard operations for a regular object event', () => {
+ expect(
+ computeWebhookOperationsToMatch({
+ nameSingular: 'company',
+ operation: 'updated',
+ }),
+ ).toEqual(['company.updated', '*.updated', 'company.*', '*.*']);
+ });
+
+ it('matches only the exact operation for workflowRun.updated', () => {
+ expect(
+ computeWebhookOperationsToMatch({
+ nameSingular: 'workflowRun',
+ operation: 'updated',
+ }),
+ ).toEqual(['workflowRun.updated']);
+ });
+
+ it('keeps wildcard matching for other workflowRun operations', () => {
+ expect(
+ computeWebhookOperationsToMatch({
+ nameSingular: 'workflowRun',
+ operation: 'created',
+ }),
+ ).toEqual(['workflowRun.created', '*.created', 'workflowRun.*', '*.*']);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/webhook/utils/compute-webhook-operations-to-match.util.ts b/packages/twenty-server/src/engine/metadata-modules/webhook/utils/compute-webhook-operations-to-match.util.ts
new file mode 100644
index 00000000000..217bc9d071a
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/webhook/utils/compute-webhook-operations-to-match.util.ts
@@ -0,0 +1,21 @@
+import { DatabaseEventAction } from 'src/engine/api/graphql/graphql-query-runner/enums/database-event-action';
+
+const WILDCARD_EXCLUDED_EVENT_NAMES = [
+ `workflowRun.${DatabaseEventAction.UPDATED}`,
+];
+
+export const computeWebhookOperationsToMatch = ({
+ nameSingular,
+ operation,
+}: {
+ nameSingular: string;
+ operation: string;
+}): string[] => {
+ const exactOperation = `${nameSingular}.${operation}`;
+
+ if (WILDCARD_EXCLUDED_EVENT_NAMES.includes(exactOperation)) {
+ return [exactOperation];
+ }
+
+ return [exactOperation, `*.${operation}`, `${nameSingular}.*`, '*.*'];
+};