From cff0c483af142d084c2d6e648ff0076f3365ceb7 Mon Sep 17 00:00:00 2001 From: Naz Date: Fri, 17 Sep 2021 09:58:44 +0300 Subject: [PATCH] Updated v3 Webhook API to match v4 implementation refs https://github.com/TryGhost/Ghost/commit/70627d84a7005becf8797758a19a2705d66126b7 refs https://github.com/TryGhost/Ghost/commit/44035fd591d2b6fbbdc0a9765071930db35e1b0b 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 --- core/server/api/v3/webhooks.js | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/core/server/api/v3/webhooks.js b/core/server/api/v3/webhooks.js index 7dbd263b62..a114213c15 100644 --- a/core/server/api/v3/webhooks.js +++ b/core/server/api/v3/webhooks.js @@ -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') + }); + } + } } },