Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

Updated v3 Webhook API to match v4 implementation

Browse source 
refs 70627d84a7
refs 44035fd591
refs https://github.com/TryGhost/Team/issues/477

- When v4 Webhook API was changed removing redundant code v3 API code should've been updated as well. Making this change before extracting logic out into a WebhooksService to have clear chain of why the code that doesn't look the same has been substituted
This commit is contained in:
Naz 2021-09-17 09:58:44 +03:00
parent 38c7f42baf
commit cff0c483af
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
core/server/api/v3/webhooks.js
View file

@ -15,23 +15,6 @@ module.exports = {
data: [],
permissions: true,
async query(frame) {
const isIntegrationRequest = frame.options.context && frame.options.context.integration && frame.options.context.integration.id;
// NOTE: this check can be removed once `webhooks.integration_id` gets foreigh ke constraint (Ghost 4.0)
if (!isIntegrationRequest && frame.data.webhooks[0].integration_id) {
const integration = await models.Integration.findOne({id: frame.data.webhooks[0].integration_id}, {context: {internal: true}});
if (!integration) {
throw new errors.ValidationError({
message: i18n.t('notices.data.validation.index.schemaValidationFailed', {
key: 'integration_id'
}),
context: i18n.t('errors.api.webhooks.nonExistingIntegrationIdProvided.context'),
help: i18n.t('errors.api.webhooks.nonExistingIntegrationIdProvided.help')
});
}
}
const webhook = await models.Webhook.getByEventAndTarget(
frame.data.webhooks[0].event,
frame.data.webhooks[0].target_url,
@ -42,7 +25,20 @@ module.exports = {
throw new errors.ValidationError({message: i18n.t('errors.api.webhooks.webhookAlreadyExists')});
}
return models.Webhook.add(frame.data.webhooks[0], frame.options);
try {
const newWebhook = await models.Webhook.add(frame.data.webhooks[0], frame.options);
return newWebhook;
} catch (error) {
if (error.errno === 1452 || (error.code === 'SQLITE_CONSTRAINT' && /SQLITE_CONSTRAINT: FOREIGN KEY constraint failed/.test(error.message))) {
throw new errors.ValidationError({
message: i18n.t('notices.data.validation.index.schemaValidationFailed', {
key: 'integration_id'
}),
context: i18n.t('errors.api.webhooks.nonExistingIntegrationIdProvided.context'),
help: i18n.t('errors.api.webhooks.nonExistingIntegrationIdProvided.help')
});
}
}
}
},