ghost 5.19.3 → 5.20.0

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.19%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.20%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-982146a4ada3a5af1981d1919ae01d08.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-fd0480352bf27e013b2b00a1bf9ffe84.css" title="light">
 
     
 </head>
@@ -45,7 +45,7 @@
 
     <div class="ember-load-indicator">
         <div class="gh-loading-content">
-            <video width="100" height="100" loop="" autoplay="" muted="" playsinline="" preload="metadata">
+            <video width="100" height="100" loop autoplay muted playsinline preload="metadata" style="width: 100px; height: 100px;">
                 <source src="assets/videos/logo-loader.mp4" type="video/mp4" />
                 <div class="gh-loading-spinner"></div>
             </video>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-5c7d7063620bec13668c4370145cd4b4.js"></script>
-<script src="assets/chunk.613.f1d519ad47e7f9024263.js"></script>
-<script src="assets/chunk.143.c035c61595ed02eee886.js"></script>
-    <script src="assets/ghost-5ce6f5a730c83c91fc258b12c537ea35.js"></script>
+    <script src="assets/vendor-518b03b02df9a55706d150627ef1004f.js"></script>
+<script src="assets/chunk.613.c4d89dc2d28c1b20348f.js"></script>
+<script src="assets/chunk.143.d245b085ad1efed4ee76.js"></script>
+    <script src="assets/ghost-07e4bbf5029630b3c8a8a50c4b9f2d9e.js"></script>
 </body>
 </html>

package/core/server/api/endpoints/links.js

@@ -6,7 +6,7 @@ module.exports = {
         options: [
             'filter'
         ],
-        permissions: false,
+        permissions: true,
         async query(frame) {
             const links = await linkTrackingService.service.getLinks(frame.options);
 
@@ -21,5 +21,37 @@ module.exports = {
                 }
             };
         }
+    },
+    bulkEdit: {
+        statusCode: 200,
+        headers: {
+            cacheInvalidate: true
+        },
+        options: [
+            'filter'
+        ],
+        data: [
+            'action',
+            'meta'
+        ],
+        validation: {
+            data: {
+                action: {
+                    required: true,
+                    values: ['updateLink']
+                }
+            },
+            options: {
+                filter: {
+                    required: true
+                }
+            }
+        },
+        permissions: {
+            method: 'edit'
+        },
+        async query(frame) {
+            return await linkTrackingService.service.bulkEdit(frame.data.bulk, frame.options);
+        }
     }
 };

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

@@ -435,10 +435,7 @@ module.exports = {
             method: 'browse'
         },
         async query(frame) {
-            const events = await membersService.api.events.getEventTimeline(frame.options);
-            return {
-                events
-            };
+            return await membersService.api.events.getEventTimeline(frame.options);
         }
     }
 };

package/core/server/api/endpoints/posts-public.js

@@ -1,7 +1,7 @@
 const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
-const allowedIncludes = ['tags', 'authors', 'tiers'];
+const allowedIncludes = ['tags', 'authors', 'tiers', 'sentiment'];
 
 const messages = {
     postNotFound: 'Post not found.'

package/core/server/api/endpoints/posts.js

@@ -11,7 +11,8 @@ const allowedIncludes = [
     'newsletter',
     'count.signups',
     'count.paid_conversions',
-    'count.clicks'
+    'count.clicks',
+    'sentiment'
 ];
 const unsafeAttrs = ['status', 'authors', 'visibility'];
 

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

@@ -16,7 +16,26 @@ function removeSourceFormats(frame) {
     }
 }
 
+/**
+ * Map names of relations to the internal names
+ */
+function mapWithRelated(frame) {
+    if (frame.options.withRelated) {
+        // Map sentiment to count.sentiment
+        if (labs.isSet('audienceFeedback')) {
+            frame.options.withRelated = frame.options.withRelated.map((relation) => {
+                return relation === 'sentiment' ? 'count.sentiment' : relation;
+            });
+        }
+        return;
+    }
+}
+
 function defaultRelations(frame) {
+    // Apply same mapping as content API
+    mapWithRelated(frame);
+
+    // Addditional defaults for admin API
     if (frame.options.withRelated) {
         return;
     }
@@ -26,7 +45,7 @@ function defaultRelations(frame) {
     }
 
     if (labs.isSet('audienceFeedback')) {
-        frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.paid_conversions', 'count.clicks', 'count.sentiment', 'count.positive_feedback'];
+        frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.conversions', 'count.clicks', 'count.sentiment', 'count.positive_feedback'];
     } else {
         frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.paid_conversions', 'count.clicks'];
     }
@@ -111,6 +130,7 @@ module.exports = {
 
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);
+            mapWithRelated(frame);
         }
 
         if (!localUtils.isContentAPI(frame)) {

package/core/server/api/endpoints/utils/serializers/output/index.js

@@ -127,5 +127,9 @@ module.exports = {
 
     get members_stripe_connect() {
         return require('./members-stripe-connect');
+    },
+
+    get links() {
+        return require('./links');
     }
 };

package/core/server/api/endpoints/utils/serializers/output/links.js

@@ -0,0 +1,5 @@
+module.exports = {
+    bulkEdit(data, apiConfig, frame) {
+        frame.response = data;
+    }
+};

package/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js

@@ -2,6 +2,21 @@ const mapComment = require('./comments');
 const url = require('../utils/url');
 const _ = require('lodash');
 
+const memberFields = [
+    'id',
+    'uuid',
+    'name',
+    'email',
+    'avatar_image'
+];
+
+const postFields = [
+    'id',
+    'uuid',
+    'title',
+    'url'
+];
+
 const commentEventMapper = (json, frame) => {
     return {
         ...json,
@@ -10,26 +25,11 @@ const commentEventMapper = (json, frame) => {
 };
 
 const clickEventMapper = (json, frame) => {
-    const memberFields = [
-        'id',
-        'uuid',
-        'name',
-        'email',
-        'avatar_image'
-    ];
-
     const linkFields = [
         'from',
         'to'
     ];
 
-    const postFields = [
-        'id',
-        'uuid',
-        'title',
-        'url'
-    ];
-
     const data = json.data;
     const response = {};
 
@@ -59,6 +59,35 @@ const clickEventMapper = (json, frame) => {
     };
 };
 
+const feedbackEventMapper = (json, frame) => {
+    const feedbackFields = [
+        'id',
+        'score',
+        'created_at'
+    ];
+
+    const data = json.data;
+    const response = _.pick(data, feedbackFields);
+
+    if (data.post) {
+        url.forPost(data.post.id, data.post, frame);
+        response.post = _.pick(data.post, postFields);
+    } else {
+        response.post = null;
+    }
+    
+    if (data.member) {
+        response.member = _.pick(data.member, memberFields);
+    } else {
+        response.member = null;
+    }
+
+    return {
+        ...json,
+        data: response
+    };
+};
+
 function serializeAttribution(attribution) {
     if (!attribution) {
         return attribution;
@@ -82,6 +111,9 @@ const activityFeedMapper = (event, frame) => {
     if (event.type === 'click_event') {
         return clickEventMapper(event, frame);
     }
+    if (event.type === 'feedback_event') {
+        return feedbackEventMapper(event, frame);
+    }
     if (event.data?.attribution) {
         event.data.attribution = serializeAttribution(event.data.attribution);
     }

package/core/server/api/endpoints/utils/serializers/output/mappers/posts.js

@@ -119,8 +119,21 @@ module.exports = async (model, frame, options = {}) => {
         );
     }
 
-    if (jsonModel.count && !jsonModel.count.sentiment) {
-        jsonModel.count.sentiment = 0;
+    // The sentiment has been loaded as a count relation in count.sentiment. But externally in the API we use just 'sentiment' instead of count.sentiment
+    // This part moves count.sentiment to just 'sentiment' when it has been loaded
+    if (frame.options.withRelated && frame.options.withRelated.includes('count.sentiment')) {
+        if (!jsonModel.count) {
+            jsonModel.sentiment = 0;
+        } else {
+            jsonModel.sentiment = jsonModel.count.sentiment ?? 0;
+
+            // Delete it from the original location
+            delete jsonModel.count.sentiment;
+
+            if (Object.keys(jsonModel.count).length === 0) {
+                delete jsonModel.count;
+            }
+        }
     }
 
     if (jsonModel.count && !jsonModel.count.positive_feedback) {

package/core/server/api/endpoints/utils/serializers/output/mappers/snippets.js

@@ -22,8 +22,8 @@ module.exports = (snippet, frame) => {
 /**
  * @typedef {Object} SerializedSnippet
  * @prop {string} id
- * @prop {string=} name
- * @prop {string=} mobiledoc
+ * @prop {string} [name]
+ * @prop {string} [mobiledoc]
  * @prop {string} created_at
  * @prop {string} updated_at
  * @prop {string} created_by

package/core/server/api/endpoints/utils/serializers/output/members.js

@@ -76,11 +76,12 @@ function bulkAction(bulkActionResult, _apiConfig, frame) {
 
 /**
  *
- * @returns {{events: any[]}}
+ * @returns {{events: any[], meta: any}}
  */
 function activityFeed(data, _apiConfig, frame) {
     return {
-        events: data.events.map(e => mappers.activityFeedEvents(e, frame))
+        events: data.events.map(e => mappers.activityFeedEvents(e, frame)),
+        meta: data.meta
     };
 }
 
@@ -216,15 +217,15 @@ function createSerializer(debugString, serialize) {
  * @prop {string} id
  * @prop {string} uuid
  * @prop {string} email
- * @prop {string=} name
- * @prop {string=} note
+ * @prop {string} [name]
+ * @prop {string} [note]
  * @prop {null|string} geolocation
  * @prop {boolean} subscribed
  * @prop {string} created_at
  * @prop {string} updated_at
  * @prop {string[]} labels
  * @prop {SerializedMemberStripeSubscription[]} subscriptions
- * @prop {SerializedMemberProduct[]=} products
+ * @prop {SerializedMemberProduct[]} [products]
  * @prop {string} avatar_image
  * @prop {boolean} comped
  * @prop {number} email_count

package/core/server/data/importer/importers/data/custom-theme-settings.js

@@ -0,0 +1,81 @@
+const _ = require('lodash');
+const Promise = require('bluebird');
+const debug = require('@tryghost/debug')('importer:roles');
+const BaseImporter = require('./base');
+const models = require('../../../../models');
+const {activate} = require('../../../../services/themes/activate');
+
+class CustomThemeSettingsImporter extends BaseImporter {
+    constructor(allDataFromFile) {
+        super(allDataFromFile, {
+            modelName: 'CustomThemeSetting',
+            dataKeyToImport: 'custom_theme_settings'
+        });
+    }
+
+    beforeImport() {
+        debug('beforeImport');
+        return super.beforeImport();
+    }
+
+    doImport(options, importOptions) {
+        debug('doImport', this.modelName, this.dataToImport.length);
+
+        let ops = [];
+
+        _.each(this.dataToImport, (item) => {
+            ops.push(models.CustomThemeSetting.findOne({theme: item.theme, key: item.key}, options)
+                .then((setting) => {
+                    if (_.isObject(item.value)) {
+                        item.value = JSON.stringify(item.value);
+                    }
+                    
+                    if (setting) {
+                        setting.set('value', item.value);
+                        if (setting.hasChanged()) {
+                            return setting.save(null, options)
+                                .then((importedModel) => {
+                                    if (importOptions.returnImportedData) {
+                                        this.importedDataToReturn.push(importedModel.toJSON());
+                                    }
+                                    return importedModel;
+                                })
+                                .catch((err) => {
+                                    return this.handleError(err, item);
+                                });
+                        }
+
+                        return Promise.resolve();
+                    }
+
+                    return models.CustomThemeSetting.add(item, options)
+                        .then((importedModel) => {
+                            if (importOptions.returnImportedData) {
+                                this.importedDataToReturn.push(importedModel.toJSON());
+                            }
+                            return importedModel;
+                        })
+                        .catch((err) => {
+                            return this.handleError(err, item);
+                        });
+                })
+                .reflect());
+        });
+        
+        const opsPromise = Promise.all(ops);
+
+        // activate function is called to refresh cache when importing custom theme settings for active theme
+        opsPromise.then(() => {
+            models.Settings.findOne({key: 'active_theme'})
+                .then((theme) => {
+                    const currentTheme = theme.get('value');
+                    if (this.dataToImport.some(themeSetting => themeSetting.theme === currentTheme)) {
+                        activate(currentTheme);
+                    }
+                });
+        });
+
+        return opsPromise;
+    }
+}
+module.exports = CustomThemeSettingsImporter;

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

@@ -13,6 +13,7 @@ const NewslettersImporter = require('./newsletters');
 const ProductsImporter = require('./products');
 const StripeProductsImporter = require('./stripe-products');
 const StripePricesImporter = require('./stripe-prices');
+const CustomThemeSettingsImporter = require('./custom-theme-settings');
 const RolesImporter = require('./roles');
 let importers = {};
 let DataImporter;
@@ -35,6 +36,7 @@ DataImporter = {
         importers.stripe_products = new StripeProductsImporter(importData.data);
         importers.stripe_prices = new StripePricesImporter(importData.data);
         importers.posts = new PostsImporter(importData.data);
+        importers.custom_theme_settings = new CustomThemeSettingsImporter(importData.data);
 
         return importData;
     },

package/core/server/data/migrations/utils/permissions.js

@@ -10,6 +10,10 @@ const messages = {
     permissionRoleActionError: 'Cannot {action} permission({permission}) with role({role}) - {resource} does not exist'
 };
 
+/**
+ * @param {import('knex').Knex} connection
+ * @param {PermissionConfig} config
+ */
 async function addPermissionHelper(connection, config) {
     const existingPermission = await connection('permissions').where({
         name: config.name,
@@ -38,6 +42,10 @@ async function addPermissionHelper(connection, config) {
     });
 }
 
+/**
+ * @param {import('knex').Knex} connection
+ * @param {PermissionConfig} config
+ */
 async function removePermissionHelper(connection, config) {
     const existingPermission = await connection('permissions').where({
         name: config.name,
@@ -61,10 +69,7 @@ async function removePermissionHelper(connection, config) {
 /**
  * Creates a migration which will add a permission to the database
  *
- * @param {Object} config
- * @param {string} config.name - The name of the permission
- * @param {string} config.action - The action_type of the permission
- * @param {string} config.object - The object_type of the permission
+ * @param {PermissionConfig} config
  *
  * @returns {Migration}
  */
@@ -82,10 +87,7 @@ function addPermission(config) {
 /**
  * Creates a migration which will remove a permission from the database
  *
- * @param {Object} config
- * @param {string} config.name - The name of the permission
- * @param {string} config.action - The action_type of the permission
- * @param {string} config.object - The object_type of the permission
+ * @param {PermissionConfig} config
  *
  * @returns {Migration}
  */
@@ -100,6 +102,10 @@ function removePermission(config) {
     );
 }
 
+/**
+ * @param {import('knex').Knex} connection
+ * @param {PermissionRoleConfig} config
+ */
 async function addPermissionToRoleHelper(connection, config) {
     const permission = await connection('permissions').where({
         name: config.permission
@@ -149,6 +155,10 @@ async function addPermissionToRoleHelper(connection, config) {
     });
 }
 
+/**
+ * @param {import('knex').Knex} connection
+ * @param {PermissionRoleConfig} config
+ */
 async function removePermissionFromRoleHelper(connection, config) {
     const permission = await connection('permissions').where({
         name: config.permission
@@ -188,9 +198,7 @@ async function removePermissionFromRoleHelper(connection, config) {
 /**
  * Creates a migration which will link a permission to a role in the database
  *
- * @param {Object} config
- * @param {string} config.permission - The name of the permission
- * @param {string} config.role - The name of the role
+ * @param {PermissionRoleConfig} config
  *
  * @returns {Migration}
  */
@@ -208,9 +216,7 @@ function addPermissionToRole(config) {
 /**
  * Creates a migration which will remove the permission from roles
  *
- * @param {Object} config
- * @param {string} config.permission - The name of the permission
- * @param {string} config.role - The name of the role
+ * @param {PermissionRoleConfig} config
  *
  * @returns {Migration}
  */
@@ -228,11 +234,7 @@ function removePermissionFromRole(config) {
 /**
  * Creates a migration which will add a permission to the database, and then link it to roles
  *
- * @param {Object} config
- * @param {string} config.name - The name of the permission
- * @param {string} config.action - The action_type of the permission
- * @param {string} config.object - The object_type of the permission
- *
+ * @param {PermissionConfig} config
  * @param {string[]} roles - A list of role names
  *
  * @returns {Migration}
@@ -247,11 +249,7 @@ function addPermissionWithRoles(config, roles) {
 /**
  * Creates a migration which will remove permissions from roles, and then remove the permission
  *
- * @param {Object} config
- * @param {string} config.name - The name of the permission
- * @param {string} config.action - The action_type of the permission
- * @param {string} config.object - The object_type of the permission
- *
+ * @param {PermissionConfig} config
  * @param {string[]} roles - A list of role names
  *
  * @returns {Migration}
@@ -270,6 +268,19 @@ module.exports = {
     createRemovePermissionMigration
 };
 
+/**
+ * @typedef {Object} PermissionConfig
+ * @prop {string} config.name - The name of the permission
+ * @prop {string} config.action - The action_type of the permission
+ * @prop {string} config.object - The object_type of the permission
+ */
+
+/**
+ * @typedef {Object} PermissionRoleConfig
+ * @prop {string} config.permission - The name of the permission
+ * @prop {string} config.role - The role to assign the Permission to
+ */
+
 /**
  * @typedef {Object} TransactionalMigrationFunctionOptions
  *

package/core/server/data/migrations/versions/5.20/2022-10-18-05-39-drop-nullable-tier-id.js

@@ -0,0 +1,3 @@
+const {createDropNullableMigration} = require('../../utils');
+
+module.exports = createDropNullableMigration('subscriptions', 'tier_id');

package/core/server/data/migrations/versions/5.20/2022-10-18-10-13-add-ghost-subscription-id-column-to-mscs.js

@@ -0,0 +1,10 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('members_stripe_customers_subscriptions', 'ghost_subscription_id', {
+    type: 'string',
+    maxlength: 24,
+    nullable: true,
+    references: 'subscriptions.id',
+    constraintName: 'mscs_ghost_subscription_id_foreign',
+    cascadeDelete: true
+});

package/core/server/data/migrations/versions/5.20/2022-10-19-11-17-add-link-browse-permissions.js

@@ -0,0 +1,10 @@
+const {addPermissionWithRoles} = require('../../utils');
+
+module.exports = addPermissionWithRoles({
+    name: 'Browse links',
+    action: 'browse',
+    object: 'link'
+}, [
+    'Administrator',
+    'Admin Integration'
+]);

package/core/server/data/migrations/versions/5.20/2022-10-20-02-52-add-link-edit-permissions.js

@@ -0,0 +1,10 @@
+const {addPermissionWithRoles} = require('../../utils');
+
+module.exports = addPermissionWithRoles({
+    name: 'Edit links',
+    action: 'edit',
+    object: 'link'
+}, [
+    'Administrator',
+    'Admin Integration'
+]);