github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Align webhook payload with new hooks implementation (#10272)

Browse Source 
Fixes #9518
This commit is contained in:
Nicola Krumschmidt
2021-12-03 16:31:21 +01:00
committed by GitHub
parent 8ed517708e
commit 58a12d0f0e
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
api/src/webhooks.ts
View File

@@ -3,7 +3,6 @@ import getDatabase from './database';
import emitter from './emitter';
import logger from './logger';
import { ActionHandler, Webhook, WebhookHeader } from './types';
import { pick } from 'lodash';
import { WebhooksService } from './services';
import { getSchema } from './utils/get-schema';
@@ -16,18 +15,11 @@ export async function register(): Promise<void> {
const webhooks = await webhookService.readByQuery({ filter: { status: { _eq: 'active' } } });
for (const webhook of webhooks) {
if (webhook.actions.includes('*')) {
const event = 'items.*';
const handler = createHandler(webhook);
for (const action of webhook.actions) {
const event = `items.${action}`;
const handler = createHandler(webhook, event);
emitter.onAction(event, handler);
registered.push({ event, handler });
} else {
for (const action of webhook.actions) {
const event = `items.${action}`;
const handler = createHandler(webhook);
emitter.onAction(event, handler);
registered.push({ event, handler });
}
}
}
}
@@ -40,19 +32,20 @@ export function unregister(): void {
registered = [];
}
function createHandler(webhook: Webhook): ActionHandler {
return async (data) => {
if (webhook.collections.includes('*') === false && webhook.collections.includes(data.collection) === false) return;
function createHandler(webhook: Webhook, event: string): ActionHandler {
return async (meta, context) => {
if (webhook.collections.includes(meta.collection) === false) return;
const webhookPayload = pick(data, [
'event',
'accountability.user',
'accountability.role',
'collection',
'item',
'action',
'payload',
]);
const webhookPayload = {
event,
accountability: context.accountability
? {
user: context.accountability.user,
role: context.accountability.role,
}
: null,
...meta,
};
try {
await axios({