ghost 4.46.0 → 4.47.0

package/core/built/assets/{ghost.min-30e597cb65b62b31a9422ca9c0eb2890.js → ghost.min-d8c670eb115c0acc183584e9d1dfd25b.js}

@@ -4350,6 +4350,6 @@ var i=t.default.create({properties:["name","event","targetUrl"],name(e){Ember.is
 e.default=i})),define("ghost-admin/views/application",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 var t=Ember.Component.extend({})
 e.default=t})),define("ghost-admin/config/environment",[],(function(){try{var e="ghost-admin/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(decodeURIComponent(t))}
-return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(i){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("ghost-admin/app").default.create({version:"4.46",name:"ghost-admin"})
+return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(i){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("ghost-admin/app").default.create({version:"4.47",name:"ghost-admin"})
 
-//# sourceMappingURL=ghost.min-30e597cb65b62b31a9422ca9c0eb2890.map
+//# sourceMappingURL=ghost.min-d8c670eb115c0acc183584e9d1dfd25b.map

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

@@ -142,7 +142,7 @@ function serializeMember(member, options) {
         }
         // override the `subscribed` param to mean "subscribed to any active newsletter"
         serialized.subscribed = false;
-        if (serialized.newsletters.length > 0) {
+        if (Array.isArray(serialized.newsletters) && serialized.newsletters.length > 0) {
             serialized.subscribed = true;
         }
     }

package/core/server/api/shared/http.js

@@ -82,9 +82,6 @@ const http = (apiImpl) => {
             res.status(statusCode);
 
             // CASE: generate headers based on the api ctrl configuration
-            if (req && req.headers && req.headers['accept-version'] && res.locals) {
-                headers['Content-Version'] = `v${res.locals.safeVersion}`;
-            }
             res.set(headers);
 
             const send = (format) => {

package/core/server/data/migrations/versions/4.46/2022-04-13-13-00-add-default-newsletter.js

@@ -4,35 +4,35 @@ const logging = require('@tryghost/logging');
 const startsWith = require('lodash/startsWith');
 const {createTransactionalMigration} = require('../../utils');
 
-// This uses the default settings from core/server/data/schema/default-settings/default-settings.json
-const newsletter = {
-    id: (new ObjectId()).toHexString(),
-    uuid: uuid.v4(),
-    name: 'Ghost',
-    description: '',
-    slug: 'default-newsletter',
-    sender_name: null,
-    sender_email: null,
-    sender_reply_to: 'newsletter',
-    status: 'active',
-    visibility: 'members',
-    subscribe_on_signup: true,
-    sort_order: 0,
-    body_font_category: 'sans_serif',
-    footer_content: '',
-    header_image: null,
-    show_badge: true,
-    show_feature_image: true,
-    show_header_icon: true,
-    show_header_title: true,
-    show_header_name: false,
-    title_alignment: 'center',
-    title_font_category: 'sans_serif',
-    created_at: new Date()
-};
-
 module.exports = createTransactionalMigration(
     async function up(knex) {
+        // This uses the default settings from core/server/data/schema/default-settings/default-settings.json
+        const newsletter = {
+            id: (new ObjectId()).toHexString(),
+            uuid: uuid.v4(),
+            name: 'Ghost',
+            description: '',
+            slug: 'default-newsletter',
+            sender_name: null,
+            sender_email: null,
+            sender_reply_to: 'newsletter',
+            status: 'active',
+            visibility: 'members',
+            subscribe_on_signup: true,
+            sort_order: 0,
+            body_font_category: 'sans_serif',
+            footer_content: '',
+            header_image: null,
+            show_badge: true,
+            show_feature_image: true,
+            show_header_icon: true,
+            show_header_title: true,
+            show_header_name: false,
+            title_alignment: 'center',
+            title_font_category: 'sans_serif',
+            created_at: knex.raw('CURRENT_TIMESTAMP')
+        };
+
         // Make sure the newsletter table is empty
         const newsletters = await knex('newsletters').count('*', {as: 'total'});
 
@@ -68,6 +68,13 @@ module.exports = createTransactionalMigration(
             if (startsWith(key, 'newsletter_')) {
                 key = key.slice(11);
             }
+
+            if (value === null && ['name', 'body_font_category', 'show_badge', 'show_feature_image', 'show_header_icon', 'show_header_title', 'title_alignment', 'title_font_category'].includes(key)) {
+                // Prevent setting null to non-nullable columns
+                // Default to defaults above in that case
+                continue;
+            }
+
             if (typeof newsletter[key] === 'boolean') {
                 newsletter[key] = value === 'true';
             } else {

package/core/server/data/migrations/versions/4.47/2022-05-03-15-30-update-newsletter-sending-options.js

@@ -0,0 +1,34 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+const find = require('lodash/find');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Migrating sender settings to default newsletter');
+
+        // Get all settings in one query
+        const settings = await knex('settings')
+            .whereIn('key', [
+                'members_from_address',
+                'members_reply_address'
+            ])
+            .select(['key', 'value']);
+
+        // sender_reply_to and members_reply_address are both enums ['newsletter', 'support']
+        const replyTo = find(settings, {key: 'members_reply_address'});
+        const fromAddress = find(settings, {key: 'members_from_address'});
+
+        // Update all newsletters that haven't been (re)configured already
+        await knex('newsletters')
+            .update({
+                // CASE: members_from_address is 'noreply' - we leave it as null to maintain fallback behaviour
+                sender_email: !fromAddress || fromAddress.value === 'noreply' ? undefined : fromAddress.value,
+                sender_reply_to: replyTo ? replyTo.value : undefined
+            })
+            .whereNull('sender_email')
+            .where('sender_reply_to', 'newsletter');
+    },
+    async function down() {
+        // no-op
+    }
+);

package/core/server/data/migrations/versions/4.47/2022-05-04-10-03-transform-newsletter-header-image.js

@@ -0,0 +1,26 @@
+const logging = require('@tryghost/logging');
+const urlUtils = require('../../../../../shared/url-utils');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const newsletters = await knex.select('id', 'header_image').from('newsletters').whereNotNull('header_image');
+
+        logging.info(`Transforming header_image to transformReady format for ${newsletters.length} newsletters.`);
+
+        // eslint-disable-next-line no-restricted-syntax
+        for (const newsletter of newsletters) {
+            await knex('newsletters').update('header_image', urlUtils.toTransformReady(newsletter.header_image)).where('id', newsletter.id);
+        }
+    },
+    async function down(knex) {
+        const newsletters = await knex.select('id', 'header_image').from('newsletters').whereNotNull('header_image');
+
+        logging.info(`Transforming header_image to absolute format for ${newsletters.length} newsletters.`);
+
+        // eslint-disable-next-line no-restricted-syntax
+        for (const newsletter of newsletters) {
+            await knex('newsletters').update('header_image', urlUtils.transformReadyToAbsolute(newsletter.header_image)).where('id', newsletter.id);
+        }
+    }
+);

package/core/server/models/newsletter.js

@@ -1,6 +1,7 @@
 const ghostBookshelf = require('./base');
 const ObjectID = require('bson-objectid');
 const uuid = require('uuid');
+const urlUtils = require('../../shared/url-utils');
 
 const Newsletter = ghostBookshelf.Model.extend({
     tableName: 'newsletters',
@@ -74,6 +75,28 @@ const Newsletter = ghostBookshelf.Model.extend({
         }
 
         return query;
+    },
+
+    formatOnWrite(attrs) {
+        ['header_image'].forEach((attr) => {
+            if (attrs[attr]) {
+                attrs[attr] = urlUtils.toTransformReady(attrs[attr]);
+            }
+        });
+
+        return attrs;
+    },
+
+    parse() {
+        const attrs = ghostBookshelf.Model.prototype.parse.apply(this, arguments);
+
+        ['header_image'].forEach((attr) => {
+            if (attrs[attr]) {
+                attrs[attr] = urlUtils.transformReadyToAbsolute(attrs[attr]);
+            }
+        });
+
+        return attrs;
     }
 }, {
     orderDefaultRaw: function () {

package/core/server/services/api-version-compatibility/index.js

@@ -1,9 +1,13 @@
 const APIVersionCompatibilityService = require('@tryghost/api-version-compatibility-service');
 const VersionNotificationsDataService = require('@tryghost/version-notifications-data-service');
+const versionMismatchHandler = require('@tryghost/mw-api-version-mismatch');
 // const {GhostMailer} = require('../mail');
 const settingsService = require('../../services/settings');
 const models = require('../../models');
 const logging = require('@tryghost/logging');
+const ghostVersion = require('@tryghost/version');
+
+let serviceInstance;
 
 const init = () => {
     //const ghostMailer = new GhostMailer();
@@ -12,7 +16,7 @@ const init = () => {
         settingsService: settingsService.getSettingsBREADServiceInstance()
     });
 
-    this.APIVersionCompatibilityServiceInstance = new APIVersionCompatibilityService({
+    serviceInstance = new APIVersionCompatibilityService({
         sendEmail: (options) => {
             // NOTE: not using bind here because mockMailer is having trouble mocking bound methods
             //return ghostMailer.send(options);
@@ -25,5 +29,15 @@ const init = () => {
     });
 };
 
-module.exports.APIVersionCompatibilityServiceInstance;
+module.exports.errorHandler = (req, res, next) => {
+    return versionMismatchHandler(serviceInstance)(req, res, next);
+};
+
+module.exports.contentVersion = (req, res, next) => {
+    if (req.header('accept-version')) {
+        res.header('Content-Version', `v${ghostVersion.safe}`);
+    }
+    next();
+};
+
 module.exports.init = init;

package/core/server/services/members/config.js

@@ -4,7 +4,6 @@ const tpl = require('@tryghost/tpl');
 const {URL} = require('url');
 const crypto = require('crypto');
 const createKeypair = require('keypair');
-const path = require('path');
 
 const messages = {
     incorrectKeyType: 'type must be one of "direct" or "connect".'
@@ -36,13 +35,8 @@ class MembersConfigProvider {
     }
 
     getEmailFromAddress() {
-        const fromAddress = this._settingsCache.get('members_from_address') || 'noreply';
-
-        // Any fromAddress without domain uses site domain, like default setting `noreply`
-        if (fromAddress.indexOf('@') < 0) {
-            return `${fromAddress}@${this._getDomain()}`;
-        }
-        return fromAddress;
+        // Individual from addresses are set per newsletter - this is the fallback address
+        return `noreply@${this._getDomain()}`;
     }
 
     getEmailSupportAddress() {
@@ -190,10 +184,7 @@ class MembersConfigProvider {
     }
 
     getTokenConfig() {
-        const {href: membersApiUrl} = new URL(
-            this._urlUtils.getApiPath({version: 'v4', type: 'members'}),
-            this._urlUtils.urlFor('admin', true)
-        );
+        const membersApiUrl = this._urlUtils.urlFor({relativeUrl: '/members/api'}, true);
 
         let privateKey = this._settingsCache.get('members_private_key');
         let publicKey = this._settingsCache.get('members_public_key');
@@ -213,12 +204,11 @@ class MembersConfigProvider {
     }
 
     getSigninURL(token, type) {
-        const siteUrl = this._urlUtils.getSiteUrl();
+        const siteUrl = this._urlUtils.urlFor({relativeUrl: '/members/'}, true);
         const signinURL = new URL(siteUrl);
-        signinURL.pathname = path.join(signinURL.pathname, '/members/');
         signinURL.searchParams.set('token', token);
         signinURL.searchParams.set('action', type);
-        return signinURL.href;
+        return signinURL.toString();
     }
 }
 

package/core/server/services/members/service.js

@@ -157,12 +157,12 @@ module.exports = {
         });
 
         new LastSeenAtUpdater({
-            models: {
-                Member: models.Member
-            },
             services: {
                 domainEvents: DomainEvents,
                 settingsCache
+            },
+            async getMembersApi() {
+                return membersApi;
             }
         });
 

package/core/server/web/admin/views/default-prod.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%2F%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%224.46%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%2F%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%224.47%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" />
@@ -57,7 +57,7 @@
 
 
                 <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-30e597cb65b62b31a9422ca9c0eb2890.js"></script>
+                <script src="assets/ghost.min-d8c670eb115c0acc183584e9d1dfd25b.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.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%2F%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%224.46%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%2F%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%224.47%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" />
@@ -57,7 +57,7 @@
 
 
                 <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-30e597cb65b62b31a9422ca9c0eb2890.js"></script>
+                <script src="assets/ghost.min-d8c670eb115c0acc183584e9d1dfd25b.js"></script>
             
 </body>
 </html>

package/core/server/web/api/app.js

@@ -4,8 +4,7 @@ const express = require('../../../shared/express');
 const urlUtils = require('../../../shared/url-utils');
 const sentry = require('../../../shared/sentry');
 const errorHandler = require('@tryghost/mw-error-handler');
-const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
-const {APIVersionCompatibilityServiceInstance} = require('../../services/api-version-compatibility');
+const APIVersionCompatibilityService = require('../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Parent API setup start');
@@ -15,6 +14,8 @@ module.exports = function setupApiApp() {
         apiApp.use(require('./testmode')());
     }
 
+    apiApp.use(APIVersionCompatibilityService.contentVersion);
+
     apiApp.lazyUse(urlUtils.getVersionPath({version: 'v2', type: 'content'}), require('./v2/content/app'));
     apiApp.lazyUse(urlUtils.getVersionPath({version: 'v2', type: 'admin'}), require('./v2/admin/app'));
 
@@ -32,7 +33,7 @@ module.exports = function setupApiApp() {
 
     // Error handling for requests to non-existent API versions
     apiApp.use(errorHandler.resourceNotFound);
-    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
+    apiApp.use(APIVersionCompatibilityService.errorHandler);
     apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Parent API setup end');

package/core/server/web/api/canary/admin/app.js

@@ -5,10 +5,9 @@ const bodyParser = require('body-parser');
 const shared = require('../../../shared');
 const apiMw = require('../../middleware');
 const errorHandler = require('@tryghost/mw-error-handler');
-const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
 const sentry = require('../../../../../shared/sentry');
 const routes = require('./routes');
-const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
+const APIVersionCompatibilityService = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Admin API canary setup start');
@@ -35,7 +34,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
-    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
+    apiApp.use(APIVersionCompatibilityService.errorHandler);
     apiApp.use(errorHandler.handleJSONResponseV2(sentry));
 
     debug('Admin API canary setup end');

package/core/server/web/api/v2/admin/app.js

@@ -7,8 +7,7 @@ const shared = require('../../../shared');
 const apiMw = require('../../middleware');
 const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
-const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
-const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
+const APIVersionCompatibilityService = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Admin API v2 setup start');
@@ -35,7 +34,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
-    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
+    apiApp.use(APIVersionCompatibilityService.errorHandler);
     apiApp.use(errorHandler.handleJSONResponseV2(sentry));
 
     debug('Admin API v2 setup end');

package/core/server/web/api/v3/admin/app.js

@@ -7,8 +7,7 @@ const shared = require('../../../shared');
 const apiMw = require('../../middleware');
 const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
-const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
-const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
+const APIVersionCompatibilityService = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Admin API v3 setup start');
@@ -35,7 +34,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
-    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
+    apiApp.use(APIVersionCompatibilityService.errorHandler);
     apiApp.use(errorHandler.handleJSONResponseV2(sentry));
 
     debug('Admin API v3 setup end');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.46.0",
+  "version": "4.47.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -67,11 +67,11 @@
     "@tryghost/custom-theme-settings-service": "0.3.2",
     "@tryghost/database-info": "0.3.3",
     "@tryghost/debug": "0.1.16",
-    "@tryghost/domain-events": "0.1.10",
+    "@tryghost/domain-events": "0.1.12",
     "@tryghost/email-analytics-provider-mailgun": "1.0.8",
     "@tryghost/email-analytics-service": "1.0.6",
     "@tryghost/errors": "1.2.12",
-    "@tryghost/express-dynamic-redirects": "0.2.9",
+    "@tryghost/express-dynamic-redirects": "0.2.11",
     "@tryghost/helpers": "1.1.64",
     "@tryghost/image-transform": "1.0.30",
     "@tryghost/job-manager": "0.8.22",
@@ -82,14 +82,14 @@
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.5",
     "@tryghost/limit-service": "1.1.0",
     "@tryghost/logging": "2.1.8",
-    "@tryghost/magic-link": "1.0.22",
-    "@tryghost/member-events": "0.4.2",
-    "@tryghost/members-api": "6.2.3",
-    "@tryghost/members-events-service": "0.3.4",
-    "@tryghost/members-importer": "0.5.10",
-    "@tryghost/members-offers": "0.11.2",
-    "@tryghost/members-ssr": "1.0.24",
-    "@tryghost/members-stripe-service": "0.10.1",
+    "@tryghost/magic-link": "1.0.24",
+    "@tryghost/member-events": "0.4.4",
+    "@tryghost/members-api": "6.3.1",
+    "@tryghost/members-events-service": "0.4.1",
+    "@tryghost/members-importer": "0.5.12",
+    "@tryghost/members-offers": "0.11.4",
+    "@tryghost/members-ssr": "1.0.26",
+    "@tryghost/members-stripe-service": "0.10.3",
     "@tryghost/metrics": "1.0.11",
     "@tryghost/minifier": "0.1.13",
     "@tryghost/mw-api-version-mismatch": "0.1.1",
@@ -111,7 +111,7 @@
     "@tryghost/update-check-service": "0.3.2",
     "@tryghost/url-utils": "2.1.0",
     "@tryghost/validator": "0.1.24",
-    "@tryghost/verification-trigger": "0.2.1",
+    "@tryghost/verification-trigger": "0.2.3",
     "@tryghost/version": "0.1.14",
     "@tryghost/version-notifications-data-service": "0.1.0",
     "@tryghost/vhost-middleware": "1.0.24",

package/yarn.lock

@@ -1892,10 +1892,10 @@
     "@tryghost/root-utils" "^0.3.14"
     debug "^4.3.1"
 
-"@tryghost/domain-events@0.1.10", "@tryghost/domain-events@^0.1.10":
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/@tryghost/domain-events/-/domain-events-0.1.10.tgz#1a657c7964b928ac63e7ada87902d6fa5d4f5a7a"
-  integrity sha512-C6xqg8VC5KgfgZ0X4zMUcoRBEDk7DS8xSepbIfZx61UZHbJRUMfbZ+AklGdnNQmQFxBc3eUCLAOByF6k1HXvTQ==
+"@tryghost/domain-events@0.1.12", "@tryghost/domain-events@^0.1.12":
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/@tryghost/domain-events/-/domain-events-0.1.12.tgz#a6f59d0d7aeb7d8f0a7493e055ed3b795e783232"
+  integrity sha512-DY70kL0x+/VEJsqmjZ4Q3UJPOFJ8m+sT8443E+AEgTGFiERfSVuTsVVlYtQm0hQV5faowQJtGcXQqtG1Lka0ig==
 
 "@tryghost/elasticsearch-bunyan@0.1.1":
   version "0.1.1"
@@ -1948,10 +1948,10 @@
     utils-copy-error "^1.0.1"
     uuid "^8.3.2"
 
-"@tryghost/express-dynamic-redirects@0.2.9":
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/@tryghost/express-dynamic-redirects/-/express-dynamic-redirects-0.2.9.tgz#62094c67bce0c5e6918a292e8a7e0d8d4c72aa16"
-  integrity sha512-BguBNvq+E/wEiJ+FJv5C5g0Q9Xj4PZEwy5Zs7GWkqUFGiDB3Evfpsj02MucNyuC1ysxz1FwpEyr2NRxk65ZkQg==
+"@tryghost/express-dynamic-redirects@0.2.11":
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/@tryghost/express-dynamic-redirects/-/express-dynamic-redirects-0.2.11.tgz#7b2906c21d40923e0431d1ba98bb613a8f1caad3"
+  integrity sha512-JzodLoRxNXjBT3zdBfiagpgOkLooa1houoskU8NqEIsfMfrszb468jon5EALVOS9y57Hff0V7x8ulf2gTjPy1g==
 
 "@tryghost/express-test@0.10.0":
   version "0.10.0"
@@ -2108,55 +2108,55 @@
     json-stringify-safe "^5.0.1"
     lodash "^4.17.21"
 
-"@tryghost/magic-link@1.0.22", "@tryghost/magic-link@^1.0.22":
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/@tryghost/magic-link/-/magic-link-1.0.22.tgz#1bfa1fa93efb0d493f242ed400e8b663fc0c7e60"
-  integrity sha512-d+uut21jb3iW6x7yqMvNcd7nBT5Y2VMTu4pFVA+eXkFQSQxFY+AD3qSeJxkSXp5KxFpKOZRRJycrG2Ppsh8TaA==
+"@tryghost/magic-link@1.0.24", "@tryghost/magic-link@^1.0.24":
+  version "1.0.24"
+  resolved "https://registry.yarnpkg.com/@tryghost/magic-link/-/magic-link-1.0.24.tgz#6cbcb46640cd7d0b327e442d60837dbc5c4ddd80"
+  integrity sha512-BmN+jFgBgpawZs/sj95fW9skrDjGoOYB55xMrMwkAlPVZRXBIwceI2Lrecn5doQgi5eDzkgWqsBomuV9dP40Mw==
   dependencies:
     bluebird "^3.5.5"
     jsonwebtoken "^8.5.1"
     lodash "^4.17.15"
 
-"@tryghost/member-analytics-service@^0.1.12":
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/@tryghost/member-analytics-service/-/member-analytics-service-0.1.12.tgz#dbf3ef1ee7e7732ca9e162a0b10608207ebf9032"
-  integrity sha512-Mat32Q1rIo1N5WvjzJsyterBzVhEkSkAbsCa8nXOPsmCk/rRmOY9aO/KD6B6wQB84whMgK0Y2+QpYQk2lLmVtQ==
+"@tryghost/member-analytics-service@^0.1.14":
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/@tryghost/member-analytics-service/-/member-analytics-service-0.1.14.tgz#04eed2461e448dabcbef32bdf9d7bdd49b6d5e98"
+  integrity sha512-atKb2EtKkhH174JrG0RTcJGG0nEypbyIY5CrXTAbfXA3aOEpdM5zFKS7gcDLje+A8BIyJRt07I5f72VngjJcNw==
   dependencies:
-    "@tryghost/domain-events" "^0.1.10"
+    "@tryghost/domain-events" "^0.1.12"
     "@tryghost/errors" "^1.0.0"
-    "@tryghost/member-events" "^0.4.2"
+    "@tryghost/member-events" "^0.4.4"
     "@tryghost/tpl" "^0.1.4"
     bson-objectid "^2.0.1"
 
-"@tryghost/member-events@0.4.2", "@tryghost/member-events@^0.4.2":
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@tryghost/member-events/-/member-events-0.4.2.tgz#d1266abad38aa0b8f9b9f3395b083971e85221bf"
-  integrity sha512-4VlGlB9uq3xxgeW3OXx9//Yb1kiRm7HbVVGiBJ9LMMjeoKZnpUQA9zHyY5FUK4Aolvz/wyxjb4Ci7JNjvoMrJg==
+"@tryghost/member-events@0.4.4", "@tryghost/member-events@^0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@tryghost/member-events/-/member-events-0.4.4.tgz#8185d7924d0e341bb93084d6b3e97f1cadd3dac6"
+  integrity sha512-p/KlP0EzXeR2AE134kh+TnPgUcnnh+3QoVWmIYOunayJVv177HBaHu7a9yX5PYJ9RxQcCJn4UmuAPloW+3mjnw==
 
-"@tryghost/members-analytics-ingress@^0.1.13":
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-analytics-ingress/-/members-analytics-ingress-0.1.13.tgz#6ab72155aea2defe44b88c79520d645f6dd54c78"
-  integrity sha512-XaEll3ea0yXJofdiP1a2I6GWnc+kPcoMe8lWZ3r8qOVtfD7Yynkd3sL7JBC9I3RRihCQYxmKka7+AOTh69V+XA==
+"@tryghost/members-analytics-ingress@^0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-analytics-ingress/-/members-analytics-ingress-0.1.15.tgz#d4f751b7dc33dfe383e8958f3d8f84ce962b124c"
+  integrity sha512-nCQIdLUqnAzehPu5glCj5EaRV/+C5wiBC5stSiJ4M9yrn7Zn+7AKe6Da2xuql6Iii8r3nK7ZYra4MvV6G9fVcA==
   dependencies:
-    "@tryghost/domain-events" "^0.1.10"
-    "@tryghost/member-events" "^0.4.2"
+    "@tryghost/domain-events" "^0.1.12"
+    "@tryghost/member-events" "^0.4.4"
 
-"@tryghost/members-api@6.2.3":
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-6.2.3.tgz#739bd24ce05062362abeb58a6952f86e0550beae"
-  integrity sha512-qcncr5REGc3dl7oQMDwjpucKzOBtbkiBHT5RLMZUUGMstM7S+sGxTRZEa0Ebt1HQy6sTdt6pElyshK95m4T2XQ==
+"@tryghost/members-api@6.3.1":
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-6.3.1.tgz#65f62075936cd7ee5dab4b818c4e90ae69a8814d"
+  integrity sha512-FMCv2Q3hl8EN0xbyJVnsOfUCJ8MQiXxgmPYwc01n4nfyLM95WjueVB1rH7KOrjy8vIPuw8D4qKAyItHF/k/XHw==
   dependencies:
     "@nexes/nql" "^0.6.0"
     "@tryghost/debug" "^0.1.2"
-    "@tryghost/domain-events" "^0.1.10"
+    "@tryghost/domain-events" "^0.1.12"
     "@tryghost/errors" "^1.1.1"
     "@tryghost/logging" "^2.0.0"
-    "@tryghost/magic-link" "^1.0.22"
-    "@tryghost/member-analytics-service" "^0.1.12"
-    "@tryghost/member-events" "^0.4.2"
-    "@tryghost/members-analytics-ingress" "^0.1.13"
-    "@tryghost/members-payments" "^0.3.2"
-    "@tryghost/members-stripe-service" "^0.10.1"
+    "@tryghost/magic-link" "^1.0.24"
+    "@tryghost/member-analytics-service" "^0.1.14"
+    "@tryghost/member-events" "^0.4.4"
+    "@tryghost/members-analytics-ingress" "^0.1.15"
+    "@tryghost/members-payments" "^0.3.4"
+    "@tryghost/members-stripe-service" "^0.10.3"
     "@tryghost/tpl" "^0.1.2"
     "@types/jsonwebtoken" "^8.5.1"
     bluebird "^3.5.4"
@@ -2169,10 +2169,10 @@
     lodash "^4.17.11"
     node-jose "^2.0.0"
 
-"@tryghost/members-csv@^1.2.11":
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-csv/-/members-csv-1.2.11.tgz#dd2eaec417a2671786e8b827fa1dd64f4edd2a4c"
-  integrity sha512-qxbcqnJSja3L/5UOlBIsGtySyHvpYNyM+qmv8EWiLSBcrE2cPorhlwZZI9BUM4ZW2FQ90cEihgADoueNdniX0Q==
+"@tryghost/members-csv@^1.2.13":
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-csv/-/members-csv-1.2.13.tgz#1db33fbba243c6ff7864dd4b1484118f93b4e86b"
+  integrity sha512-D3cNY1BsxAeAJLXG4qzL0OG44PTbh+MHnGfYZuHlMGmBIsb+wJ80J5tV1m26ulkM+pDXbfhpIh8qJubevH2sLw==
   dependencies:
     bluebird "^3.7.2"
     fs-extra "^10.0.0"
@@ -2180,45 +2180,45 @@
     papaparse "^5.3.2"
     pump "^3.0.0"
 
-"@tryghost/members-events-service@0.3.4":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-events-service/-/members-events-service-0.3.4.tgz#c22e3d6acb498f06605140465d1c869a91eea0cb"
-  integrity sha512-p69fo4KlP9eUT64wYjjRAGRVq2zyPYuSgTO20VT3qjy2maq/kgc589v6djhJ1Q5I9xGBBYgpRJC/CHm+T/yFVg==
+"@tryghost/members-events-service@0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-events-service/-/members-events-service-0.4.1.tgz#8f61119bce1341f8cc13189b166988814ad32acb"
+  integrity sha512-WA7FCfD6vtSGqiKnPwR0t5HdZFIC7nTTqj4Wcar6ZMtQK1ImgZ6fAxxX/pU/GZJ4/FFMcFcS2DNuO9qcw0kdUw==
   dependencies:
-    "@tryghost/domain-events" "^0.1.10"
-    "@tryghost/member-events" "^0.4.2"
+    "@tryghost/domain-events" "^0.1.12"
+    "@tryghost/member-events" "^0.4.4"
     moment-timezone "^0.5.34"
 
-"@tryghost/members-importer@0.5.10":
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-importer/-/members-importer-0.5.10.tgz#4daf2306eccbcc36b72384eacde4cebd7b755e44"
-  integrity sha512-kf5QykVadbCNDQ7YeE6fz0Reiq+sz1q9dThh/kq9YqQ0V0qLOF4cRykCGUP00eh1ndOECz8zJWXxd2TIe+K52w==
+"@tryghost/members-importer@0.5.12":
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-importer/-/members-importer-0.5.12.tgz#34d3b58d4317eff8dda5dbe2ec43e8e7cdf50441"
+  integrity sha512-a/ihw4ssldq5eQJDU16c+BOSDlqdoHqhiTDwfBknnA0F/UtvTKRPrzzCpgfdggGRiZhe4BhzmXTlHGj2EpUwgg==
   dependencies:
     "@tryghost/errors" "^1.0.0"
-    "@tryghost/members-csv" "^1.2.11"
+    "@tryghost/members-csv" "^1.2.13"
     "@tryghost/tpl" "^0.1.3"
     moment-timezone "^0.5.23"
 
-"@tryghost/members-offers@0.11.2", "@tryghost/members-offers@^0.11.2":
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-offers/-/members-offers-0.11.2.tgz#8c53344055fbd8dbec203f166ce74a12e0085aec"
-  integrity sha512-sAhrHm3ShFtf+5Tz8MfALriDPgdgKISRFXZ9j4bldu5uZrjwSJMWJwH3z/wtwdWix9yL1mNxH9EE+hjPMZzAzg==
+"@tryghost/members-offers@0.11.4", "@tryghost/members-offers@^0.11.4":
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-offers/-/members-offers-0.11.4.tgz#11a043df0e84fd169d21e523633eeff2d9edbfaf"
+  integrity sha512-Nir9kKRUgu16EwcNDhHakK+SqaL1zXg5MlWi98CgHsV/Ims7VVwACZVLcko27zoSOq/WM5cstgQofGhD/Hm+lA==
   dependencies:
     "@nexes/mongo-utils" "^0.3.1"
     "@tryghost/string" "^0.1.20"
 
-"@tryghost/members-payments@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-payments/-/members-payments-0.3.2.tgz#f48e5a61a726d3a0f233925ecc1eb0643172e539"
-  integrity sha512-qbxw9oix49+iFzHHtO5M2dUcde9AApc3FWR0SFCIZdi08cQnQnqyEzg2T6QtQHH+k8/5WMZBewHzHd2tXlGfBA==
+"@tryghost/members-payments@^0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-payments/-/members-payments-0.3.4.tgz#3e072283e1ecfd8448f9f53e8dfb9be8eed99297"
+  integrity sha512-CuZTL6u6E28r0bPD7ckZoWT6ASspjgnvZwD5xSltkBxaPtwaKMkmki0oeo6/x0h+xcfC0S36QUtDDj85BPqb1w==
   dependencies:
-    "@tryghost/domain-events" "^0.1.10"
-    "@tryghost/members-offers" "^0.11.2"
+    "@tryghost/domain-events" "^0.1.12"
+    "@tryghost/members-offers" "^0.11.4"
 
-"@tryghost/members-ssr@1.0.24":
-  version "1.0.24"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-ssr/-/members-ssr-1.0.24.tgz#12c2d8af366754a1eb3e71f7ffb17e3859526d7c"
-  integrity sha512-8LBkE1uj/kRkoY9C+hrVsa2gk4bfkuUI+bOfsF9XQvWjTOQlbY/KFoEN5twxhiw90zFRMqR8bWzfL4EEaaILVg==
+"@tryghost/members-ssr@1.0.26":
+  version "1.0.26"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-ssr/-/members-ssr-1.0.26.tgz#5995e602f08b6071da8f8c8b74a4a938a2011263"
+  integrity sha512-IutbC280Ymvcu4yfjxz6OFrgxYcdtnMewcbscJa722i2oANULuqE81Kwr6vik4Bv6oNuBlX4hicWZh7mQjiKew==
   dependencies:
     "@tryghost/debug" "^0.1.2"
     "@tryghost/errors" "^1.1.0"
@@ -2228,16 +2228,16 @@
     jsonwebtoken "^8.5.1"
     lodash "^4.17.11"
 
-"@tryghost/members-stripe-service@0.10.1", "@tryghost/members-stripe-service@^0.10.1":
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-stripe-service/-/members-stripe-service-0.10.1.tgz#2877ccb7f2a318f0fcc24a4e6a4d30d5116de5ce"
-  integrity sha512-bbtyLAMDivwFA10KkuxsTwBzCSboyu1f/vqbmolSpaHxSDg8qxIr8fAeJFZWByVrJKfUD0e3IgMRYJl1jW0Ogw==
+"@tryghost/members-stripe-service@0.10.3", "@tryghost/members-stripe-service@^0.10.3":
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-stripe-service/-/members-stripe-service-0.10.3.tgz#4a4609736e89ed831e118e480c28fa176f85a04e"
+  integrity sha512-EdFxlqM696PSF/V9Qup4FEzCnIe5/2SbZnm2Nmg/7hxSuT/IBx9JxzxyOI+aup3Qp0Un4oVLWEhRCYJgdp42ng==
   dependencies:
     "@tryghost/debug" "^0.1.4"
-    "@tryghost/domain-events" "^0.1.10"
+    "@tryghost/domain-events" "^0.1.12"
     "@tryghost/errors" "^1.2.5"
     "@tryghost/logging" "^2.0.5"
-    "@tryghost/member-events" "^0.4.2"
+    "@tryghost/member-events" "^0.4.4"
     leaky-bucket "^2.2.0"
     lodash "^4.17.21"
     stripe "^8.174.0"
@@ -2495,13 +2495,13 @@
     moment-timezone "^0.5.23"
     validator "7.2.0"
 
-"@tryghost/verification-trigger@0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@tryghost/verification-trigger/-/verification-trigger-0.2.1.tgz#8b371fee47dec57bfeb8ab61a4698aaae4d17974"
-  integrity sha512-ox47qz+aiUC70dy2oOqpuZ1AGHLawFB1DDE76US4vWVAEV0K8Ny+k/vR8Qtt5r8lVN+G8tFpsf8NtELFE2npdw==
+"@tryghost/verification-trigger@0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@tryghost/verification-trigger/-/verification-trigger-0.2.3.tgz#47c7be66f48c539ce5a2b6d5d6d95f0e74e46ea3"
+  integrity sha512-SJlLuKup8ZJ4BJK887ymFlbG9PhSf27dsOgB9d4CXUaINWJj/sik8GR9Gt1KwhUHItHt2cneqMY1QesMJTkrnw==
   dependencies:
-    "@tryghost/domain-events" "^0.1.10"
-    "@tryghost/member-events" "^0.4.2"
+    "@tryghost/domain-events" "^0.1.12"
+    "@tryghost/member-events" "^0.4.4"
 
 "@tryghost/version-notifications-data-service@0.1.0":
   version "0.1.0"