ghost 4.38.1 → 4.40.0

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

@@ -1,6 +1,6 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:users');
 const tpl = require('@tryghost/tpl');
-const mapper = require('./utils/mapper');
+const mappers = require('./mappers');
 
 const messages = {
     pwdChangedSuccessfully: 'Password changed successfully.'
@@ -11,7 +11,7 @@ module.exports = {
         debug('browse');
 
         frame.response = {
-            users: models.data.map(model => mapper.mapUser(model, frame)),
+            users: models.data.map(model => mappers.users(model, frame)),
             meta: models.meta
         };
     },
@@ -20,7 +20,7 @@ module.exports = {
         debug('read');
 
         frame.response = {
-            users: [mapper.mapUser(model, frame)]
+            users: [mappers.users(model, frame)]
         };
     },
 

package/core/server/api/shared/serializers/handle.js

@@ -21,11 +21,11 @@ module.exports.input = (apiConfig, apiSerializers, frame) => {
     const tasks = [];
     const sharedSerializers = require('./input');
 
-    if (!apiSerializers) {
+    if (!apiConfig) {
         return Promise.reject(new errors.IncorrectUsageError());
     }
 
-    if (!apiConfig) {
+    if (!apiSerializers) {
         return Promise.reject(new errors.IncorrectUsageError());
     }
 

package/core/server/api/v2/utils/serializers/input/pages.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:pages');
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const url = require('./utils/url');

package/core/server/api/v2/utils/serializers/input/posts.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:posts');
 const url = require('./utils/url');
 const localUtils = require('../../index');

package/core/server/api/v3/utils/serializers/input/pages.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:pages');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');

package/core/server/api/v3/utils/serializers/input/posts.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:posts');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');

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

@@ -31,6 +31,7 @@ const BACKUP_TABLES = [
     'mobiledoc_revisions',
     'email_batches',
     'email_recipients',
+    'members_cancel_events',
     'members_payment_events',
     'members_login_events',
     'members_email_change_events',

package/core/server/data/importer/import-manager.js

@@ -1,12 +1,10 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const fs = require('fs-extra');
 const path = require('path');
 const os = require('os');
 const glob = require('glob');
 const uuid = require('uuid');
 const {extract} = require('@tryghost/zip');
-const {pipeline, sequence} = require('@tryghost/promise');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
@@ -21,7 +19,6 @@ const messages = {
         error: 'Import could not clean up file ',
         context: 'Your site will continue to work as expected'
     },
-    unsupportedRoonExport: 'Your zip file looks like an old format Roon export, please re-export your Roon blog and try again.',
     noContentToImport: 'Zip did not include any content to import.',
     invalidZipStructure: 'Invalid zip file structure.',
     invalidZipFileBaseDirectory: 'Invalid zip file: base directory read failed',
@@ -41,10 +38,20 @@ let defaults = {
 
 class ImportManager {
     constructor() {
+        /**
+         * @type {Importer[]} importers
+         */
         this.importers = [ImageImporter, DataImporter];
+
+        /**
+         * @type {Handler[]}
+         */
         this.handlers = [ImageHandler, JSONHandler, MarkdownHandler];
 
         // Keep track of file to cleanup at the end
+        /**
+         * @type {?string}
+         */
         this.fileToDelete = null;
     }
 
@@ -53,7 +60,7 @@ class ImportManager {
      * @returns {string[]}
      */
     getExtensions() {
-        return _.flatten(_.union(_.map(this.handlers, 'extensions'), defaults.extensions));
+        return _.union(_.flatMap(this.handlers, 'extensions'), defaults.extensions);
     }
 
     /**
@@ -61,7 +68,7 @@ class ImportManager {
      * @returns {string[]}
      */
     getContentTypes() {
-        return _.flatten(_.union(_.map(this.handlers, 'contentTypes'), defaults.contentTypes));
+        return _.union(_.flatMap(this.handlers, 'contentTypes'), defaults.contentTypes);
     }
 
     /**
@@ -69,7 +76,7 @@ class ImportManager {
      * @returns {string[]}
      */
     getDirectories() {
-        return _.flatten(_.union(_.map(this.handlers, 'directories'), defaults.directories));
+        return _.union(_.flatMap(this.handlers, 'directories'), defaults.directories);
     }
 
     /**
@@ -85,7 +92,7 @@ class ImportManager {
 
     /**
      * @param {String[]} extensions
-     * @param {Number} level
+     * @param {Number} [level]
      * @returns {String}
      */
     getExtensionGlob(extensions, level) {
@@ -98,7 +105,7 @@ class ImportManager {
     /**
      *
      * @param {String[]} directories
-     * @param {Number} level
+     * @param {Number} [level]
      * @returns {String}
      */
     getDirectoryGlob(directories, level) {
@@ -110,26 +117,24 @@ class ImportManager {
 
     /**
      * Remove files after we're done (abstracted into a function for easier testing)
-     * @returns {Function}
+     * @returns {Promise<void>}
      */
-    cleanUp() {
-        const self = this;
-
-        if (self.fileToDelete === null) {
+    async cleanUp() {
+        if (this.fileToDelete === null) {
             return;
         }
 
-        fs.remove(self.fileToDelete, function (err) {
-            if (err) {
-                logging.error(new errors.InternalServerError({
-                    err: err,
-                    context: tpl(messages.couldNotCleanUpFile.error),
-                    help: tpl(messages.couldNotCleanUpFile.context)
-                }));
-            }
+        try {
+            await fs.remove(this.fileToDelete);
+        } catch (err) {
+            logging.error(new errors.InternalServerError({
+                err: err,
+                context: tpl(messages.couldNotCleanUpFile.error),
+                help: tpl(messages.couldNotCleanUpFile.context)
+            }));
+        }
 
-            self.fileToDelete = null;
-        });
+        this.fileToDelete = null;
     }
 
     /**
@@ -146,28 +151,20 @@ class ImportManager {
      * Importable content must be found either in the root, or inside one base directory
      *
      * @param {String} directory
-     * @returns {Promise}
+     * @returns {boolean}
      */
     isValidZip(directory) {
         // Globs match content in the root or inside a single directory
-        const extMatchesBase = glob.sync(this.getExtensionGlob(this.getExtensions(), ROOT_OR_SINGLE_DIR), {cwd: directory});
+        const extMatchesBase = glob.sync(this.getExtensionGlob(this.getExtensions(), ROOT_OR_SINGLE_DIR), {cwd: directory, nocase: true});
 
         const extMatchesAll = glob.sync(
-            this.getExtensionGlob(this.getExtensions(), ALL_DIRS), {cwd: directory}
+            this.getExtensionGlob(this.getExtensions(), ALL_DIRS), {cwd: directory, nocase: true}
         );
 
         const dirMatches = glob.sync(
             this.getDirectoryGlob(this.getDirectories(), ROOT_OR_SINGLE_DIR), {cwd: directory}
         );
 
-        const oldRoonMatches = glob.sync(this.getDirectoryGlob(['drafts', 'published', 'deleted'], ROOT_OR_SINGLE_DIR),
-            {cwd: directory});
-
-        // This is a temporary extra message for the old format roon export which doesn't work with Ghost
-        if (oldRoonMatches.length > 0) {
-            throw new errors.UnsupportedMediaTypeError({message: tpl(messages.unsupportedRoonExport)});
-        }
-
         // If this folder contains importable files or a content or images directory
         if (extMatchesBase.length > 0 || (dirMatches.length > 0 && extMatchesAll.length > 0)) {
             return true;
@@ -182,8 +179,8 @@ class ImportManager {
 
     /**
      * Use the extract module to extract the given zip file to a temp directory & return the temp directory path
-     * @param {String} filePath
-     * @returns {Promise[]} Files
+     * @param {string} filePath
+     * @returns {Promise<string>} full path to the extracted folder
      */
     extractZip(filePath) {
         const tmpDir = path.join(os.tmpdir(), uuid.v4());
@@ -199,11 +196,11 @@ class ImportManager {
      * are relevant to the given handler, and return them as a name and path combo
      * @param {Object} handler
      * @param {String} directory
-     * @returns [] Files
+     * @returns {File[]} Files
      */
     getFilesFromZip(handler, directory) {
         const globPattern = this.getExtensionGlob(handler.extensions, ALL_DIRS);
-        return _.map(glob.sync(globPattern, {cwd: directory}), function (file) {
+        return _.map(glob.sync(globPattern, {cwd: directory, nocase: true}), function (file) {
             return {name: file, path: path.join(directory, file)};
         });
     }
@@ -215,9 +212,9 @@ class ImportManager {
      */
     getBaseDirectory(directory) {
         // Globs match root level only
-        const extMatches = glob.sync(this.getExtensionGlob(this.getExtensions(), ROOT_ONLY), {cwd: directory});
+        const extMatches = glob.sync(this.getExtensionGlob(this.getExtensions(), ROOT_ONLY), {cwd: directory, nocase: true});
 
-        const dirMatches = glob.sync(this.getDirectoryGlob(this.getDirectories(), ROOT_ONLY), {cwd: directory});
+        const dirMatches = glob.sync(this.getDirectoryGlob(this.getDirectories(), ROOT_ONLY), {cwd: directory, nocase: true});
         let extMatchesAll;
 
         // There is no base directory
@@ -226,9 +223,9 @@ class ImportManager {
         }
         // There is a base directory, grab it from any ext match
         extMatchesAll = glob.sync(
-            this.getExtensionGlob(this.getExtensions(), ALL_DIRS), {cwd: directory}
+            this.getExtensionGlob(this.getExtensions(), ALL_DIRS), {cwd: directory, nocase: true}
         );
-        if (extMatchesAll.length < 1 || extMatchesAll[0].split('/') < 1) {
+        if (extMatchesAll.length < 1 || extMatchesAll[0].split('/').length < 1) {
             throw new errors.ValidationError({message: tpl(messages.invalidZipFileBaseDirectory)});
         }
 
@@ -242,48 +239,42 @@ class ImportManager {
      * The data key contains JSON representing any data that should be imported
      * The image key contains references to images that will be stored (and where they will be stored)
      * @param {File} file
-     * @returns {Promise(ImportData)}
+     * @returns {Promise<ImportData>}
      */
-    processZip(file) {
-        const self = this;
+    async processZip(file) {
+        const zipDirectory = await this.extractZip(file.path);
 
-        return this.extractZip(file.path).then(function (zipDirectory) {
-            const ops = [];
-            const importData = {};
-            let baseDir;
+        /**
+         * @type {ImportData}
+         */
+        const importData = {};
+
+        this.isValidZip(zipDirectory);
+        const baseDir = this.getBaseDirectory(zipDirectory);
 
-            self.isValidZip(zipDirectory);
-            baseDir = self.getBaseDirectory(zipDirectory);
+        for (const handler of this.handlers) {
+            const files = this.getFilesFromZip(handler, zipDirectory);
 
-            _.each(self.handlers, function (handler) {
+            if (files.length > 0) {
                 if (Object.prototype.hasOwnProperty.call(importData, handler.type)) {
                     // This limitation is here to reduce the complexity of the importer for now
-                    return Promise.reject(new errors.UnsupportedMediaTypeError({
+                    throw new errors.UnsupportedMediaTypeError({
                         message: tpl(messages.zipContainsMultipleDataFormats)
-                    }));
-                }
-
-                const files = self.getFilesFromZip(handler, zipDirectory);
-
-                if (files.length > 0) {
-                    ops.push(function () {
-                        return handler.loadFile(files, baseDir).then(function (data) {
-                            importData[handler.type] = data;
-                        });
                     });
                 }
-            });
 
-            if (ops.length === 0) {
-                return Promise.reject(new errors.UnsupportedMediaTypeError({
-                    message: tpl(messages.noContentToImport)
-                }));
+                const data = await handler.loadFile(files, baseDir);
+                importData[handler.type] = data;
             }
+        }
 
-            return sequence(ops).then(function () {
-                return importData;
+        if (Object.keys(importData).length === 0) {
+            throw new errors.UnsupportedMediaTypeError({
+                message: tpl(messages.noContentToImport)
             });
-        });
+        }
+
+        return importData;
     }
 
     /**
@@ -293,7 +284,7 @@ class ImportManager {
      * The data key contains JSON representing any data that should be imported
      * The image key contains references to images that will be stored (and where they will be stored)
      * @param {File} file
-     * @returns {Promise(ImportData)}
+     * @returns {Promise<ImportData>}
      */
     processFile(file, ext) {
         const fileHandler = _.find(this.handlers, function (handler) {
@@ -313,7 +304,7 @@ class ImportManager {
      * Load the given file into usable importData in the format: {data: {}, images: []}, regardless of
      * whether the file is a single importable file like a JSON file, or a zip file containing loads of files.
      * @param {File} file
-     * @returns {Promise}
+     * @returns {Promise<ImportData>}
      */
     loadFile(file) {
         const self = this;
@@ -326,17 +317,14 @@ class ImportManager {
      * Pass the prepared importData through the preProcess function of the various importers, so that the importers can
      * make any adjustments to the data based on relationships between it
      * @param {ImportData} importData
-     * @returns {Promise(ImportData)}
+     * @returns {Promise<ImportData>}
      */
-    preProcess(importData) {
-        const ops = [];
-        _.each(this.importers, function (importer) {
-            ops.push(function () {
-                return importer.preProcess(importData);
-            });
-        });
+    async preProcess(importData) {
+        for (const importer of this.importers) {
+            importData = importer.preProcess(importData);
+        }
 
-        return pipeline(ops);
+        return Promise.resolve(importData);
     }
 
     /**
@@ -344,65 +332,116 @@ class ImportManager {
      * Each importer gets passed the data from importData which has the key matching its type - i.e. it only gets the
      * data that it should import. Each importer then handles actually importing that data into Ghost
      * @param {ImportData} importData
-     * @param {Object} importOptions to allow override of certain import features such as locking a user
-     * @returns {Promise<any>}
+     * @param {ImportOptions} [importOptions] to allow override of certain import features such as locking a user
+     * @returns {Promise<ImportResult[]>} importResults
      */
-    doImport(importData, importOptions) {
+    async doImport(importData, importOptions) {
         importOptions = importOptions || {};
-        const ops = [];
-        _.each(this.importers, function (importer) {
+        const importResults = [];
+
+        for (const importer of this.importers) {
             if (Object.prototype.hasOwnProperty.call(importData, importer.type)) {
-                ops.push(function () {
-                    return importer.doImport(importData[importer.type], importOptions);
-                });
+                importResults.push(await importer.doImport(importData[importer.type], importOptions));
             }
-        });
+        }
 
-        return sequence(ops).then(function (importResult) {
-            return importResult;
-        });
+        return importResults;
     }
 
     /**
      * Import Step 4:
      * Report on what was imported, currently a no-op
-     * @param {ImportData} importData
-     * @returns {Promise<ImportData>}
+     * @param {ImportResult[]} importResults
+     * @returns {Promise<ImportResult[]>} importResults
      */
-    generateReport(importData) {
-        return Promise.resolve(importData);
+    async generateReport(importResults) {
+        return Promise.resolve(importResults);
     }
 
     /**
      * Import From File
      * The main method of the ImportManager, call this to kick everything off!
      * @param {File} file
-     * @param {Object} importOptions to allow override of certain import features such as locking a user
-     * @returns {Promise}
+     * @param {ImportOptions} importOptions to allow override of certain import features such as locking a user
+     * @returns {Promise<ImportResult[]>}
      */
-    importFromFile(file, importOptions = {}) {
-        const self = this;
+    async importFromFile(file, importOptions = {}) {
+        try {
+            // Step 1: Handle converting the file to usable data
+            let importData = await this.loadFile(file);
 
-        // Step 1: Handle converting the file to usable data
-        return this.loadFile(file).then(function (importData) {
             // Step 2: Let the importers pre-process the data
-            return self.preProcess(importData);
-        }).then(function (importData) {
+            importData = await this.preProcess(importData);
+        
             // Step 3: Actually do the import
             // @TODO: It would be cool to have some sort of dry run flag here
-            return self.doImport(importData, importOptions);
-        }).then(function (importData) {
+            let importResult = await this.doImport(importData, importOptions);
+            
             // Step 4: Report on the import
-            return self.generateReport(importData);
-        }).finally(() => self.cleanUp()); // Step 5: Cleanup any files
+            return await this.generateReport(importResult);
+        } finally {
+            // Step 5: Cleanup any files
+            this.cleanUp();
+        }
     }
 }
 
 /**
- * A number, or a string containing a number.
+ * @typedef {object} ImportOptions
+ * @property {boolean} [returnImportedData]
+ * @property {boolean} [importPersistUser]
+ */
+
+/**
+ * @typedef {object} Importer
+ * @property {"images"|"data"} type
+ * @property {PreProcessMethod} preProcess
+ * @property {DoImportMethod} doImport
+ */
+
+/**
+ * @callback PreProcessMethod
+ * @param {ImportData} importData
+ * @returns {ImportData}
+ */
+
+/**
+ * @callback DoImportMethod
+ * @param {object|object[]} importData
+ * @param {ImportOptions} importOptions
+ * @returns {Promise<ImportResult>} import result
+ */
+
+/**
+ * @typedef {object} Handler
+ * @property {"images"|"data"} type
+ * @property {string[]} extensions
+ * @property {string[]} contentTypes
+ * @property {string[]} directories
+ * @property {LoadFileMethod} loadFile
+ */
+
+/**
+ * @callback LoadFileMethod
+ * @param {File[]} files
+ * @param {string} [baseDir]
+ * @returns {Promise<object[]|object>} data
+ */
+
+/**
+ * File object
+ * @typedef {Object} File
+ * @property {string} name
+ * @property {string} path
+ */
+
+/**
  * @typedef {Object} ImportData
- * @property [Object] data
- * @property [Array] images
+ * @property {Object} [data]
+ * @property {Array} [images]
  */
 
+/**
+ * @typedef {Object} ImportResult
+ */
 module.exports = new ImportManager();

package/core/server/data/migrations/versions/4.33/2022-01-14-11-51-add-default-free-tier.js

@@ -19,6 +19,9 @@ module.exports = createTransactionalMigration(
         const id = ObjectID().toHexString();
 
         logging.info(`Adding tier "${name}"`);
+
+        // `slugify(id) is used to ensure unique slug here, as existing tiers could be using any name including "Free"
+        // slugs are not used anywhere user-facing so the value is acceptable
         await knex('products')
             .insert({
                 id: id,

package/core/server/data/migrations/versions/4.39/2022-03-07-10-57-update-free-products-visibility-column.js

@@ -0,0 +1,66 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const portalPlanSetting = await knex('settings').select('value').where('key', 'portal_plans').first();
+
+        if (!portalPlanSetting) {
+            logging.warn('Could not find portal_plans setting - skipping migration');
+            return;
+        }
+
+        try {
+            const settingData = JSON.parse(portalPlanSetting.value);
+
+            if (!settingData.includes('free')) {
+                logging.warn(`portal_plans does not include "free" - skipping migration`);
+                return;
+            }
+
+            logging.info(`Updating free products to visible`);
+            await knex('products').update('visibility', 'public').where('type', 'free');
+        } catch (err) {
+            logging.error(err);
+            logging.warn('portal_plans setting is invalid - skipping migration');
+            return;
+        }
+    },
+    async function down(knex) {
+        const freeTier = await knex('products').select('id').where('type', 'free').first();
+        const portalPlanSetting = await knex('settings').select('value').where('key', 'portal_plans').first();
+
+        if (!freeTier) {
+            logging.info('Free tier is not visible, not updating portal_plans');
+            return;
+        }
+
+        if (!portalPlanSetting) {
+            logging.warn('Could not find portal_plans setting - skipping migration');
+            return;
+        }
+
+        try {
+            const existingSettingData = JSON.parse(portalPlanSetting.value);
+            let settingData;
+
+            if (freeTier.visibility === 'public') {
+                if (existingSettingData.includes('free')) {
+                    logging.info('portal_plans setting already contains "free" - skipping update');
+                    return;
+                } else {
+                    settingData = JSON.stringify(existingSettingData.concat('free'));
+                }
+            } else {
+                settingData = JSON.stringify(existingSettingData.filter(value => value !== 'free'));
+            }
+
+            logging.info(`Updating portal_plans to ${settingData}`);
+            await knex('settings').update('value', settingData).where('key', 'portal_plans');
+        } catch (err) {
+            logging.error(err);
+            logging.warn('portal_plans setting is invalid - skipping migration');
+            return;
+        }
+    }
+);

package/core/server/data/migrations/versions/4.39/2022-03-07-10-57-update-products-visibility-column.js

@@ -0,0 +1,36 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const portalProductSetting = await knex('settings').select('value').where('key', 'portal_products').first();
+
+        if (!portalProductSetting) {
+            logging.warn('Could not find portal_products setting - skipping migration');
+            return;
+        }
+
+        try {
+            const settingData = JSON.parse(portalProductSetting.value);
+
+            if (settingData.length === 0) {
+                logging.warn(`portal_product is empty, skipping migrations`);
+                return;
+            }
+
+            logging.info(`Updating ${settingData.length} products to visible, ${settingData}`);
+            await knex('products').update('visibility', 'public').whereIn('id', settingData);
+        } catch (err) {
+            logging.warn('portal_products setting is invalid - skipping migration');
+            return;
+        }
+    },
+    async function down(knex) {
+        const visibleTiers = await knex('products').select('id').where('visibility', 'public');
+
+        const settingData = JSON.stringify(visibleTiers.map(obj => obj.id));
+
+        logging.info(`Updating portal_products to ${settingData}`);
+        await knex('settings').update('value', settingData).where('key', 'portal_products');
+    }
+);