ghost 4.18.0 → 4.20.1

package/core/server/api/v3/session.js

@@ -1,10 +1,14 @@
 const Promise = require('bluebird');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
 const auth = require('../../services/auth');
 const api = require('./index');
 
+const messages = {
+    accessDenied: 'Access denied.'
+};
+
 const session = {
     read(frame) {
         /*
@@ -20,7 +24,7 @@ const session = {
 
         if (!object || !object.username || !object.password) {
             return Promise.reject(new errors.UnauthorizedError({
-                message: i18n.t('errors.middleware.auth.accessDenied')
+                message: tpl(messages.accessDenied)
             }));
         }
 
@@ -40,7 +44,7 @@ const session = {
         }).catch(async (err) => {
             if (!errors.utils.isIgnitionError(err)) {
                 throw new errors.UnauthorizedError({
-                    message: i18n.t('errors.middleware.auth.accessDenied'),
+                    message: tpl(messages.accessDenied),
                     err
                 });
             }

package/core/server/api/v3/settings.js

@@ -2,11 +2,16 @@ const Promise = require('bluebird');
 const _ = require('lodash');
 const models = require('../../models');
 const routeSettings = require('../../services/route-settings');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const {BadRequestError, NoPermissionError} = require('@tryghost/errors');
 const settingsService = require('../../services/settings');
 const membersService = require('../../services/members');
 
+const messages = {
+    error: 'Failed to send email.',
+    accessCoreSettingFromExtReq: 'Attempted to access core setting from external request'
+};
+
 const settingsBREADService = settingsService.getSettingsBREADServiceInstance();
 
 module.exports = {
@@ -109,7 +114,7 @@ module.exports = {
             } catch (err) {
                 throw new BadRequestError({
                     err,
-                    message: i18n.t('errors.mail.failedSendingEmail.error')
+                    message: tpl(messages.error)
                 });
             }
         }
@@ -162,7 +167,7 @@ module.exports = {
                 const firstCoreSetting = frame.data.settings.find(setting => setting.group === 'core');
                 if (firstCoreSetting) {
                     throw new NoPermissionError({
-                        message: i18n.t('errors.api.settings.accessCoreSettingFromExtReq')
+                        message: tpl(messages.accessCoreSettingFromExtReq)
                     });
                 }
             }

package/core/server/api/v3/slugs.js

@@ -1,7 +1,10 @@
 const models = require('../../models');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    couldNotGenerateSlug: 'Could not generate slug.'
+};
 const allowedTypes = {
     post: models.Post,
     tag: models.Tag,
@@ -36,9 +39,7 @@ module.exports = {
             return models.Base.Model.generateSlug(allowedTypes[frame.options.type], frame.data.name, {status: 'all'})
                 .then((slug) => {
                     if (!slug) {
-                        return Promise.reject(new errors.GhostError({
-                            message: i18n.t('errors.api.slugs.couldNotGenerateSlug')
-                        }));
+                        return Promise.reject(new errors.GhostError({message: tpl(messages.couldNotGenerateSlug)}));
                     }
                     return slug;
                 });

package/core/server/api/v3/utils/serializers/output/authentication.js

@@ -1,7 +1,13 @@
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const mapper = require('./utils/mapper');
 const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:authentication');
 
+const messages = {
+    checkEmailForInstructions: 'Check your email for further instructions.',
+    passwordChanged: 'Password changed successfully.',
+    invitationAccepted: 'Invitation accepted.'
+};
+
 module.exports = {
     setup(user, apiConfig, frame) {
         frame.response = {
@@ -28,7 +34,7 @@ module.exports = {
     generateResetToken(data, apiConfig, frame) {
         frame.response = {
             passwordreset: [{
-                message: i18n.t('common.api.authentication.mail.checkEmailForInstructions')
+                message: tpl(messages.checkEmailForInstructions)
             }]
         };
     },
@@ -36,7 +42,7 @@ module.exports = {
     resetPassword(data, apiConfig, frame) {
         frame.response = {
             passwordreset: [{
-                message: i18n.t('common.api.authentication.mail.passwordChanged')
+                message: tpl(messages.passwordChanged)
             }]
         };
     },
@@ -46,7 +52,7 @@ module.exports = {
 
         frame.response = {
             invitation: [
-                {message: i18n.t('common.api.authentication.mail.invitationAccepted')}
+                {message: tpl(messages.invitationAccepted)}
             ]
         };
     },

package/core/server/api/v3/utils/serializers/output/notifications.js

@@ -19,6 +19,7 @@ module.exports = {
             delete notification.seen;
             delete notification.seenBy;
             delete notification.addedAt;
+            delete notification.createdAtVersion;
         });
 
         frame.response = {

package/core/server/api/v3/utils/serializers/output/settings.js

@@ -55,9 +55,8 @@ module.exports = {
         this.browse(...arguments);
     },
 
-    edit(models, apiConfig, frame) {
-        const settingsKeyedJSON = _.keyBy(_.invokeMap(models, 'toJSON'), 'key');
-        this.browse(settingsKeyedJSON, apiConfig, frame);
+    edit() {
+        this.browse(...arguments);
     },
 
     download(bytes, apiConfig, frame) {

package/core/server/api/v3/utils/serializers/output/users.js

@@ -1,7 +1,11 @@
 const debug = require('@tryghost/debug')('api:v3:utils:serializers:output:users');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const mapper = require('./utils/mapper');
 
+const messages = {
+    pwdChangedSuccessfully: 'Password changed successfully.'
+};
+
 module.exports = {
     browse(models, apiConfig, frame) {
         debug('browse');
@@ -39,7 +43,7 @@ module.exports = {
         debug('changePassword');
 
         frame.response = {
-            password: [{message: i18n.t('notices.api.users.pwdChangedSuccessfully')}]
+            password: [{message: tpl(messages.pwdChangedSuccessfully)}]
         };
     },
 

package/core/server/api/v3/utils/serializers/output/utils/url.js

@@ -1,4 +1,4 @@
-const urlService = require('../../../../../../../frontend/services/url');
+const urlService = require('../../../../../../services/url');
 const urlUtils = require('../../../../../../../shared/url-utils');
 const localUtils = require('../../../index');
 

package/core/server/api/v3/utils/validators/input/images.js

@@ -1,9 +1,14 @@
 const jsonSchema = require('../utils/json-schema');
 const config = require('../../../../../../shared/config');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const {imageSize, blogIcon} = require('../../../../../lib/image');
 
+const messages = {
+    isNotSquare: 'Please select a valid image file with square dimensions.',
+    invalidFile: 'Icon must be a square .ico or .png file between 60px – 1,000px, under 100kb.'
+};
+
 const profileImage = (frame) => {
     return imageSize.getImageSizeFromPath(frame.file.path).then((response) => {
         // save the image dimensions in new property for file
@@ -12,7 +17,7 @@ const profileImage = (frame) => {
         // CASE: file needs to be a square
         if (frame.file.dimensions.width !== frame.file.dimensions.height) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.api.images.isNotSquare')
+                message: tpl(messages.isNotSquare)
             }));
         }
     });
@@ -28,7 +33,7 @@ const icon = (frame) => {
     // CASE: file should not be larger than 100kb
     if (!validIconFileSize(frame.file.size)) {
         return Promise.reject(new errors.ValidationError({
-            message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})
+            message: tpl(messages.invalidFile, {extensions: iconExtensions})
         }));
     }
 
@@ -39,7 +44,7 @@ const icon = (frame) => {
         // CASE: file needs to be a square
         if (frame.file.dimensions.width !== frame.file.dimensions.height) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})
+                message: tpl(messages.invalidFile, {extensions: iconExtensions})
             }));
         }
 
@@ -47,14 +52,14 @@ const icon = (frame) => {
         // .ico files can contain multiple sizes, we need at least a minimum of 60px (16px is ok, as long as 60px are present as well)
         if (frame.file.dimensions.width < 60) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})
+                message: tpl(messages.invalidFile, {extensions: iconExtensions})
             }));
         }
 
         // CASE: icon needs to be smaller than or equal to 1000px
         if (frame.file.dimensions.width > 1000) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})
+                message: tpl(messages.invalidFile, {extensions: iconExtensions})
             }));
         }
     });
@@ -77,4 +82,4 @@ module.exports = {
                 }
             });
     }
-};
+};

package/core/server/api/v3/utils/validators/input/invitations.js

@@ -1,9 +1,17 @@
 const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const debug = require('@tryghost/debug')('api:v3:utils:validators:input:invitation');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    noTokenProvided: 'No token provided.',
+    noEmailProvided: 'No email provided.',
+    noPasswordProvided: 'No password provided.',
+    noNameProvided: 'No name provided.',
+    invalidEmailReceived: 'The server did not receive a valid email'
+};
+
 module.exports = {
     acceptInvitation(apiConfig, frame) {
         debug('acceptInvitation');
@@ -11,19 +19,19 @@ module.exports = {
         const data = frame.data.invitation[0];
 
         if (!data.token) {
-            return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noTokenProvided')}));
+            return Promise.reject(new errors.ValidationError({message: tpl(messages.noTokenProvided)}));
         }
 
         if (!data.email) {
-            return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noEmailProvided')}));
+            return Promise.reject(new errors.ValidationError({message: tpl(messages.noEmailProvided)}));
         }
 
         if (!data.password) {
-            return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noPasswordProvided')}));
+            return Promise.reject(new errors.ValidationError({message: tpl(messages.noPasswordProvided)}));
         }
 
         if (!data.name) {
-            return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noNameProvided')}));
+            return Promise.reject(new errors.ValidationError({message: tpl(messages.noNameProvided)}));
         }
     },
 
@@ -34,7 +42,7 @@ module.exports = {
 
         if (typeof email !== 'string' || !validator.isEmail(email)) {
             throw new errors.BadRequestError({
-                message: i18n.t('errors.api.authentication.invalidEmailReceived')
+                message: tpl(messages.invalidEmailReceived)
             });
         }
     }

package/core/server/api/v3/utils/validators/input/invites.js

@@ -1,15 +1,19 @@
 const Promise = require('bluebird');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../../../../models');
 
+const messages = {
+    userAlreadyRegistered: 'User is already registered.'
+};
+
 module.exports = {
     add(apiConfig, frame) {
         return models.User.findOne({email: frame.data.invites[0].email}, frame.options)
             .then((user) => {
                 if (user) {
                     return Promise.reject(new errors.ValidationError({
-                        message: i18n.t('errors.api.users.userAlreadyRegistered')
+                        message: tpl(messages.userAlreadyRegistered)
                     }));
                 }
             });

package/core/server/api/v3/utils/validators/input/oembed.js

@@ -1,12 +1,16 @@
 const Promise = require('bluebird');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    noUrlProvided: 'No url provided.'
+};
+
 module.exports = {
     read(apiConfig, frame) {
         if (!frame.data.url || !frame.data.url.trim()) {
             return Promise.reject(new errors.BadRequestError({
-                message: i18n.t('errors.api.oembed.noUrlProvided')
+                message: tpl(messages.noUrlProvided)
             }));
         }
     }

package/core/server/api/v3/utils/validators/input/passwordreset.js

@@ -1,9 +1,14 @@
 const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const debug = require('@tryghost/debug')('api:v3:utils:validators:input:passwordreset');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    newPasswordsDoNotMatch: 'Your new passwords do not match',
+    invalidEmailReceived: 'The server did not receive a valid email'
+};
+
 module.exports = {
     resetPassword(apiConfig, frame) {
         debug('resetPassword');
@@ -12,7 +17,7 @@ module.exports = {
 
         if (data.newPassword !== data.ne2Password) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.models.user.newPasswordsDoNotMatch')
+                message: tpl(messages.newPasswordsDoNotMatch)
             }));
         }
     },
@@ -24,7 +29,7 @@ module.exports = {
 
         if (typeof email !== 'string' || !validator.isEmail(email)) {
             throw new errors.BadRequestError({
-                message: i18n.t('errors.api.authentication.invalidEmailReceived')
+                message: tpl(messages.invalidEmailReceived)
             });
         }
     }

package/core/server/api/v3/utils/validators/input/settings.js

@@ -1,12 +1,13 @@
 const Promise = require('bluebird');
 const _ = require('lodash');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const {NotFoundError, ValidationError, BadRequestError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
 
 const messages = {
     invalidEmailReceived: 'Please send a valid email',
-    invalidEmailTypeReceived: 'Invalid email type received'
+    invalidEmailTypeReceived: 'Invalid email type received',
+    problemFindingSetting: 'Problem finding setting: {key}'
 };
 
 module.exports = {
@@ -14,7 +15,7 @@ module.exports = {
         // @NOTE: was removed https://github.com/TryGhost/Ghost/issues/10373
         if (frame.options.key === 'ghost_head' || frame.options.key === 'ghost_foot') {
             return Promise.reject(new NotFoundError({
-                message: i18n.t('errors.api.settings.problemFindingSetting', {
+                message: tpl(messages.problemFindingSetting, {
                     key: frame.options.key
                 })
             }));
@@ -28,7 +29,7 @@ module.exports = {
             if (setting.key === 'ghost_head' || setting.key === 'ghost_foot') {
                 // @NOTE: was removed https://github.com/TryGhost/Ghost/issues/10373
                 errors.push(new NotFoundError({
-                    message: i18n.t('errors.api.settings.problemFindingSetting', {
+                    message: tpl(messages.problemFindingSetting, {
                         key: setting.key
                     })
                 }));

package/core/server/api/v3/utils/validators/input/setup.js

@@ -1,13 +1,17 @@
 const debug = require('@tryghost/debug')('api:v3:utils:validators:input:updateSetup');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    notTheBlogOwner: 'You are not the site owner.'
+};
+
 module.exports = {
     updateSetup(apiConfig, frame) {
         debug('resetPassword');
 
         if (!frame.options.context || !frame.options.context.user) {
-            throw new errors.NoPermissionError({message: i18n.t('errors.api.authentication.notTheBlogOwner')});
+            throw new errors.NoPermissionError({message: tpl(messages.notTheBlogOwner)});
         }
     }
 };

package/core/server/api/v3/utils/validators/input/users.js

@@ -1,8 +1,12 @@
 const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('api:v3:utils:validators:input:users');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    newPasswordsDoNotMatch: 'Your new passwords do not match'
+};
+
 module.exports = {
     changePassword(apiConfig, frame) {
         debug('changePassword');
@@ -11,7 +15,7 @@ module.exports = {
 
         if (data.newPassword !== data.ne2Password) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.models.user.newPasswordsDoNotMatch')
+                message: tpl(messages.newPasswordsDoNotMatch)
             }));
         }
     }

package/core/server/api/v3/utils/validators/input/webhooks.js

@@ -1,16 +1,21 @@
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const jsonSchema = require('../utils/json-schema');
 
+const messages = {
+    schemaValidationFailed: 'Validation failed for \'{key}\'.',
+    noIntegrationIdProvidedContext: 'You may only create webhooks with \'integration_id\' when using session authentication.'
+};
+
 module.exports = {
     add(apiConfig, frame) {
         if (!_.get(frame, 'options.context.integration.id') && !_.get(frame.data, 'webhooks[0].integration_id')) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('notices.data.validation.index.schemaValidationFailed', {
+                message: tpl(messages.schemaValidationFailed, {
                     key: 'integration_id'
                 }),
-                context: i18n.t('errors.api.webhooks.noIntegrationIdProvided.context'),
+                context: tpl(messages.noIntegrationIdProvidedContext),
                 property: 'integration_id'
             }));
         }

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

@@ -37,7 +37,8 @@ const BACKUP_TABLES = [
     'members_paid_subscription_events',
     'members_subscribe_events',
     'members_product_events',
-    'offers'
+    'offers',
+    'offer_redemptions'
 ];
 
 // NOTE: exposing only tables which are going to be included in a "default" export file

package/core/server/data/importer/handlers/image.js

@@ -13,7 +13,7 @@ ImageHandler = {
     directories: ['images', 'content'],
 
     loadFile: function (files, baseDir) {
-        const store = storage.getStorage();
+        const store = storage.getStorage('images');
         const baseDirRegex = baseDir ? new RegExp('^' + baseDir + '/') : new RegExp('');
 
         const imageFolderRegexes = _.map(urlUtils.STATIC_IMAGE_URL_PREFIX.split('/'), function (dir) {

package/core/server/data/importer/importers/image.js

@@ -64,7 +64,7 @@ ImageImporter = {
         return importData;
     },
     doImport: function (imageData) {
-        const store = storage.getStorage();
+        const store = storage.getStorage('images');
 
         return Promise.map(imageData, function (image) {
             return store.save(image, image.targetDir).then(function (result) {

package/core/server/data/migrations/init/1-create-tables.js

@@ -4,27 +4,26 @@ const schema = require('../../schema').tables;
 const logging = require('@tryghost/logging');
 const schemaTables = Object.keys(schema);
 
-module.exports.up = function createTables(options) {
+module.exports.up = async (options) => {
     const connection = options.connection;
 
-    return Promise.mapSeries(schemaTables, function createTable(table) {
+    await Promise.mapSeries(schemaTables, async (table) => {
         logging.info('Creating table: ' + table);
-        return commands.createTable(table, connection);
+        await commands.createTable(table, connection);
     });
 };
 
 /**
- *
  @TODO: This works, but is very dangerous in the current state of the knex-migrator v3.
- @TODO: Enable if knex-migrator v3 is stable.
- module.exports.down = function dropTables(options) {
+ @TODO: Decide if we should enable or delete this
+ module.exports.down = async (options) => {
         var connection = options.connection;
 
         // Reference between tables!
         schemaTables.reverse();
-        return Promise.mapSeries(schemaTables, function dropTable(table) {
+        await Promise.mapSeries(schemaTables, async (table) => {
             logging.info('Drop table: ' + table);
-            return commands.deleteTable(table, connection);
+            await commands.deleteTable(table, connection);
         });
     };
  */

package/core/server/data/migrations/init/2-create-fixtures.js

@@ -7,20 +7,20 @@ module.exports.config = {
     transaction: true
 };
 
-module.exports.up = function insertFixtures(options) {
+module.exports.up = async (options) => {
     const localOptions = _.merge({
         context: {internal: true},
         migrating: true
     }, options);
 
-    return Promise.mapSeries(fixtures.models, function (model) {
+    await Promise.mapSeries(fixtures.models, async (model) => {
         logging.info('Model: ' + model.name);
 
-        return fixtures.utils.addFixturesForModel(model, localOptions);
-    }).then(function () {
-        return Promise.mapSeries(fixtures.relations, function (relation) {
-            logging.info('Relation: ' + relation.from.model + ' to ' + relation.to.model);
-            return fixtures.utils.addFixturesForRelation(relation, localOptions);
-        });
+        await fixtures.utils.addFixturesForModel(model, localOptions);
+    });
+
+    await Promise.mapSeries(fixtures.relations, async (relation) => {
+        logging.info('Relation: ' + relation.from.model + ' to ' + relation.to.model);
+        await fixtures.utils.addFixturesForRelation(relation, localOptions);
     });
 };

package/core/server/data/migrations/versions/4.19/01-add-active-column-to-offers.js

@@ -0,0 +1,7 @@
+const utils = require('../../utils');
+
+module.exports = utils.createAddColumnMigration('offers', 'active', {
+    type: 'boolean',
+    nullable: false,
+    defaultTo: true
+});

package/core/server/data/migrations/versions/4.19/02-add-offer-redemptions-table.js

@@ -0,0 +1,8 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('offer_redemptions', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    offer_id: {type: 'string', maxlength: 24, nullable: false, references: 'offers.id', cascadeDelete: true},
+    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}
+});

package/core/server/data/migrations/versions/4.20/01-remove-offer-redemptions-table.js

@@ -0,0 +1,19 @@
+const utils = require('../../utils');
+
+const migration = utils.addTable('offer_redemptions', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    offer_id: {type: 'string', maxlength: 24, nullable: false, references: 'offers.id', cascadeDelete: true},
+    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}
+});
+
+// This reverses an "addTable" migration so that we
+// drop the table going forwards and re-add it going back
+const up = migration.down;
+const down = migration.up;
+
+migration.up = up;
+migration.down = down;
+
+module.exports = migration;
+