Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

Updated webhook request header and last triggered error mssg (#10035)

Browse source 
refs #9942

- Added error message if unknown status code on request failure
- Added event to payload
This commit is contained in:
Rishabh Garg 2018-10-19 18:41:03 +05:30 • committed by Kevin Ansfield
parent 99a2f3ba3a
commit e2d0b2e543
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/server/services/webhooks/listen.js
View file

@ -38,6 +38,7 @@ function listener(event, model, options) {
if (model) { if (model) {
payload = generatePayload(event, model); payload = generatePayload(event, model);
} }
payload.event = event;
// avoid triggering webhooks when importing // avoid triggering webhooks when importing
if (options && options.importing) { if (options && options.importing) {

4
core/server/services/webhooks/trigger.js
View file

@ -40,9 +40,11 @@ function makeRequests(webhooksCollection, payload, options) {
common.logging.warn(`Unable to destroy webhook ${webhookId}`); common.logging.warn(`Unable to destroy webhook ${webhookId}`);
}); });
} }
let lastTriggeredError = err.statusCode ? '' : `Failed to send request to ${targetUrl}`;
updateWebhookTriggerData(webhookId, { updateWebhookTriggerData(webhookId, {
last_triggered_at: triggeredAt, last_triggered_at: triggeredAt,
last_triggered_status: err.statusCode last_triggered_status: err.statusCode,
last_triggered_error: lastTriggeredError
}); });
common.logging.error(new common.errors.GhostError({ common.logging.error(new common.errors.GhostError({

10
core/test/unit/services/webhooks_spec.js
View file

@ -49,7 +49,8 @@ describe('Webhooks', function () {
triggerArgs = webhooksStub.trigger.getCall(0).args; triggerArgs = webhooksStub.trigger.getCall(0).args;
triggerArgs[0].should.eql('subscriber.added'); triggerArgs[0].should.eql('subscriber.added');
triggerArgs[1].should.deepEqual({ triggerArgs[1].should.deepEqual({
subscribers: [testSubscriber] subscribers: [testSubscriber],
event: 'subscriber.added'
}); });
resetWebhooks(); resetWebhooks();
@ -74,7 +75,8 @@ describe('Webhooks', function () {
triggerArgs = webhooksStub.trigger.getCall(0).args; triggerArgs = webhooksStub.trigger.getCall(0).args;
triggerArgs[0].should.eql('subscriber.deleted'); triggerArgs[0].should.eql('subscriber.deleted');
triggerArgs[1].should.deepEqual({ triggerArgs[1].should.deepEqual({
subscribers: [testSubscriber] subscribers: [testSubscriber],
event: 'subscriber.deleted'
}); });
resetWebhooks(); resetWebhooks();
@ -94,7 +96,9 @@ describe('Webhooks', function () {
triggerArgs = webhooksStub.trigger.getCall(0).args; triggerArgs = webhooksStub.trigger.getCall(0).args;
triggerArgs[0].should.eql('site.changed'); triggerArgs[0].should.eql('site.changed');
triggerArgs[1].should.eql({}); triggerArgs[1].should.eql({
event: 'site.changed'
});
resetWebhooks(); resetWebhooks();
}); });