diff --git a/app/scenes/Settings/components/WebhookSubscriptionForm.tsx b/app/scenes/Settings/components/WebhookSubscriptionForm.tsx index ae16e2888..fec6eee02 100644 --- a/app/scenes/Settings/components/WebhookSubscriptionForm.tsx +++ b/app/scenes/Settings/components/WebhookSubscriptionForm.tsx @@ -37,9 +37,9 @@ const WEBHOOK_EVENTS = { ], revision: ["revisions.create"], fileOperation: [ - "file_operations.create", - "file_operations.update", - "file_operations.delete", + "fileOperations.create", + "fileOperations.update", + "fileOperations.delete", ], collection: [ "collections.create", @@ -64,9 +64,9 @@ const WEBHOOK_EVENTS = { team: ["teams.update"], pin: ["pins.create", "pins.update", "pins.delete"], webhookSubscription: [ - "webhook_subscriptions.create", - "webhook_subscriptions.delete", - "webhook_subscriptions.update", + "webhookSubscriptions.create", + "webhookSubscriptions.delete", + "webhookSubscriptions.update", ], view: ["views.create"], }; diff --git a/server/models/Event.ts b/server/models/Event.ts index a6419ee06..e4d6ed1fe 100644 --- a/server/models/Event.ts +++ b/server/models/Event.ts @@ -171,8 +171,10 @@ class Event extends IdModel { "users.suspend", "users.activate", "users.delete", - "webhook_subscriptions.create", - "webhook_subscriptions.delete", + "fileOperations.create", + "fileOperations.delete", + "webhookSubscriptions.create", + "webhookSubscriptions.delete", ]; } diff --git a/server/queues/tasks/DeliverWebhookTask.ts b/server/queues/tasks/DeliverWebhookTask.ts index 49032af4e..8b8d86ab6 100644 --- a/server/queues/tasks/DeliverWebhookTask.ts +++ b/server/queues/tasks/DeliverWebhookTask.ts @@ -188,9 +188,9 @@ export default class DeliverWebhookTask extends BaseTask { case "shares.revoke": await this.handleShareEvent(subscription, event); return; - case "webhook_subscriptions.create": - case "webhook_subscriptions.delete": - case "webhook_subscriptions.update": + case "webhookSubscriptions.create": + case "webhookSubscriptions.delete": + case "webhookSubscriptions.update": await this.handleWebhookSubscriptionEvent(subscription, event); return; case "views.create": diff --git a/server/routes/api/webhookSubscriptions.ts b/server/routes/api/webhookSubscriptions.ts index 5d05d93ec..e60bf04fb 100644 --- a/server/routes/api/webhookSubscriptions.ts +++ b/server/routes/api/webhookSubscriptions.ts @@ -61,7 +61,7 @@ router.post( }); const event: WebhookSubscriptionEvent = { - name: "webhook_subscriptions.create", + name: "webhookSubscriptions.create", modelId: webhookSubscription.id, teamId: user.teamId, actorId: user.id, @@ -94,7 +94,7 @@ router.post( await webhookSubscription.destroy(); const event: WebhookSubscriptionEvent = { - name: "webhook_subscriptions.delete", + name: "webhookSubscriptions.delete", modelId: webhookSubscription.id, teamId: user.teamId, actorId: user.id, @@ -139,7 +139,7 @@ router.post( }); const event: WebhookSubscriptionEvent = { - name: "webhook_subscriptions.update", + name: "webhookSubscriptions.update", modelId: webhookSubscription.id, teamId: user.teamId, actorId: user.id, diff --git a/server/types.ts b/server/types.ts index cc4c1cf9f..88f87ef9a 100644 --- a/server/types.ts +++ b/server/types.ts @@ -276,9 +276,9 @@ export type ViewEvent = BaseEvent & { export type WebhookSubscriptionEvent = BaseEvent & { name: - | "webhook_subscriptions.create" - | "webhook_subscriptions.delete" - | "webhook_subscriptions.update"; + | "webhookSubscriptions.create" + | "webhookSubscriptions.delete" + | "webhookSubscriptions.update"; modelId: string; data: { name: string;