ghost 4.13.0 → 4.16.0

package/core/server/data/migrations/versions/4.16/01-add-custom-theme-settings-table.js

@@ -0,0 +1,9 @@
+const utils = require('../../utils');
+
+module.exports = utils.addTable('custom_theme_settings', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    theme: {type: 'string', maxlength: 191, nullable: false},
+    key: {type: 'string', maxlength: 191, nullable: false},
+    type: {type: 'string', maxlength: 50, nullable: false},
+    value: {type: 'text', maxlength: 65535, nullable: true}
+});

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

@@ -158,7 +158,12 @@ const addFixturesForRelation = function addFixturesForRelation(relationFixture,
                 toItems = _.reject(toItems, function (item) {
                     return fromItem
                         .related(relationFixture.from.relation)
-                        .findWhere(matchObj(relationFixture.to.match, item));
+                        .find((model) => {
+                            const objectToMatch = matchObj(relationFixture.to.match, item);
+                            return Object.keys(objectToMatch).every(function (keyToCheck) {
+                                return model.get(keyToCheck) === objectToMatch[keyToCheck];
+                            });
+                        });
                 });
 
                 if (toItems && toItems.length > 0) {

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

@@ -633,5 +633,31 @@ module.exports = {
         created_by: {type: 'string', maxlength: 24, nullable: false},
         updated_at: {type: 'dateTime', nullable: true},
         updated_by: {type: 'string', maxlength: 24, nullable: true}
+    },
+    temp_member_analytic_events: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        event_name: {type: 'string', maxlength: 50, nullable: false},
+        created_at: {type: 'dateTime', nullable: false},
+        member_id: {type: 'string', maxlength: 24, nullable: false},
+        member_status: {type: 'string', maxlength: 50, nullable: false},
+        entry_id: {type: 'string', maxlength: 24, nullable: true},
+        source_url: {type: 'string', maxlength: 2000, nullable: true},
+        metadata: {type: 'string', maxlength: 191, nullable: true}
+    },
+    custom_theme_settings: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        theme: {type: 'string', maxlength: 191, nullable: false},
+        key: {type: 'string', maxlength: 191, nullable: false},
+        type: {
+            type: 'string',
+            maxlength: 50,
+            nullable: false,
+            validations: {
+                isIn: [[
+                    'select'
+                ]]
+            }
+        },
+        value: {type: 'text', maxlength: 65535, nullable: true}
     }
 };

package/core/server/lib/request-external.js

@@ -12,8 +12,9 @@ function isPrivateIp(addr) {
       /^(::f{4}:)?169\.254\.([0-9]{1,3})\.([0-9]{1,3})$/i.test(addr) ||
       /^f[cd][0-9a-f]{2}:/i.test(addr) ||
       /^fe80:/i.test(addr) ||
-      /^::1$/.test(addr) ||
-      /^::$/.test(addr);
+      /^::[10]$/.test(addr) ||
+      /^::$/.test(addr) ||
+      /^0/.test(addr);
 }
 
 async function errorIfHostnameResolvesToPrivateIp(options) {

package/core/server/models/action.js

@@ -3,7 +3,7 @@ const ghostBookshelf = require('./base');
 
 const candidates = [];
 
-_.each(ghostBookshelf._models, (model) => {
+_.each(ghostBookshelf.registry.models, (model) => {
     candidates.push([model, model.prototype.tableName.replace(/s$/, '')]);
 });
 

package/core/server/models/api-key.js

@@ -72,7 +72,7 @@ const ApiKey = ghostBookshelf.Model.extend({
             }
         }
     },
-    onUpdated(model, attrs, options) {
+    onUpdated(model, options) {
         if (this.previous('secret') !== this.get('secret')) {
             this.addAction(model, 'refreshed', options);
         }

package/core/server/models/base/bookshelf.js

@@ -10,9 +10,6 @@ const db = require('../../data/db');
 // Initializes a new Bookshelf instance called ghostBookshelf, for reference elsewhere in Ghost.
 const ghostBookshelf = bookshelf(db.knex);
 
-// Load the Bookshelf registry plugin, which helps us avoid circular dependencies
-ghostBookshelf.plugin('registry');
-
 ghostBookshelf.plugin(plugins.eagerLoad);
 
 // Add committed/rollback events.

package/core/server/models/base/index.js

@@ -21,6 +21,8 @@ ghostBookshelf.Model = ghostBookshelf.Model.extend({
     // Bookshelf `hasTimestamps` - handles created_at and updated_at properties
     hasTimestamps: true,
 
+    requireFetch: false,
+
     // https://github.com/bookshelf/bookshelf/commit/a55db61feb8ad5911adb4f8c3b3d2a97a45bd6db
     parsedIdAttribute: function () {
         return false;

package/core/server/models/base/plugins/events.js

@@ -128,7 +128,7 @@ module.exports = function (Bookshelf) {
             }
         },
 
-        onCreated(model, attrs, options) {
+        onCreated(model, options) {
             this.addAction(model, 'added', options);
         },
 
@@ -189,7 +189,7 @@ module.exports = function (Bookshelf) {
                 });
         },
 
-        onUpdated(model, attrs, options) {
+        onUpdated(model, options) {
             this.addAction(model, 'edited', options);
         },
 

package/core/server/models/base/plugins/raw-knex.js

@@ -106,17 +106,17 @@ module.exports = function (Bookshelf) {
 
                     if (!withRelated) {
                         return _.map(objects, (object) => {
-                            object = Bookshelf._models[modelName].prototype.toJSON.bind({
+                            object = Bookshelf.registry.models[modelName].prototype.toJSON.bind({
                                 attributes: object,
                                 related: function (key) {
                                     return object[key];
                                 },
-                                serialize: Bookshelf._models[modelName].prototype.serialize,
-                                formatsToJSON: Bookshelf._models[modelName].prototype.formatsToJSON
+                                serialize: Bookshelf.registry.models[modelName].prototype.serialize,
+                                formatsToJSON: Bookshelf.registry.models[modelName].prototype.formatsToJSON
                             })();
 
-                            object = Bookshelf._models[modelName].prototype.fixBools(object);
-                            object = Bookshelf._models[modelName].prototype.fixDatesWhenFetch(object);
+                            object = Bookshelf.registry.models[modelName].prototype.fixBools(object);
+                            object = Bookshelf.registry.models[modelName].prototype.fixDatesWhenFetch(object);
                             return object;
                         });
                     }
@@ -180,7 +180,7 @@ module.exports = function (Bookshelf) {
                                     object[relation] = relationsToAttach[relation][object.id];
                                 });
 
-                                object = Bookshelf._models[modelName].prototype.toJSON.bind({
+                                object = Bookshelf.registry.models[modelName].prototype.toJSON.bind({
                                     attributes: object,
                                     _originalOptions: {
                                         withRelated: Object.keys(relationsToAttach)
@@ -188,12 +188,12 @@ module.exports = function (Bookshelf) {
                                     related: function (key) {
                                         return object[key];
                                     },
-                                    serialize: Bookshelf._models[modelName].prototype.serialize,
-                                    formatsToJSON: Bookshelf._models[modelName].prototype.formatsToJSON
+                                    serialize: Bookshelf.registry.models[modelName].prototype.serialize,
+                                    formatsToJSON: Bookshelf.registry.models[modelName].prototype.formatsToJSON
                                 })();
 
-                                object = Bookshelf._models[modelName].prototype.fixBools(object);
-                                object = Bookshelf._models[modelName].prototype.fixDatesWhenFetch(object);
+                                object = Bookshelf.registry.models[modelName].prototype.fixBools(object);
+                                object = Bookshelf.registry.models[modelName].prototype.fixDatesWhenFetch(object);
                                 return object;
                             });
 

package/core/server/models/custom-theme-setting.js

@@ -0,0 +1,9 @@
+const ghostBookshelf = require('./base');
+
+const CustomThemeSetting = ghostBookshelf.Model.extend({
+    tableName: 'custom_theme_settings'
+});
+
+module.exports = {
+    CustomThemeSetting: ghostBookshelf.model('CustomThemeSetting', CustomThemeSetting)
+};

package/core/server/models/email.js

@@ -59,13 +59,13 @@ const Email = ghostBookshelf.Model.extend({
         ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options);
     },
 
-    onCreated: function onCreated(model, attrs, options) {
+    onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
         model.emitChange('added', options);
     },
 
-    onUpdated: function onUpdated(model, attrs, options) {
+    onUpdated: function onUpdated(model, options) {
         ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments);
 
         model.emitChange('edited', options);

package/core/server/models/index.js

@@ -17,6 +17,7 @@ const models = [
     'post',
     'role',
     'settings',
+    'custom-theme-setting',
     'session',
     'tag',
     'tag-public',
@@ -39,6 +40,7 @@ const models = [
     'member-payment-event',
     'member-status-event',
     'member-product-event',
+    'member-analytic-event',
     'posts-meta',
     'member-stripe-customer',
     'stripe-customer-subscription',

package/core/server/models/integration.js

@@ -36,7 +36,7 @@ const Integration = ghostBookshelf.Model.extend({
         }
     },
 
-    onCreated: function onCreated(model, response, options) {
+    onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
         model.emitChange('added', options);

package/core/server/models/label.js

@@ -14,13 +14,13 @@ Label = ghostBookshelf.Model.extend({
         ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options);
     },
 
-    onCreated: function onCreated(model, attrs, options) {
+    onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
         model.emitChange('added', options);
     },
 
-    onUpdated: function onUpdated(model, attrs, options) {
+    onUpdated: function onUpdated(model, options) {
         ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments);
 
         model.emitChange('edited', options);

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

@@ -0,0 +1,9 @@
+const ghostBookshelf = require('./base');
+
+const MemberAnalyticEvent = ghostBookshelf.Model.extend({
+    tableName: 'temp_member_analytic_events'
+});
+
+module.exports = {
+    MemberAnalyticEvent: ghostBookshelf.model('MemberAnalyticEvent', MemberAnalyticEvent)
+};

package/core/server/models/member.js

@@ -140,13 +140,13 @@ const Member = ghostBookshelf.Model.extend({
         ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options);
     },
 
-    onCreated: function onCreated(model, attrs, options) {
+    onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
         model.emitChange('added', options);
     },
 
-    onUpdated: function onUpdated(model, attrs, options) {
+    onUpdated: function onUpdated(model, options) {
         ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments);
 
         model.emitChange('edited', options);

package/core/server/models/post.js

@@ -301,7 +301,7 @@ Post = ghostBookshelf.Model.extend({
      * bookshelf-relations listens on `created` + `updated`.
      * We ensure that we are catching the event after bookshelf relations.
      */
-    onSaved: function onSaved(model, response, options) {
+    onSaved: function onSaved(model, options) {
         ghostBookshelf.Model.prototype.onSaved.apply(this, arguments);
 
         if (options.method !== 'insert') {
@@ -317,7 +317,7 @@ Post = ghostBookshelf.Model.extend({
         }
     },
 
-    onUpdated: function onUpdated(model, attrs, options) {
+    onUpdated: function onUpdated(model, options) {
         ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments);
 
         model.statusChanging = model.get('status') !== model.previous('status');

package/core/server/models/settings.js

@@ -104,14 +104,14 @@ Settings = ghostBookshelf.Model.extend({
         model.emitChange(model._previousAttributes.key + '.' + 'deleted', options);
     },
 
-    onCreated: function onCreated(model, response, options) {
+    onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
         model.emitChange('added', options);
         model.emitChange(model.attributes.key + '.' + 'added', options);
     },
 
-    onUpdated: function onUpdated(model, response, options) {
+    onUpdated: function onUpdated(model, options) {
         ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments);
 
         model.emitChange('edited', options);

package/core/server/models/tag.js

@@ -73,13 +73,13 @@ Tag = ghostBookshelf.Model.extend({
         ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options);
     },
 
-    onCreated: function onCreated(model, attrs, options) {
+    onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
         model.emitChange('added', options);
     },
 
-    onUpdated: function onUpdated(model, attrs, options) {
+    onUpdated: function onUpdated(model, options) {
         ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments);
 
         model.emitChange('edited', options);

package/core/server/models/user.js

@@ -98,7 +98,7 @@ User = ghostBookshelf.Model.extend({
         model.emitChange('deleted', options);
     },
 
-    onCreated: function onCreated(model, attrs, options) {
+    onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
         model.emitChange('added', options);
@@ -109,7 +109,7 @@ User = ghostBookshelf.Model.extend({
         }
     },
 
-    onUpdated: function onUpdated(model, response, options) {
+    onUpdated: function onUpdated(model, options) {
         ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments);
 
         model.statusChanging = model.get('status') !== model.previous('status');

package/core/server/models/webhook.js

@@ -22,13 +22,13 @@ Webhook = ghostBookshelf.Model.extend({
         ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options);
     },
 
-    onCreated: function onCreated(model, response, options) {
+    onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
         model.emitChange('added', options);
     },
 
-    onUpdated: function onUpdated(model, response, options) {
+    onUpdated: function onUpdated(model, options) {
         ghostBookshelf.Model.prototype.onUpdated.apply(this, arguments);
 
         model.emitChange('edited', options);

package/core/server/services/bulk-email/bulk-email-processor.js

@@ -9,7 +9,6 @@ const mailgunProvider = require('./mailgun');
 const sentry = require('../../../shared/sentry');
 const debug = require('@tryghost/debug')('mega');
 const postEmailSerializer = require('../mega/post-email-serializer');
-const labs = require('../../../shared/labs');
 
 const BATCH_SIZE = mailgunProvider.BATCH_SIZE;
 
@@ -231,9 +230,7 @@ module.exports = {
             recipientData[recipient.member_email] = data;
         });
 
-        if (labs.isSet('emailCardSegments')) {
-            emailData = postEmailSerializer.renderEmailForSegment(emailData, memberSegment);
-        }
+        emailData = postEmailSerializer.renderEmailForSegment(emailData, memberSegment);
 
         return mailgunProvider.send(emailData, recipientData, replacements).then((response) => {
             debug(`sent message (${Date.now() - startTime}ms)`);

package/core/server/services/custom-theme-settings.js

@@ -0,0 +1,8 @@
+const {Service: CustomThemeSettingsService} = require('@tryghost/custom-theme-settings-service');
+const customThemeSettingsCache = require('../../shared/custom-theme-settings-cache');
+const models = require('../models');
+
+module.exports = new CustomThemeSettingsService({
+    model: models.CustomThemeSetting,
+    cache: customThemeSettingsCache
+});

package/core/server/services/integrations/integrations-service.js

@@ -0,0 +1,61 @@
+const {NotFoundError, GhostError} = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    notFound: '{resource} not found.'
+};
+
+class IntegrationsService {
+    constructor({IntegrationModel, ApiKeyModel}) {
+        this.IntegrationModel = IntegrationModel;
+        this.ApiKeyModel = ApiKeyModel;
+    }
+
+    async edit(data, options) {
+        if (options.keyid) {
+            const model = await this.ApiKeyModel.findOne({id: options.keyid});
+
+            if (!model) {
+                throw new NotFoundError({
+                    message: tpl(messages.notFound, {
+                        resource: 'ApiKey'
+                    })
+                });
+            }
+            try {
+                await this.ApiKeyModel.refreshSecret(model.toJSON(), Object.assign({}, options, {id: options.keyid}));
+
+                return await this.IntegrationModel.findOne({id: options.id}, {
+                    withRelated: ['api_keys', 'webhooks']
+                });
+            } catch (err) {
+                throw new GhostError({
+                    err: err
+                });
+            }
+        }
+
+        try {
+            return await this.IntegrationModel.edit(data, Object.assign(options, {require: true}));
+        } catch (error) {
+            if (error.message === 'NotFound' || error.message === 'EmptyResponse') {
+                throw new NotFoundError({
+                    message: tpl(messages.notFound, {
+                        resource: 'Integration'
+                    })
+                });
+            }
+
+            throw error;
+        }
+    }
+}
+
+/**
+ * @returns {IntegrationsService} instance of the PostsService
+ */
+const getIntegrationsServiceInstance = ({IntegrationModel, ApiKeyModel}) => {
+    return new IntegrationsService({IntegrationModel, ApiKeyModel});
+};
+
+module.exports = getIntegrationsServiceInstance;

package/core/server/services/mail/GhostMailer.js

@@ -1,7 +1,6 @@
 // # Mail
 // Handles sending email for Ghost
 const _ = require('lodash');
-const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const config = require('../../../shared/config');
 const errors = require('@tryghost/errors');
@@ -67,15 +66,18 @@ function createMailError({message, err, ignoreDefaultMessage} = {message: ''}) {
 
 module.exports = class GhostMailer {
     constructor() {
-        const nodemailer = require('nodemailer');
-        const transport = config.get('mail') && config.get('mail').transport || 'direct';
+        const nodemailer = require('@tryghost/nodemailer');
+
+        let transport = config.get('mail') && config.get('mail').transport || 'direct';
+        transport = transport.toLowerCase();
+
         // nodemailer mutates the options passed to createTransport
         const options = config.get('mail') && _.clone(config.get('mail').options) || {};
 
         this.state = {
             usingDirect: transport === 'direct'
         };
-        this.transport = nodemailer.createTransport(transport, options);
+        this.transport = nodemailer(transport, options);
     }
 
     /**
@@ -102,52 +104,42 @@ module.exports = class GhostMailer {
 
         const response = await this.sendMail(messageToSend);
 
-        if (this.transport.transportType === 'DIRECT') {
+        if (this.state.usingDirect) {
             return this.handleDirectTransportResponse(response);
         }
 
         return response;
     }
 
-    sendMail(message) {
-        return new Promise((resolve, reject) => {
-            this.transport.sendMail(message, (err, response) => {
-                if (err) {
-                    reject(createMailError({
-                        message: i18n.t('errors.mail.reason', {reason: err.message || err}),
-                        err
-                    }));
-                }
-                resolve(response);
+    async sendMail(message) {
+        try {
+            const response = await this.transport.sendMail(message);
+            return response;
+        } catch (err) {
+            throw createMailError({
+                message: i18n.t('errors.mail.reason', {reason: err.message || err}),
+                err
             });
-        });
+        }
     }
 
     handleDirectTransportResponse(response) {
-        return new Promise((resolve, reject) => {
-            response.statusHandler.once('failed', function (data) {
-                if (data.error && data.error.code === 'ENOTFOUND') {
-                    reject(createMailError({
-                        message: i18n.t('errors.mail.noMailServerAtAddress.error', {domain: data.domain})
-                    }));
-                }
-
-                reject(createMailError());
-            });
-
-            response.statusHandler.once('requeue', function (data) {
-                if (data.error && data.error.message) {
-                    reject(createMailError({
-                        message: i18n.t('errors.mail.reason', {reason: data.error.message})
-                    }));
-                }
+        if (!response) {
+            return i18n.t('notices.mail.messageSent');
+        }
 
-                reject(createMailError());
+        if (response.pending.length > 0) {
+            throw createMailError({
+                message: i18n.t('errors.mail.reason', {reason: 'Email has been temporarily rejected'})
             });
+        }
 
-            response.statusHandler.once('sent', function () {
-                resolve(i18n.t('notices.mail.messageSent'));
+        if (response.errors.length > 0) {
+            throw createMailError({
+                message: i18n.t('errors.mail.reason', {reason: response.errors[0].message})
             });
-        });
+        }
+
+        return i18n.t('notices.mail.messageSent');
     }
 };

package/core/server/services/mega/email-preview.js

@@ -0,0 +1,41 @@
+const postEmailSerializer = require('./post-email-serializer');
+
+class EmailPreview {
+    /**
+     * @constructor
+     * @param {Object} options
+     * @param {String} options.apiVersion
+     */
+    constructor({apiVersion}) {
+        this.apiVersion = apiVersion;
+    }
+
+    /**
+     * @param {Object} post - Post model object instance
+     * @param {String} memberSegment - member segment filter
+     * @returns {Promise<Object>}
+     */
+    async generateEmailContent(post, memberSegment) {
+        let emailContent = await postEmailSerializer.serialize(post, {
+            isBrowserPreview: true,
+            apiVersion: this.apiVersion
+        });
+
+        if (memberSegment) {
+            emailContent = postEmailSerializer.renderEmailForSegment(emailContent, memberSegment);
+        }
+
+        const replacements = postEmailSerializer.parseReplacements(emailContent);
+
+        replacements.forEach((replacement) => {
+            emailContent[replacement.format] = emailContent[replacement.format].replace(
+                replacement.match,
+                replacement.fallback || ''
+            );
+        });
+
+        return emailContent;
+    }
+}
+
+module.exports = EmailPreview;

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

@@ -5,6 +5,10 @@ module.exports = {
 
     get postEmailSerializer() {
         return require('./post-email-serializer');
+    },
+
+    get EmailPreview() {
+        return require('./email-preview');
     }
 };