ghost 5.9.4 → 5.11.0

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.9%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.11%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-facfdf4a7d9759c5b681340805f21fd8.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-1b0d7c731511bb738ec457d2932c43c0.css" title="light">
 
     
 </head>
@@ -53,9 +53,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-516c9e43b4aeb92079dc1ab92c9ce492.js"></script>
-<script src="assets/chunk.351.73f27952f867334a8228.js"></script>
-<script src="assets/chunk.143.1c158e8ef19f10e5439c.js"></script>
-    <script src="assets/ghost-b441c9cfa2e31453e86460e50ae7e378.js"></script>
+    <script src="assets/vendor-741dc0e4078e044a0c9bfaad104de8b3.js"></script>
+<script src="assets/chunk.579.65e09dd89eec70d059a0.js"></script>
+<script src="assets/chunk.143.14589cc066b8120b73e3.js"></script>
+    <script src="assets/ghost-40f5bd12d121c54bbc39e7939e78244f.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -233,6 +233,10 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
                 head.push(`<script defer src="${getAssetUrl('public/comment-counts.min.js')}" data-ghost-comments-counts-api="${urlUtils.getSiteUrl(true)}members/api/comments/counts/"></script>`);
             }
 
+            if (labs.isSet('memberAttribution')) {
+                head.push(`<script defer src="${getAssetUrl('public/member-attribution.min.js')}"></script>`);
+            }
+
             if (!_.isEmpty(globalCodeinjection)) {
                 head.push(globalCodeinjection);
             }

package/core/frontend/helpers/search.js

@@ -0,0 +1,42 @@
+// # search helper
+
+const {SafeString} = require('../services/handlebars');
+const {labs} = require('../services/proxy');
+
+function search() {
+    const svg = `<style>.gh-search-icon {
+                display: inline-flex;
+                justify-content: center;
+                align-items: center;
+                width: 32px;
+                height: 32px;
+                padding: 0;
+                border: 0;
+                color: inherit;
+                background-color: transparent;
+                cursor: pointer;
+                outline: none;
+            }</style>
+            <button class="gh-search-icon" aria-label="search" data-ghost-search>
+                <svg width="20" height="20" fill="none" viewBox="0 0 24 24">
+                    <path d="M14.949 14.949a1 1 0 0 1 1.414 0l6.344 6.344a1 1 0 0 1-1.414 1.414l-6.344-6.344a1 1 0 0 1 0-1.414Z"
+                    fill="currentColor"/>
+                    <path d="M10 3a7 7 0 1 0 0 14 7 7 0 0 0 0-14Zm-9 7a9 9 0 1 1 18 0 9 9 0 0 1-18 0Z" fill="currentColor"/>
+                </svg>
+            </button>`;
+
+    return new SafeString(svg);
+}
+
+module.exports = function searchLabsWrapper() {
+    let self = this;
+    let args = arguments;
+
+    return labs.enabledHelper({
+        flagKey: 'searchHelper',
+        flagName: 'Search helper',
+        helperName: 'search'
+    }, () => {
+        return search.apply(self, args); // eslint-disable-line camelcase
+    });
+};

package/core/frontend/services/member-attribution-assets/index.js

@@ -0,0 +1,4 @@
+const MemberAttributionAssetsService = require('./service');
+const memberAttributionAssets = new MemberAttributionAssetsService();
+
+module.exports = memberAttributionAssets;

package/core/frontend/services/member-attribution-assets/service.js

@@ -0,0 +1,83 @@
+// const debug = require('@tryghost/debug')('comments-counts-assets');
+const Minifier = require('@tryghost/minifier');
+const path = require('path');
+const fs = require('fs').promises;
+const logging = require('@tryghost/logging');
+const config = require('../../../shared/config');
+
+class MemberAttributionAssetsService {
+    constructor(options = {}) {
+        /** @private */
+        this.src = options.src || path.join(config.get('paths').assetSrc, 'member-attribution');
+        /** @private */
+        this.dest = options.dest || config.getContentPath('public');
+        /** @private */
+        this.minifier = new Minifier({src: this.src, dest: this.dest});
+    }
+
+    /**
+     * @private
+     */
+    generateGlobs() {
+        return {
+            'member-attribution.min.js': '*.js'
+        };
+    }
+
+    /**
+     * @private
+     */
+    generateReplacements() {
+        return {};
+    }
+
+    /**
+     * @private
+     * @returns {Promise<void>}
+     */
+    async minify(globs, options) {
+        try {
+            await this.minifier.minify(globs, options);
+        } catch (error) {
+            if (error.code === 'EACCES') {
+                logging.error('Ghost was not able to write member-attribution asset files due to permissions.');
+                return;
+            }
+
+            throw error;
+        }
+    }
+
+    /**
+     * @private
+     * @returns {Promise<void>}
+     */
+    async clearFiles() {
+        const rmFile = async (name) => {
+            await fs.unlink(path.join(this.dest, name));
+        };
+
+        const promises = [];
+        for (const key of Object.keys(this.generateGlobs())) {
+            // @deprecated switch this to use fs.rm when we drop support for Node v12
+            promises.push(rmFile(key));
+        }
+
+        // We don't care if removing these files fails as it's valid for them to not exist
+        await Promise.allSettled(promises);
+    }
+
+    /**
+     * Minify, move into the destination directory, and clear existing asset files.
+     *
+     * @returns {Promise<void>}
+     */
+    async load() {
+        const globs = this.generateGlobs();
+        const replacements = this.generateReplacements();
+        await this.clearFiles();
+        await this.minify(globs, {replacements});
+    }
+}
+
+module.exports = MemberAttributionAssetsService;

package/core/frontend/src/member-attribution/.eslintrc

@@ -0,0 +1,10 @@
+{
+    "extends": "../../../../.eslintrc.js",
+    "env": {
+        "browser": true,
+        "node": false
+    },
+    "rules": {
+        "no-console": "off"
+    }
+}

package/core/frontend/src/member-attribution/member-attribution.js

@@ -0,0 +1,90 @@
+// Location where we want to store the history in localStorage
+const STORAGE_KEY = 'ghost-history';
+
+// How long before an item should expire (24h)
+const TIMEOUT = 24 * 60 * 60 * 1000;
+
+// Maximum amount of urls in the history
+const LIMIT = 15;
+
+// History is saved in JSON format, from old to new
+// Time is saved to be able to exclude old items
+// [
+//     {
+//         "time": 12341234,
+//         "path": "/about/"
+//     },
+//     {
+//         "time": 12341235,
+//         "path": "/welcome/"
+//     }
+// ]
+
+(async function () {
+    try {
+        const storage = window.localStorage;
+        const historyString = storage.getItem(STORAGE_KEY);
+        const currentTime = new Date().getTime();
+
+        // Append current location
+        let history = [];
+
+        if (historyString) {
+            try {
+                history = JSON.parse(historyString);
+            } catch (error) {
+                // Ignore invalid JSON, ans clear history
+                console.warn('[Member Attribution] Error while parsing history', error);
+            }
+        }
+
+        // Remove all items that are expired
+        const firstNotExpiredIndex = history.findIndex((item) => {
+            // Return true to keep all items after and including this item
+            // Return false to remove the item
+
+            if (!item.time || typeof item.time !== 'number') {
+                return false;
+            }
+
+            const difference = currentTime - item.time;
+
+            if (isNaN(item.time) || difference > TIMEOUT) {
+                // Expired or invalid
+                return false;
+            }
+
+            // Valid item (so all following items are also valid by definition)
+            return true;
+        });
+        
+        if (firstNotExpiredIndex > 0) {
+            // Remove until the first valid item
+            history.splice(0, firstNotExpiredIndex);
+        } else if (firstNotExpiredIndex === -1) {
+            // Not a single valid item found, remove all
+            history = [];
+        }
+
+        const currentPath = window.location.pathname;
+
+        if (history.length === 0 || history[history.length - 1].path !== currentPath) {
+            history.push({
+                path: currentPath,
+                time: currentTime
+            });
+        } else if (history.length > 0) {
+            history[history.length - 1].time = currentTime;
+        }
+        
+        // Restrict length
+        if (history.length > LIMIT) {
+            history = history.slice(-LIMIT);
+        }
+
+        // Save current timestamp
+        storage.setItem(STORAGE_KEY, JSON.stringify(history));
+    } catch (error) {
+        console.error('[Member Attribution] Failed with error', error);
+    }
+})();

package/core/frontend/web/site.js

@@ -75,6 +75,9 @@ module.exports = function setupSiteApp(routerConfig) {
     // Comment counts
     siteApp.use(mw.servePublicFile('built', 'public/comment-counts.min.js', 'application/javascript', constants.ONE_YEAR_S));
 
+    // Member attribution
+    siteApp.use(mw.servePublicFile('built', 'public/member-attribution.min.js', 'application/javascript', constants.ONE_YEAR_S));
+
     // Serve blog images using the storage adapter
     siteApp.use(STATIC_IMAGE_URL_PREFIX, mw.handleImageSizes, storage.getStorage('images').serve());
     // Serve blog media using the storage adapter

package/core/server/adapters/cache/ImageSizesCacheSyncInMemory.js

@@ -0,0 +1,7 @@
+const Memory = require('./Memory');
+
+class ImageSizesCacheSyncInMemory extends Memory {
+
+}
+
+module.exports = ImageSizesCacheSyncInMemory;

package/core/server/adapters/cache/SettingsCacheSyncInMemory.js

@@ -0,0 +1,7 @@
+const Memory = require('./Memory');
+
+class SettingsCacheSyncInMemory extends Memory {
+
+}
+
+module.exports = SettingsCacheSyncInMemory;

package/core/server/api/endpoints/comments-members.js

@@ -189,8 +189,6 @@ module.exports = {
         validation: {},
         permissions: true,
         query(frame) {
-            frame.options.require = true;
-
             // TODO: move to likes service
             if (frame.options?.context?.member?.id) {
                 return models.CommentLike.destroy({
@@ -198,12 +196,17 @@ module.exports = {
                     destroyBy: {
                         member_id: frame.options.context.member.id,
                         comment_id: frame.options.id
-                    }
+                    },
+                    require: true
                 }).then(() => null)
-                    .catch(models.CommentLike.NotFoundError, () => {
-                        return Promise.reject(new errors.NotFoundError({
-                            message: tpl(messages.likeNotFound)
-                        }));
+                    .catch((err) => {
+                        if (err instanceof models.CommentLike.NotFoundError) {
+                            return Promise.reject(new errors.NotFoundError({
+                                message: tpl(messages.likeNotFound)
+                            }));
+                        }
+
+                        throw err;
                     });
             } else {
                 return Promise.reject(new errors.NotFoundError({

package/core/server/api/endpoints/invites.js

@@ -76,15 +76,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            frame.options.require = true;
-
-            return models.Invite.destroy(frame.options)
-                .then(() => null)
-                .catch(models.Invite.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.inviteNotFound)
-                    }));
-                });
+            return models.Invite.destroy({...frame.options, require: true});
         }
     },
 

package/core/server/api/endpoints/labels.js

@@ -150,13 +150,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            return models.Label.destroy(frame.options)
-                .then(() => null)
-                .catch(models.Label.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.labelNotFound)
-                    }));
-                });
+            return models.Label.destroy({...frame.options, require: true});
         }
     }
 };

package/core/server/api/endpoints/members.js

@@ -1,6 +1,5 @@
 // NOTE: We must not cache references to membersService.api
 // as it is a getter and may change during runtime.
-const Promise = require('bluebird');
 const moment = require('moment-timezone');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
@@ -253,20 +252,11 @@ module.exports = {
         },
         permissions: true,
         async query(frame) {
-            frame.options.require = true;
-            frame.options.cancelStripeSubscriptions = frame.options.cancel;
-
-            await Promise.resolve(membersService.api.members.destroy({
+            return membersService.api.members.destroy({
                 id: frame.options.id
-            }, frame.options)).catch(models.Member.NotFoundError, () => {
-                throw new errors.NotFoundError({
-                    message: tpl(messages.resourceNotFound, {
-                        resource: 'Member'
-                    })
-                });
+            }, {
+                ...frame.options, require: true, cancelStripeSubscriptions: frame.options.cancel
             });
-
-            return null;
         }
     },
 

package/core/server/api/endpoints/offers.js

@@ -49,7 +49,7 @@ module.exports = {
             const offer = await offersService.api.updateOffer({
                 ...frame.data.offers[0],
                 id: frame.options.id
-            });
+            }, frame.options);
 
             if (!offer) {
                 throw new errors.NotFoundError({
@@ -69,7 +69,7 @@ module.exports = {
             cacheInvalidate: true
         },
         async query(frame) {
-            const offer = await offersService.api.createOffer(frame.data.offers[0]);
+            const offer = await offersService.api.createOffer(frame.data.offers[0], frame.options);
             return {
                 data: [offer]
             };

package/core/server/api/endpoints/pages.js

@@ -2,7 +2,7 @@ const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const getPostServiceInstance = require('../../services/posts/posts-service');
-const ALLOWED_INCLUDES = ['tags', 'authors', 'authors.roles', 'tiers'];
+const ALLOWED_INCLUDES = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.conversions'];
 const UNSAFE_ATTRS = ['status', 'authors', 'visibility'];
 
 const messages = {
@@ -186,15 +186,7 @@ module.exports = {
             unsafeAttrs: UNSAFE_ATTRS
         },
         query(frame) {
-            frame.options.require = true;
-
-            return models.Post.destroy(frame.options)
-                .then(() => null)
-                .catch(models.Post.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.pageNotFound)
-                    }));
-                });
+            return models.Post.destroy({...frame.options, require: true});
         }
     }
 };

package/core/server/api/endpoints/posts.js

@@ -2,7 +2,16 @@ const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const getPostServiceInstance = require('../../services/posts/posts-service');
-const allowedIncludes = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter'];
+const allowedIncludes = [
+    'tags',
+    'authors',
+    'authors.roles',
+    'email',
+    'tiers',
+    'newsletter',
+    'count.signups',
+    'count.conversions'
+];
 const unsafeAttrs = ['status', 'authors', 'visibility'];
 
 const messages = {
@@ -183,15 +192,7 @@ module.exports = {
             unsafeAttrs: unsafeAttrs
         },
         query(frame) {
-            frame.options.require = true;
-
-            return models.Post.destroy(frame.options)
-                .then(() => null)
-                .catch(models.Post.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.postNotFound)
-                    }));
-                });
+            return models.Post.destroy({...frame.options, require: true});
         }
     }
 };

package/core/server/api/endpoints/snippets.js

@@ -101,15 +101,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            frame.options.require = true;
-
-            return models.Snippet.destroy(frame.options)
-                .then(() => null)
-                .catch(models.Snippet.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.snippetNotFound)
-                    }));
-                });
+            return models.Snippet.destroy({...frame.options, require: true});
         }
     }
 };

package/core/server/api/endpoints/tags.js

@@ -147,13 +147,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            return models.Tag.destroy(frame.options)
-                .then(() => null)
-                .catch(models.Tag.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.tagNotFound)
-                    }));
-                });
+            return models.Tag.destroy({...frame.options, require: true});
         }
     }
 };

package/core/server/api/endpoints/utils/serializers/input/pages.js

@@ -23,7 +23,7 @@ function defaultRelations(frame) {
         return false;
     }
 
-    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'tiers'];
+    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.conversions'];
 }
 
 function setDefaultOrder(frame) {

package/core/server/api/endpoints/utils/serializers/input/posts.js

@@ -23,7 +23,7 @@ function defaultRelations(frame) {
         return false;
     }
 
-    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter'];
+    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.conversions'];
 }
 
 function setDefaultOrder(frame) {

package/core/server/api/endpoints/utils/serializers/output/mappers/posts.js

@@ -10,6 +10,7 @@ const extraAttrs = require('../utils/extra-attrs');
 const gating = require('../utils/post-gating');
 const url = require('../utils/url');
 
+const labs = require('../../../../../../../shared/labs');
 const utils = require('../../../index');
 
 const postsMetaSchema = require('../../../../../../data/schema').tables.posts_meta;
@@ -109,5 +110,9 @@ module.exports = async (model, frame, options = {}) => {
         });
     }
 
+    if (!labs.isSet('memberAttribution')) {
+        delete jsonModel.count;
+    }
+
     return jsonModel;
 };

package/core/server/api/endpoints/utils/serializers/output/members.js

@@ -128,7 +128,8 @@ function serializeMember(member, options) {
         email_open_rate: json.email_open_rate,
         email_recipients: json.email_recipients,
         status: json.status,
-        last_seen_at: json.last_seen_at
+        last_seen_at: json.last_seen_at,
+        attribution: json.attribution
     };
 
     if (json.products) {

package/core/server/api/endpoints/utils/serializers/output/site.js

@@ -12,6 +12,7 @@ module.exports = {
                 'logo',
                 'icon',
                 'accent_color',
+                'locale',
                 'url',
                 'version',
                 'sentry_dsn',

package/core/server/api/endpoints/utils/serializers/output/utils/clean.js

@@ -32,6 +32,9 @@ const author = (attrs, frame) => {
         delete attrs.status;
         delete attrs.email;
         delete attrs.comment_notifications;
+        delete attrs.free_member_signup_notification;
+        delete attrs.paid_subscription_started_notification;
+        delete attrs.paid_subscription_canceled_notification;
 
         // @NOTE: used for night shift
         delete attrs.accessibility;
@@ -130,9 +133,6 @@ const post = (attrs, frame) => {
 
 const action = (attrs) => {
     if (attrs.actor) {
-        delete attrs.actor_id;
-        delete attrs.resource_id;
-
         if (attrs.actor_type === 'user') {
             attrs.actor = _.pick(attrs.actor, ['id', 'name', 'slug', 'profile_image']);
             attrs.actor.image = attrs.actor.profile_image;
@@ -142,12 +142,11 @@ const action = (attrs) => {
             attrs.actor.image = attrs.actor.icon_image;
             delete attrs.actor.icon_image;
         }
-    } else if (attrs.resource) {
-        delete attrs.actor_id;
-        delete attrs.resource_id;
+    }
 
+    if (attrs.resource) {
         // @NOTE: we only support posts right now
-        attrs.resource = _.pick(attrs.resource, ['id', 'title', 'slug', 'feature_image']);
+        attrs.resource = _.pick(attrs.resource, ['id', 'title', 'slug', 'feature_image', 'name']);
         attrs.resource.image = attrs.resource.feature_image;
         delete attrs.resource.feature_image;
     }

package/core/server/api/endpoints/webhooks.js

@@ -78,14 +78,7 @@ module.exports = {
             }
         },
         query({data, options}) {
-            return models.Webhook.edit(data.webhooks[0], Object.assign(options, {require: true}))
-                .catch(models.Webhook.NotFoundError, () => {
-                    throw new errors.NotFoundError({
-                        message: tpl(messages.resourceNotFound, {
-                            resource: 'Webhook'
-                        })
-                    });
-                });
+            return models.Webhook.edit(data.webhooks[0], {...options, require: true});
         }
     },
 
@@ -130,17 +123,7 @@ module.exports = {
             }
         },
         query(frame) {
-            frame.options.require = true;
-
-            return models.Webhook.destroy(frame.options)
-                .then(() => null)
-                .catch(models.Webhook.NotFoundError, () => {
-                    return Promise.reject(new errors.NotFoundError({
-                        message: tpl(messages.resourceNotFound, {
-                            resource: 'Webhook'
-                        })
-                    }));
-                });
+            return models.Webhook.destroy({...frame.options, require: true});
         }
     }
 };

package/core/server/data/exporter/table-lists.js

@@ -31,6 +31,8 @@ const BACKUP_TABLES = [
     'members_paid_subscription_events',
     'members_subscribe_events',
     'members_product_events',
+    'members_created_events',
+    'members_subscription_created_events',
     'members_newsletters',
     'comments',
     'comment_likes',