diff --git a/packages/lib/server-only/webhooks/trigger-test-webhook.ts b/packages/lib/server-only/webhooks/trigger-test-webhook.ts index a45549bbb..40ad06b2a 100644 --- a/packages/lib/server-only/webhooks/trigger-test-webhook.ts +++ b/packages/lib/server-only/webhooks/trigger-test-webhook.ts @@ -32,7 +32,7 @@ export const triggerTestWebhook = async ({ try { await triggerWebhook({ event, - data: samplePayload, + data: samplePayload.payload, userId, teamId, }); diff --git a/packages/trpc/server/webhook-router/resend-webhook-call.ts b/packages/trpc/server/webhook-router/resend-webhook-call.ts index 298def29c..e355d27ef 100644 --- a/packages/trpc/server/webhook-router/resend-webhook-call.ts +++ b/packages/trpc/server/webhook-router/resend-webhook-call.ts @@ -39,12 +39,21 @@ export const resendWebhookCallRoute = authenticatedProcedure throw new AppError(AppErrorCode.NOT_FOUND); } + const requestBody = webhookCall.requestBody; + const data = + requestBody && + typeof requestBody === 'object' && + !Array.isArray(requestBody) && + 'payload' in requestBody + ? requestBody.payload + : requestBody; + await jobs.triggerJob({ name: 'internal.execute-webhook', payload: { event: webhookCall.event, webhookId, - data: webhookCall.requestBody, + data, }, }); });