ghost 4.19.1 → 4.20.3

package/core/server/adapters/storage/LocalFileStorage.js

@@ -29,27 +29,25 @@ class LocalFileStore extends StorageBase {
 
     /**
      * Saves a buffer in the targetPath
-     * - buffer is an instance of Buffer
-     * - returns a Promise which returns the full URL to retrieve the data
+     * @param {Buffer} buffer is an instance of Buffer
+     * @param {String} targetPath path to which the buffer should be written
+     * @returns {Promise<String>} a URL to retrieve the data
      */
-    saveRaw(buffer, targetPath) {
+    async saveRaw(buffer, targetPath) {
         const storagePath = path.join(this.storagePath, targetPath);
         const targetDir = path.dirname(storagePath);
 
-        return fs.mkdirs(targetDir)
-            .then(() => {
-                return fs.writeFile(storagePath, buffer);
-            })
-            .then(() => {
-                // For local file system storage can use relative path so add a slash
-                const fullUrl = (
-                    urlUtils.urlJoin('/', urlUtils.getSubdir(),
-                        urlUtils.STATIC_IMAGE_URL_PREFIX,
-                        targetPath)
-                ).replace(new RegExp(`\\${path.sep}`, 'g'), '/');
-
-                return fullUrl;
-            });
+        await fs.mkdirs(targetDir);
+        await fs.writeFile(storagePath, buffer);
+
+        // For local file system storage can use relative path so add a slash
+        const fullUrl = (
+            urlUtils.urlJoin('/', urlUtils.getSubdir(),
+                urlUtils.STATIC_IMAGE_URL_PREFIX,
+                targetPath)
+        ).replace(new RegExp(`\\${path.sep}`, 'g'), '/');
+
+        return fullUrl;
     }
 
     /**
@@ -57,34 +55,32 @@ class LocalFileStore extends StorageBase {
      * - image is the express image object
      * - returns a promise which ultimately returns the full url to the uploaded image
      *
-     * @param image
-     * @param targetDir
-     * @returns {*}
+     * @param {StorageBase.Image} image
+     * @param {String} targetDir
+     * @returns {Promise<String>}
      */
-    save(image, targetDir) {
+    async save(image, targetDir) {
         let targetFilename;
 
         // NOTE: the base implementation of `getTargetDir` returns the format this.storagePath/YYYY/MM
         targetDir = targetDir || this.getTargetDir(this.storagePath);
 
-        return this.getUniqueFileName(image, targetDir).then((filename) => {
-            targetFilename = filename;
-            return fs.mkdirs(targetDir);
-        }).then(() => {
-            return fs.copy(image.path, targetFilename);
-        }).then(() => {
-            // The src for the image must be in URI format, not a file system path, which in Windows uses \
-            // For local file system storage can use relative path so add a slash
-            const fullUrl = (
-                urlUtils.urlJoin('/', urlUtils.getSubdir(),
-                    urlUtils.STATIC_IMAGE_URL_PREFIX,
-                    path.relative(this.storagePath, targetFilename))
-            ).replace(new RegExp(`\\${path.sep}`, 'g'), '/');
-
-            return fullUrl;
-        }).catch((e) => {
-            return Promise.reject(e);
-        });
+        const filename = await this.getUniqueFileName(image, targetDir);
+
+        targetFilename = filename;
+        await fs.mkdirs(targetDir);
+
+        await fs.copy(image.path, targetFilename);
+
+        // The src for the image must be in URI format, not a file system path, which in Windows uses \
+        // For local file system storage can use relative path so add a slash
+        const fullUrl = (
+            urlUtils.urlJoin('/', urlUtils.getSubdir(),
+                urlUtils.STATIC_IMAGE_URL_PREFIX,
+                path.relative(this.storagePath, targetFilename))
+        ).replace(new RegExp(`\\${path.sep}`, 'g'), '/');
+
+        return fullUrl;
     }
 
     exists(fileName, targetDir) {

package/core/server/adapters/storage/index.js

@@ -1,7 +1,17 @@
 const adapterManager = require('../../services/adapter-manager');
 
-function getStorage() {
-    return adapterManager.getAdapter('storage');
+/**
+ * @param {'images'|'videos'|'audios'} [feature] - name for the "feature" to enable through adapter, e.g.: images or videos storage
+ * @returns {Object} adapter instance
+ */
+function getStorage(feature) {
+    let adapterName = 'storage';
+
+    if (feature) {
+        adapterName += `:${feature}`;
+    }
+
+    return adapterManager.getAdapter(adapterName);
 }
 
 module.exports.getStorage = getStorage;

package/core/server/api/canary/images.js

@@ -7,7 +7,7 @@ module.exports = {
         statusCode: 201,
         permissions: false,
         query(frame) {
-            const store = storage.getStorage();
+            const store = storage.getStorage('images');
 
             if (frame.files) {
                 return Promise

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

@@ -1,5 +1,11 @@
+const tpl = require('@tryghost/tpl');
+const errors = require('@tryghost/errors');
 const offersService = require('../../services/offers');
 
+const messages = {
+    offerNotFound: 'Offer not found.'
+};
+
 module.exports = {
     docName: 'offers',
 
@@ -21,6 +27,12 @@ module.exports = {
         permissions: true,
         async query(frame) {
             const offer = await offersService.api.getOffer(frame.data);
+            if (!offer) {
+                throw new errors.NotFoundError({
+                    message: tpl(messages.offerNotFound)
+                });
+            }
+
             frame.response = {
                 offers: [offer]
             };
@@ -38,6 +50,13 @@ module.exports = {
                 ...frame.data.offers[0],
                 id: frame.options.id
             });
+
+            if (!offer) {
+                throw new errors.NotFoundError({
+                    message: tpl(messages.offerNotFound)
+                });
+            }
+
             frame.response = {
                 offers: [offer]
             };

package/core/server/api/canary/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/canary/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/v2/images.js

@@ -7,7 +7,7 @@ module.exports = {
         statusCode: 201,
         permissions: false,
         query(frame) {
-            const store = storage.getStorage();
+            const store = storage.getStorage('images');
 
             if (frame.files) {
                 return Promise

package/core/server/api/v2/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/images.js

@@ -7,7 +7,7 @@ module.exports = {
         statusCode: 201,
         permissions: false,
         query(frame) {
-            const store = storage.getStorage();
+            const store = storage.getStorage('images');
 
             if (frame.files) {
                 return Promise

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/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/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.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;
+

package/core/server/data/migrations/versions/4.20/02-remove-offers-table.js

@@ -0,0 +1,30 @@
+const utils = require('../../utils');
+
+const migration = utils.addTable('offers', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    active: {type: 'boolean', nullable: false, defaultTo: true},
+    name: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    code: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    product_id: {type: 'string', maxlength: 24, nullable: false, references: 'products.id'},
+    stripe_coupon_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
+    interval: {type: 'string', maxlength: 50, nullable: false},
+    currency: {type: 'string', maxlength: 50, nullable: true},
+    discount_type: {type: 'string', maxlength: 50, nullable: false},
+    discount_amount: {type: 'integer', nullable: false},
+    duration: {type: 'string', maxlength: 50, nullable: false},
+    duration_in_months: {type: 'integer', nullable: true},
+    portal_title: {type: 'string', maxlength: 191, nullable: false},
+    portal_description: {type: 'string', maxlength: 2000, nullable: true},
+    created_at: {type: 'dateTime', nullable: false},
+    updated_at: {type: 'dateTime', nullable: 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;

package/core/server/data/migrations/versions/4.20/03-add-offers-table.js

@@ -0,0 +1,21 @@
+const utils = require('../../utils');
+
+module.exports = utils.addTable('offers', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    active: {type: 'boolean', nullable: false, defaultTo: true},
+    name: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    code: {type: 'string', maxlength: 191, nullable: false, unique: true},
+    product_id: {type: 'string', maxlength: 24, nullable: false, references: 'products.id'},
+    stripe_coupon_id: {type: 'string', maxlength: 255, nullable: true, unique: true},
+    interval: {type: 'string', maxlength: 50, nullable: false},
+    currency: {type: 'string', maxlength: 50, nullable: true},
+    discount_type: {type: 'string', maxlength: 50, nullable: false},
+    discount_amount: {type: 'integer', nullable: false},
+    duration: {type: 'string', maxlength: 50, nullable: false},
+    duration_in_months: {type: 'integer', nullable: true},
+    portal_title: {type: 'string', maxlength: 191, nullable: false},
+    portal_description: {type: 'string', maxlength: 2000, nullable: true},
+    created_at: {type: 'dateTime', nullable: false},
+    updated_at: {type: 'dateTime', nullable: true}
+});
+

package/core/server/data/migrations/versions/4.20/04-add-offer-redemptions-table.js

@@ -0,0 +1,9 @@
+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},
+    created_at: {type: 'dateTime', nullable: false}
+});

package/core/server/data/migrations/versions/4.20/05-remove-not-null-constraint-from-portal-title.js

@@ -0,0 +1,41 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+const {addUnique} = require('../../../schema/commands');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        logging.info('Dropping NOT NULL constraint for: portal_title in table: offers');
+
+        await knex.schema.table('offers', function (table) {
+            table.dropColumn('portal_title');
+        });
+
+        await knex.schema.table('offers', function (table) {
+            table.string('portal_title', 191).nullable();
+        });
+
+        if (knex.client.config.client === 'sqlite3') {
+            for (const column of ['name', 'code', 'stripe_coupon_id']) {
+                await addUnique('offers', column, knex);
+            }
+        }
+    },
+    async function down(knex) {
+        logging.info('Adding NOT NULL constraint for: portal_title in table: offers');
+
+        await knex.schema.table('offers', function (table) {
+            table.dropColumn('portal_title');
+        });
+
+        await knex.schema.table('offers', function (table) {
+            table.string('portal_title', 191).notNullable();
+        });
+
+        if (knex.client.config.client === 'sqlite3') {
+            for (const column of ['name', 'code', 'stripe_coupon_id']) {
+                await addUnique('offers', column, knex);
+            }
+        }
+    }
+);
+