ghost 5.11.0 → 5.12.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.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="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.12%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-1b0d7c731511bb738ec457d2932c43c0.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-f62b0e78ddcd947273873bdeba4abc3c.css" title="light">
 
     
 </head>
@@ -53,9 +53,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-741dc0e4078e044a0c9bfaad104de8b3.js"></script>
+    <script src="assets/vendor-52613f40d62355e9ac64cbfa211169bb.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>
+<script src="assets/chunk.143.da85cf08f47cfe520bf6.js"></script>
+    <script src="assets/ghost-0526c96b20843697927c1d06a9010197.js"></script>
 </body>
 </html>

package/core/frontend/helpers/search.js

@@ -4,26 +4,11 @@ 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>`;
+    // We want this to output as one line, but splitting for readability
+    const svg = '<button class="gh-search-icon" aria-label="search" data-ghost-search '
+              + 'style="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;">'
+              + '<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);
 }

package/core/frontend/meta/get-meta.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const settingsCache = require('../../shared/settings-cache');
 const urlUtils = require('../../shared/url-utils');
 const logging = require('@tryghost/logging');
@@ -81,7 +80,7 @@ function getMetaData(data, root) {
     }
 
     // @TODO: wrap this in a utility function
-    return Promise.props(getImageDimensions(metaData)).then(function () {
+    return getImageDimensions(metaData).then(function () {
         metaData.structuredData = getStructuredData(metaData);
         metaData.schema = getSchema(metaData, data);
 

package/core/frontend/meta/image-dimensions.js

@@ -1,15 +1,14 @@
-const Promise = require('bluebird');
 const _ = require('lodash');
 const imageSizeCache = require('../../server/lib/image').cachedImageSizeFromUrl;
 
 /**
  * Get Image dimensions
  * @param {object} metaData
- * @returns {object} metaData
+ * @returns {Promise<object>} metaData
  * @description for image properties in meta data (coverImage, authorImage and site.logo), `getCachedImageSizeFromUrl` is
  * called to receive image width and height
  */
-function getImageDimensions(metaData) {
+async function getImageDimensions(metaData) {
     const fetch = {
         coverImage: imageSizeCache.getCachedImageSizeFromUrl(metaData.coverImage.url),
         authorImage: imageSizeCache.getCachedImageSizeFromUrl(metaData.authorImage.url),
@@ -17,45 +16,54 @@ function getImageDimensions(metaData) {
         logo: imageSizeCache.getCachedImageSizeFromUrl(metaData.site.logo.url)
     };
 
-    return Promise
-        .props(fetch)
-        .then(function (imageObj) {
-            _.forEach(imageObj, function (key, value) {
-                if (_.has(key, 'width') && _.has(key, 'height')) {
-                    // We have some restrictions for publisher.logo:
-                    // The image needs to be <=600px wide and <=60px high (ideally exactly 600px x 60px).
-                    // Unless we have proper image-handling (see https://github.com/TryGhost/Ghost/issues/4453),
-                    // we will fake it in some cases or not produce an imageObject at all.
-                    if (value === 'logo') {
-                        if (key.height <= 60 && key.width <= 600) {
-                            _.assign(metaData.site[value], {
-                                dimensions: {
-                                    width: key.width,
-                                    height: key.height
-                                }
-                            });
-                        } else if (key.width === key.height) {
-                            // CASE: the logo is too large, but it is a square. We fake it...
-                            _.assign(metaData.site[value], {
-                                dimensions: {
-                                    width: 60,
-                                    height: 60
-                                }
-                            });
+    const [coverImage, authorImage, ogImage, logo] = await Promise.all([
+        fetch.coverImage,
+        fetch.authorImage,
+        fetch.ogImage,
+        fetch.logo
+    ]);
+    const imageObj = {
+        coverImage,
+        authorImage,
+        ogImage,
+        logo
+    };
+
+    _.forEach(imageObj, function (key, value) {
+        if (_.has(key, 'width') && _.has(key, 'height')) {
+            // We have some restrictions for publisher.logo:
+            // The image needs to be <=600px wide and <=60px high (ideally exactly 600px x 60px).
+            // Unless we have proper image-handling (see https://github.com/TryGhost/Ghost/issues/4453),
+            // we will fake it in some cases or not produce an imageObject at all.
+            if (value === 'logo') {
+                if (key.height <= 60 && key.width <= 600) {
+                    _.assign(metaData.site[value], {
+                        dimensions: {
+                            width: key.width,
+                            height: key.height
                         }
-                    } else {
-                        _.assign(metaData[value], {
-                            dimensions: {
-                                width: key.width,
-                                height: key.height
-                            }
-                        });
-                    }
+                    });
+                } else if (key.width === key.height) {
+                    // CASE: the logo is too large, but it is a square. We fake it...
+                    _.assign(metaData.site[value], {
+                        dimensions: {
+                            width: 60,
+                            height: 60
+                        }
+                    });
                 }
-            });
+            } else {
+                _.assign(metaData[value], {
+                    dimensions: {
+                        width: key.width,
+                        height: key.height
+                    }
+                });
+            }
+        }
+    });
 
-            return metaData;
-        });
+    return metaData;
 }
 
 module.exports = getImageDimensions;

package/core/server/data/schema/schema.js

@@ -483,9 +483,17 @@ module.exports = {
         created_at: {type: 'dateTime', nullable: false},
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
         attribution_id: {type: 'string', maxlength: 24, nullable: true},
-        attribution_type: {type: 'string', maxlength: 50, nullable: true},
+        attribution_type: {
+            type: 'string', maxlength: 50, nullable: true, validations: {
+                isIn: [['url', 'post', 'page', 'author', 'tag']]
+            }
+        },
         attribution_url: {type: 'string', maxlength: 2000, nullable: true},
-        source: {type: 'string', maxlength: 50, nullable: false}
+        source: {
+            type: 'string', maxlength: 50, nullable: false, validations: {
+                isIn: [['member', 'import', 'system', 'api', 'admin']]
+            }
+        }
     },
     members_cancel_events: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -613,7 +621,11 @@ module.exports = {
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
         subscription_id: {type: 'string', maxlength: 24, nullable: false, references: 'members_stripe_customers_subscriptions.id', cascadeDelete: true},
         attribution_id: {type: 'string', maxlength: 24, nullable: true},
-        attribution_type: {type: 'string', maxlength: 50, nullable: true},
+        attribution_type: {
+            type: 'string', maxlength: 50, nullable: true, validations: {
+                isIn: [['url', 'post', 'page', 'author', 'tag']]
+            }
+        },
         attribution_url: {type: 'string', maxlength: 2000, nullable: true}
     },
     offer_redemptions: {
@@ -628,7 +640,11 @@ module.exports = {
         member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
         subscribed: {type: 'bool', nullable: false, defaultTo: true},
         created_at: {type: 'dateTime', nullable: false},
-        source: {type: 'string', maxlength: 50, nullable: true},
+        source: {
+            type: 'string', maxlength: 50, nullable: true, validations: {
+                isIn: [['member', 'import', 'system', 'api', 'admin']]
+            }
+        },
         newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id', cascadeDelete: false}
     },
     stripe_products: {

package/core/server/models/action.js

@@ -1,24 +1,21 @@
-const _ = require('lodash');
 const ghostBookshelf = require('./base');
 
-const candidates = [];
-
 const Action = ghostBookshelf.Model.extend({
     tableName: 'actions',
 
-    initialize: function initialize() {
-        _.each(ghostBookshelf.registry.models, (model) => {
-            candidates.push([model, model.prototype.tableName.replace(/s$/, '')]);
+    candidates() {
+        return Object.keys(ghostBookshelf.registry.models).map((key) => {
+            const model = ghostBookshelf.registry.models[key];
+            return [model, model.prototype.tableName.replace(/s$/, '')];
         });
-        this.constructor.__super__.initialize.apply(this, arguments);
     },
 
     actor() {
-        return this.morphTo('actor', ['actor_type', 'actor_id'], ...candidates);
+        return this.morphTo('actor', ['actor_type', 'actor_id'], ...this.candidates());
     },
 
     resource() {
-        return this.morphTo('resource', ['resource_type', 'resource_id'], ...candidates);
+        return this.morphTo('resource', ['resource_type', 'resource_id'], ...this.candidates());
     }
 }, {
     orderDefaultOptions: function orderDefaultOptions() {

package/core/server/models/member-created-event.js

@@ -8,8 +8,16 @@ const MemberCreatedEvent = ghostBookshelf.Model.extend({
         return this.belongsTo('Member', 'member_id', 'id');
     },
 
-    attribution() {
-        return this.belongsTo('Post', 'attribution_id', 'id');
+    postAttribution() {
+        return this.belongsTo('Post', 'attribution_id', 'id');   
+    },
+
+    userAttribution() {
+        return this.belongsTo('User', 'attribution_id', 'id');   
+    },
+
+    tagAttribution() {
+        return this.belongsTo('Tag', 'attribution_id', 'id');   
     }
 }, {
     async edit() {

package/core/server/models/member-paid-subscription-event.js

@@ -8,6 +8,10 @@ const MemberPaidSubscriptionEvent = ghostBookshelf.Model.extend({
         return this.belongsTo('Member', 'member_id', 'id');
     },
 
+    subscriptionCreatedEvent() {
+        return this.belongsTo('SubscriptionCreatedEvent', 'subscription_id', 'subscription_id');
+    },
+
     customQuery(qb, options) {
         if (options.aggregateMRRDeltas) {
             if (options.limit || options.filter) {

package/core/server/models/subscription-created-event.js

@@ -12,8 +12,16 @@ const SubscriptionCreatedEvent = ghostBookshelf.Model.extend({
         return this.belongsTo('StripeCustomerSubscription', 'subscription_id', 'id');
     },
 
-    attribution() {
-        return this.belongsTo('Post', 'attribution_id', 'id');
+    postAttribution() {
+        return this.belongsTo('Post', 'attribution_id', 'id');   
+    },
+
+    userAttribution() {
+        return this.belongsTo('User', 'attribution_id', 'id');   
+    },
+
+    tagAttribution() {
+        return this.belongsTo('Tag', 'attribution_id', 'id');   
     }
 }, {
     async edit() {

package/core/server/models/user.js

@@ -488,6 +488,33 @@ User = ghostBookshelf.Model.extend({
         return query.fetch(options);
     },
 
+    /**
+     * Returns users who should receive a specific type of alert
+     * @param {'free-signup'|'paid-started'|'paid-canceled'} type The type of alert to fetch users for
+     * @param {any} options
+     * @return {Promise<[Object]>} Array of users
+     */
+    getEmailAlertUsers(type, options) {
+        options = options || {};
+
+        let filter = 'status:active';
+        if (type === 'free-signup') {
+            filter += '+free_member_signup_notification:true';
+        } else if (type === 'paid-started') {
+            filter += '+paid_subscription_started_notification:true';
+        } else if (type === 'paid-canceled') {
+            filter += '+paid_subscription_canceled_notification:true';
+        }
+        const updatedOptions = _.merge({}, options, {filter, withRelated: ['roles']});
+        return this.findAll(updatedOptions).then((users) => {
+            return users.toJSON().filter((user) => {
+                return user?.roles?.some((role) => {
+                    return ['Owner', 'Administrator'].includes(role.name);
+                });
+            });
+        });
+    },
+
     /**
      * ### Edit
      *
@@ -1005,10 +1032,10 @@ User = ghostBookshelf.Model.extend({
         let ownerRole;
         let contextUser;
 
-        return Promise.join(
+        return Promise.all([
             ghostBookshelf.model('Role').findOne({name: 'Owner'}),
             User.findOne({id: options.context.user}, {withRelated: ['roles']})
-        )
+        ])
             .then((results) => {
                 ownerRole = results[0];
                 contextUser = results[1];
@@ -1021,8 +1048,10 @@ User = ghostBookshelf.Model.extend({
                     }));
                 }
 
-                return Promise.join(ghostBookshelf.model('Role').findOne({name: 'Administrator'}),
-                    User.findOne({id: object.id}, {withRelated: ['roles']}));
+                return Promise.all([
+                    ghostBookshelf.model('Role').findOne({name: 'Administrator'}),
+                    User.findOne({id: object.id}, {withRelated: ['roles']})
+                ]);
             })
             .then((results) => {
                 const adminRole = results[0];
@@ -1049,9 +1078,11 @@ User = ghostBookshelf.Model.extend({
                 }
 
                 // convert owner to admin
-                return Promise.join(contextUser.roles().updatePivot({role_id: adminRole.id}),
+                return Promise.all([
+                    contextUser.roles().updatePivot({role_id: adminRole.id}),
                     user.roles().updatePivot({role_id: ownerRole.id}),
-                    user.id);
+                    user.id
+                ]);
             })
             .then((results) => {
                 return Users.forge()

package/core/server/services/member-attribution/index.js

@@ -24,7 +24,7 @@ class MemberAttributionServiceWrapper {
             }
         });
 
-        const attributionBuilder = new AttributionBuilder({urlTranslator});
+        this.attributionBuilder = new AttributionBuilder({urlTranslator});
 
         // Expose the service
         this.service = new MemberAttributionService({
@@ -32,7 +32,7 @@ class MemberAttributionServiceWrapper {
                 MemberCreatedEvent: models.MemberCreatedEvent,
                 SubscriptionCreatedEvent: models.SubscriptionCreatedEvent
             },
-            attributionBuilder,
+            attributionBuilder: this.attributionBuilder,
             labsService
         });
 

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

@@ -13,6 +13,7 @@ const SingleUseTokenProvider = require('./SingleUseTokenProvider');
 const urlUtils = require('../../../shared/url-utils');
 const labsService = require('../../../shared/labs');
 const offersService = require('../offers');
+const staffService = require('../staff');
 const newslettersService = require('../newsletters');
 const memberAttributionService = require('../member-attribution');
 
@@ -185,6 +186,8 @@ function createApiInstance(config) {
             MemberStatusEvent: models.MemberStatusEvent,
             MemberProductEvent: models.MemberProductEvent,
             MemberAnalyticEvent: models.MemberAnalyticEvent,
+            MemberCreatedEvent: models.MemberCreatedEvent,
+            SubscriptionCreatedEvent: models.SubscriptionCreatedEvent,
             OfferRedemption: models.OfferRedemption,
             Offer: models.Offer,
             StripeProduct: models.StripeProduct,
@@ -195,6 +198,7 @@ function createApiInstance(config) {
         },
         stripeAPIService: stripeService.api,
         offersAPI: offersService.api,
+        staffService: staffService.api,
         labsService: labsService,
         newslettersService: newslettersService,
         memberAttributionService: memberAttributionService.service

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

@@ -105,10 +105,12 @@ module.exports = {
         });
 
         verificationTrigger = new VerificationTrigger({
-            configThreshold: _.get(config.get('hostSettings'), 'emailVerification.importThreshold'),
+            apiTriggerThreshold: _.get(config.get('hostSettings'), 'emailVerification.apiThreshold'),
+            adminTriggerThreshold: _.get(config.get('hostSettings'), 'emailVerification.adminThreshold'),
+            importTriggerThreshold: _.get(config.get('hostSettings'), 'emailVerification.importThreshold'),
             isVerified: () => config.get('hostSettings:emailVerification:verified') === true,
             isVerificationRequired: () => settingsCache.get('email_verification_required') === true,
-            sendVerificationEmail: ({subject, message, amountImported}) => {
+            sendVerificationEmail: ({subject, message, amountTriggered}) => {
                 const escalationAddress = config.get('hostSettings:emailVerification:escalationAddress');
                 const fromAddress = config.get('user_email');
 
@@ -116,7 +118,7 @@ module.exports = {
                     ghostMailer.send({
                         subject,
                         html: tpl(message, {
-                            importedNumber: amountImported,
+                            amountTriggered: amountTriggered,
                             siteUrl: urlUtils.getSiteUrl()
                         }),
                         forceTextContent: true,
@@ -189,4 +191,5 @@ module.exports = {
     stats: membersStats,
     export: require('./exporter/query')
 };
+
 module.exports.middleware = require('./middleware');

package/core/server/services/staff/index.js

@@ -0,0 +1,26 @@
+class StaffServiceWrapper {
+    init() {
+        const StaffService = require('@tryghost/staff-service');
+
+        const config = require('../../../shared/config');
+        const logging = require('@tryghost/logging');
+        const models = require('../../models');
+        const {GhostMailer} = require('../mail');
+        const mailer = new GhostMailer();
+        const settingsCache = require('../../../shared/settings-cache');
+        const urlService = require('../url');
+        const urlUtils = require('../../../shared/url-utils');
+
+        this.api = new StaffService({
+            config,
+            logging,
+            models,
+            mailer,
+            settingsCache,
+            urlService,
+            urlUtils
+        });
+    }
+}
+
+module.exports = new StaffServiceWrapper();

package/core/shared/labs.js

@@ -17,21 +17,22 @@ const messages = {
 const GA_FEATURES = [
     'newsletterPaywall',
     'freeTrial',
-    'compExpiring'
+    'compExpiring',
+    'searchHelper',
+    'emailAlerts'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
 const BETA_FEATURES = [
-    'activitypub'
+    'activitypub',
+    'memberAttribution'
 ];
 
 const ALPHA_FEATURES = [
     'auditLog',
     'urlCache',
-    'beforeAfterCard',
-    'memberAttribution',
-    'searchHelper'
+    'beforeAfterCard'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];