ghost 5.46.1 → 5.47.1

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

@@ -5,17 +5,17 @@ const {IncorrectUsageError} = require('@tryghost/errors');
 const debug = require('@tryghost/debug')('importer:data');
 const {sequence} = require('@tryghost/promise');
 const models = require('../../../../models');
-const PostsImporter = require('./posts');
-const TagsImporter = require('./tags');
-const SettingsImporter = require('./settings');
-const UsersImporter = require('./users');
-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 RevueSubscriberImporter = require('./revue-subscriber');
-const RolesImporter = require('./roles');
+const PostsImporter = require('./PostsImporter');
+const TagsImporter = require('./TagsImporter');
+const SettingsImporter = require('./SettingsImporter');
+const UsersImporter = require('./UsersImporter');
+const NewslettersImporter = require('./NewslettersImporter');
+const ProductsImporter = require('./ProductsImporter');
+const StripeProductsImporter = require('./StripeProductsImporter');
+const StripePricesImporter = require('./StripePricesImporter');
+const CustomThemeSettingsImporter = require('./CustomThemeSettingsImporter');
+const RevueSubscriberImporter = require('./RevueSubscriberImporter');
+const RolesImporter = require('./RolesImporter');
 const {slugify} = require('@tryghost/string/lib');
 
 let importers = {};

package/core/server/data/migrations/hooks/migrate/afterEach.js

@@ -1,3 +1,4 @@
+/* eslint-disable ghost/filenames/match-regex */
 const Promise = require('bluebird');
 
 module.exports = function afterEach() {

package/core/server/data/migrations/hooks/migrate/beforeEach.js

@@ -1,3 +1,4 @@
+/* eslint-disable ghost/filenames/match-regex */
 const Promise = require('bluebird');
 
 module.exports = function beforeEach() {

package/core/server/data/migrations/versions/4.4/02-migrate-members-signup-access.js

@@ -1,6 +1,6 @@
 const logging = require('@tryghost/logging');
 const {createTransactionalMigration} = require('../../utils');
-const MembersConfigProvider = require('../../../../services/members/config');
+const MembersConfigProvider = require('../../../../services/members/MembersConfigProvider');
 const settingsCache = require('../../../../../shared/settings-cache');
 const config = require('../../../../../shared/config');
 

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

@@ -1,4 +1,4 @@
-const FixtureManager = require('./fixture-manager');
+const FixtureManager = require('./FixtureManager');
 const config = require('../../../../shared/config');
 
 const fixturePath = config.get('paths').fixtures;

package/core/server/lib/image/{image-utils.js → ImageUtils.js}

@@ -1,7 +1,7 @@
-const BlogIcon = require('./blog-icon');
-const CachedImageSizeFromUrl = require('./cached-image-size-from-url');
-const Gravatar = require('./gravatar');
-const ImageSize = require('./image-size');
+const BlogIcon = require('./BlogIcon');
+const CachedImageSizeFromUrl = require('./CachedImageSizeFromUrl');
+const Gravatar = require('./Gravatar');
+const ImageSize = require('./ImageSize');
 
 class ImageUtils {
     constructor({config, urlUtils, settingsCache, storageUtils, storage, validator, request, cacheStore}) {

package/core/server/lib/image/index.js

@@ -5,7 +5,7 @@ const storageUtils = require('../../adapters/storage/utils');
 const validator = require('@tryghost/validator');
 const config = require('../../../shared/config');
 const settingsCache = require('../../../shared/settings-cache');
-const ImageUtils = require('./image-utils');
+const ImageUtils = require('./ImageUtils');
 
 const adapterManager = require('../../services/adapter-manager');
 

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

@@ -6,6 +6,54 @@ const logging = require('@tryghost/logging');
  * @param {import('bookshelf')} Bookshelf
  */
 module.exports = function (Bookshelf) {
+    const insertAction = (data, options) => {
+        // CASE: model does not support action for target event
+        if (!data) {
+            return;
+        }
+
+        const insert = (action) => {
+            Bookshelf.model('Action')
+                .add(action, {autoRefresh: false})
+                .catch((err) => {
+                    if (_.isArray(err)) {
+                        err = err[0];
+                    }
+
+                    logging.error(new errors.InternalServerError({
+                        err
+                    }));
+                });
+        };
+
+        if (options.transacting) {
+            options.transacting.once('committed', (committed) => {
+                if (!committed) {
+                    return;
+                }
+
+                insert(data);
+            });
+        } else {
+            insert(data);
+        }
+    };
+
+    // We need this addAction accessible from the static model and instances
+    const addAction = (model, event, options) => {
+        if (!model.wasChanged()) {
+            return;
+        }
+
+        // CASE: model does not support actions at all
+        if (!model.getAction) {
+            return;
+        }
+
+        const data = model.getAction(event, options);
+        insertAction(data, options);
+    };
+
     Bookshelf.Model = Bookshelf.Model.extend({
         /**
          * Constructs data to be stored in the database with info
@@ -33,7 +81,9 @@ module.exports = function (Bookshelf) {
                 return;
             }
 
-            let context = {};
+            let context = {
+                action_name: options.actionName
+            };
 
             if (this.actionsExtraContext && Array.isArray(this.actionsExtraContext)) {
                 for (const c of this.actionsExtraContext) {
@@ -74,48 +124,73 @@ module.exports = function (Bookshelf) {
          *
          * We could embed adding actions more nicely in the future e.g. plugin.
          */
-        addAction: (model, event, options) => {
-            if (!model.wasChanged()) {
+        addAction
+    }, {
+        addAction,
+        async addActions(event, ids, options) {
+            if (ids.length === 1) {
+                // We want to store an event for a single model in the actions table
+                // This is so we can include the name
+                const model = await this.findOne({[options.column ?? 'id']: ids[0]}, {require: true, transacting: options.transacting, context: {internal: true}});
+                this.addAction(model, event, options);
                 return;
             }
 
-            // CASE: model does not support actions at all
-            if (!model.getAction) {
+            const existingAction = this.getBulkAction(event, ids.length, options);
+            insertAction(existingAction, options);
+        },
+
+        /**
+         * Constructs data to be stored in the database with info
+         * on particular actions
+         */
+        getBulkAction(event, count, options) {
+            const actor = this.prototype.getActor(options);
+
+            // @NOTE: we ignore internal updates (`options.context.internal`) for now
+            if (!actor) {
+                return;
+            }
+
+            if (!this.prototype.actionsCollectCRUD) {
                 return;
             }
 
-            const existingAction = model.getAction(event, options);
+            let resourceType = this.prototype.actionsResourceType;
+
+            if (typeof resourceType === 'function') {
+                resourceType = resourceType.bind(this)();
+            }
 
-            // CASE: model does not support action for target event
-            if (!existingAction) {
+            if (!resourceType) {
                 return;
             }
 
-            const insert = (action) => {
-                Bookshelf.model('Action')
-                    .add(action, {autoRefresh: false})
-                    .catch((err) => {
-                        if (_.isArray(err)) {
-                            err = err[0];
-                        }
-
-                        logging.error(new errors.InternalServerError({
-                            err
-                        }));
-                    });
+            let context = {
+                count,
+                action_name: options.actionName
             };
 
-            if (options.transacting) {
-                options.transacting.once('committed', (committed) => {
-                    if (!committed) {
-                        return;
-                    }
+            if (this.getBulkActionExtraContext && typeof this.getBulkActionExtraContext === 'function') {
+                context = {
+                    ...context,
+                    ...this.getBulkActionExtraContext.bind(this)(options)
+                };
+            }
 
-                    insert(existingAction);
-                });
-            } else {
-                insert(existingAction);
+            const data = {
+                event,
+                resource_id: null,
+                resource_type: resourceType,
+                actor_id: actor.id,
+                actor_type: actor.type
+            };
+
+            if (context && Object.keys(context).length) {
+                data.context = context;
             }
+
+            return data;
         }
     });
 };

package/core/server/models/base/plugins/bulk-operations.js

@@ -60,7 +60,7 @@ async function editSingle(knex, table, id, options) {
     if (options.transacting) {
         k = k.transacting(options.transacting);
     }
-    await k.where('id', id).update(options.data);
+    await k.where(options.column ?? 'id', id).update(options.data);
 }
 
 async function editMultiple(knex, table, chunk, options) {
@@ -68,7 +68,7 @@ async function editMultiple(knex, table, chunk, options) {
     if (options.transacting) {
         k = k.transacting(options.transacting);
     }
-    await k.whereIn('id', chunk).update(options.data);
+    await k.whereIn(options.column ?? 'id', chunk).update(options.data);
 }
 
 async function delSingle(knex, table, id, options) {
@@ -112,23 +112,44 @@ module.exports = function (Bookshelf) {
             return insert(Bookshelf.knex, tableName, data, options);
         },
 
-        bulkEdit: async function bulkEdit(data, tableName, options = {}) {
+        /**
+         *
+         * @param {*} ids
+         * @param {*} tableName
+         * @param {object} options
+         * @param {object} [options.data] Data change you want to apply to the rows
+         * @param {string} [options.column] Update the rows where this column equals the ids (defaults to 'id')
+         * @returns
+         */
+        bulkEdit: async function bulkEdit(ids, tableName, options = {}) {
             tableName = tableName || this.prototype.tableName;
 
-            return await edit(Bookshelf.knex, tableName, data, options);
+            const result = await edit(Bookshelf.knex, tableName, ids, options);
+
+            if (result.successful > 0 && tableName === this.prototype.tableName) {
+                await this.addActions('edited', ids, options);
+            }
+
+            return result;
         },
 
         /**
          *
-         * @param {string[]} data List of ids to delete
+         * @param {string[]} ids List of ids to delete
          * @param {*} tableName
          * @param {Object} [options]
          * @param {string} [options.column] Delete the rows where this column equals the ids in `data` (defaults to 'id')
          * @returns
          */
-        bulkDestroy: async function bulkDestroy(data, tableName, options = {}) {
+        bulkDestroy: async function bulkDestroy(ids, tableName, options = {}) {
             tableName = tableName || this.prototype.tableName;
-            return await del(Bookshelf.knex, tableName, data, options);
+
+            if (tableName === this.prototype.tableName) {
+                // Needs to happen before, otherwise we cannot fetch the names of the deleted items
+                await this.addActions('deleted', ids, options);
+            }
+
+            return await del(Bookshelf.knex, tableName, ids, options);
         }
     });
 };

package/core/server/models/invite.js

@@ -87,12 +87,16 @@ Invite = ghostBookshelf.Model.extend({
                 }
 
                 let allowed = [];
-
-                if (_.some(loadedPermissions.user.roles, {name: 'Owner'}) ||
-                    _.some(loadedPermissions.user.roles, {name: 'Administrator'})) {
-                    allowed = ['Administrator', 'Editor', 'Author', 'Contributor'];
-                } else if (_.some(loadedPermissions.user.roles, {name: 'Editor'})) {
-                    allowed = ['Author', 'Contributor'];
+                if (loadedPermissions.user) {
+                    if (_.some(loadedPermissions.user.roles, {name: 'Owner'}) ||
+                        _.some(loadedPermissions.user.roles, {name: 'Administrator'})) {
+                        allowed = ['Administrator', 'Editor', 'Author', 'Contributor'];
+                    } else if (_.some(loadedPermissions.user.roles, {name: 'Editor'})) {
+                        allowed = ['Author', 'Contributor'];
+                    }
+                }
+                if (loadedPermissions.apiKey) {
+                    allowed = ['Editor', 'Author', 'Contributor'];
                 }
 
                 if (allowed.indexOf(roleToInvite.get('name')) === -1) {

package/core/server/models/post.js

@@ -19,7 +19,7 @@ const urlUtils = require('../../shared/url-utils');
 const {Tag} = require('./tag');
 const {Newsletter} = require('./newsletter');
 const {BadRequestError} = require('@tryghost/errors');
-const PostRevisions = require('@tryghost/post-revisions');
+const {PostRevisions} = require('@tryghost/post-revisions');
 const labs = require('../../shared/labs');
 
 const messages = {
@@ -36,7 +36,7 @@ const messages = {
 };
 
 const MOBILEDOC_REVISIONS_COUNT = 10;
-const POST_REVISIONS_COUNT = 10;
+const POST_REVISIONS_COUNT = 25;
 const POST_REVISIONS_INTERVAL_MS = 10 * 60 * 1000; // 10 minutes
 const ALL_STATUSES = ['published', 'draft', 'scheduled', 'sent'];
 
@@ -915,7 +915,7 @@ Post = ghostBookshelf.Model.extend({
                     const revisionModels = await ghostBookshelf.model('PostRevision')
                         .findAll(Object.assign({
                             filter: `post_id:${model.id}`,
-                            columns: ['id', 'lexical', 'created_at', 'author_id', 'title', 'reason', 'post_status', 'created_at_ts']
+                            columns: ['id', 'lexical', 'created_at', 'author_id', 'title', 'reason', 'post_status', 'created_at_ts', 'feature_image']
                         }, _.pick(options, 'transacting')));
 
                     const revisions = revisionModels.toJSON();
@@ -935,7 +935,9 @@ Post = ghostBookshelf.Model.extend({
                     // This can be refactored once we have the status stored in each revision
                     const revisionOptions = {
                         forceRevision: options.save_revision,
-                        isPublished: newStatus === 'published'
+                        isPublished: newStatus === 'published',
+                        newStatus,
+                        olderStatus
                     };
                     const newRevisions = await postRevisions.getRevisions(current, revisions, revisionOptions);
                     model.set('post_revisions', newRevisions);
@@ -1127,6 +1129,16 @@ Post = ghostBookshelf.Model.extend({
         return filter;
     }
 }, {
+    getBulkActionExtraContext: function (options) {
+        if (options && options.filter && options.filter.includes('type:page')) {
+            return {
+                type: 'page'
+            };
+        }
+        return {
+            type: 'post'
+        };
+    },
     allowedFormats: ['mobiledoc', 'lexical', 'html', 'plaintext'],
 
     orderDefaultOptions: function orderDefaultOptions() {
@@ -1234,9 +1246,11 @@ Post = ghostBookshelf.Model.extend({
      * **See:** [ghostBookshelf.Model.findOne](base.js.html#Find%20One)
      */
     findOne: function findOne(data = {}, options = {}) {
-        // @TODO: remove when we drop v0.1
-        if (!options.filter && !data.status) {
-            data.status = 'published';
+        if (!options.context || !options.context.internal) {
+            // @TODO: remove when we drop v0.1
+            if (!options.filter && !data.status) {
+                data.status = 'published';
+            }
         }
 
         if (data.status === 'all') {

package/core/server/services/{users.js → Users.js}

@@ -4,7 +4,7 @@ const path = require('path');
 /**
  * @TODO: pass these in as dependencies
  */
-const PostRevisions = require('@tryghost/post-revisions');
+const {PostRevisions} = require('@tryghost/post-revisions');
 const labs = require('../../shared/labs');
 
 /**

package/core/server/services/adapter-manager/index.js

@@ -13,8 +13,8 @@ const adapterManager = new AdapterManager({
 });
 
 adapterManager.registerAdapter('storage', require('ghost-storage-base'));
-adapterManager.registerAdapter('scheduling', require('../../adapters/scheduling/SchedulingBase'));
-adapterManager.registerAdapter('sso', require('../../adapters/sso/Base'));
+adapterManager.registerAdapter('scheduling', require('../../adapters/scheduling/scheduling-base'));
+adapterManager.registerAdapter('sso', require('../../adapters/sso/SSOBase'));
 adapterManager.registerAdapter('cache', require('@tryghost/adapter-base-cache'));
 
 module.exports = {

package/core/server/services/auth/session/express-session.js

@@ -6,7 +6,7 @@ const settingsCache = require('../../../../shared/settings-cache');
 const models = require('../../../models');
 const urlUtils = require('../../../../shared/url-utils');
 
-const SessionStore = require('./store');
+const SessionStore = require('./SessionStore');
 const sessionStore = new SessionStore(models.Session);
 
 let unoExpressSessionMiddleware;

package/core/server/services/comments/{controller.js → CommentsController.js}

@@ -15,8 +15,8 @@ const messages = {
 
 module.exports = class CommentsController {
     /**
-     * @param {import('./service')} service
-     * @param {import('./stats')} stats
+     * @param {import('./CommentsService')} service
+     * @param {import('./CommentsStatsService')} stats
      */
     constructor(service, stats) {
         this.service = service;

package/core/server/services/comments/{service.js → CommentsService.js}

@@ -25,7 +25,7 @@ class CommentsService {
         /** @private */
         this.contentGating = contentGating;
 
-        const Emails = require('./emails');
+        const Emails = require('./CommentsServiceEmails');
         /** @private */
         this.emails = new Emails({
             config,

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

@@ -1,8 +1,8 @@
 class CommentsServiceWrapper {
     init() {
-        const CommentsService = require('./service');
-        const CommentsController = require('./controller');
-        const CommentsStats = require('./stats');
+        const CommentsService = require('./CommentsService');
+        const CommentsController = require('./CommentsController');
+        const CommentsStats = require('./CommentsStatsService');
 
         const config = require('../../../shared/config');
         const logging = require('@tryghost/logging');

package/core/server/services/custom-redirects/index.js

@@ -2,7 +2,7 @@ const config = require('../../../shared/config');
 const urlUtils = require('../../../shared/url-utils');
 
 const DynamicRedirectManager = require('@tryghost/express-dynamic-redirects');
-const CustomRedirectsAPI = require('./api');
+const CustomRedirectsAPI = require('./CustomRedirectsAPI');
 const validation = require('./validation');
 const {getBackupRedirectsFilePath} = require('./utils');
 

package/core/server/services/email-analytics/index.js

@@ -1,3 +1,3 @@
-const EmailAnalyticsServiceWrapper = require('./wrapper');
+const EmailAnalyticsServiceWrapper = require('./EmailAnalyticsServiceWrapper');
 
 module.exports = new EmailAnalyticsServiceWrapper();

package/core/server/services/email-service/{wrapper.js → EmailServiceWrapper.js}

@@ -1,5 +1,5 @@
 const logging = require('@tryghost/logging');
-const url = require('../../../server/api/endpoints/utils/serializers/output/utils/url');
+const url = require('../../api/endpoints/utils/serializers/output/utils/url');
 
 class EmailServiceWrapper {
     getPostUrl(post) {
@@ -18,7 +18,7 @@ class EmailServiceWrapper {
         const MailgunClient = require('@tryghost/mailgun-client');
         const configService = require('../../../shared/config');
         const settingsCache = require('../../../shared/settings-cache');
-        const settingsHelpers = require('../../services/settings-helpers');
+        const settingsHelpers = require('../settings-helpers');
         const jobsService = require('../jobs');
         const membersService = require('../members');
         const db = require('../../data/db');

package/core/server/services/email-service/index.js

@@ -1,3 +1,3 @@
-const EmailServiceWrapper = require('./wrapper');
+const EmailServiceWrapper = require('./EmailServiceWrapper');
 
 module.exports = new EmailServiceWrapper();

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

@@ -1,4 +1,4 @@
-const ExploreService = require('./service');
+const ExploreService = require('./ExploreService');
 
 const MembersService = require('../members');
 const PostsService = require('../posts/posts-service')();

package/core/server/services/frontend-data-service/index.js

@@ -1,5 +1,5 @@
 const models = require('../../models');
-const FrontendDataService = require('./frontend-data-service');
+const FrontendDataService = require('./FrontendDataService');
 
 module.exports.init = () => {
     return new FrontendDataService({IntegrationModel: models.Integration});

package/core/server/services/invites/{invites.js → Invites.js}

@@ -4,6 +4,7 @@ const logging = require('@tryghost/logging');
 
 const messages = {
     invitedByName: '{invitedByName} has invited you to join {blogName}',
+    invitedByNoName: 'You have been invited to join {blogName}',
     errorSendingEmail: {
         error: 'Error sending email: {message}',
         help: 'Please check your email settings and resend the invitation.'
@@ -11,8 +12,9 @@ const messages = {
 };
 
 class Invites {
-    constructor({settingsCache, mailService, urlUtils}) {
+    constructor({settingsCache, settingsHelpers, mailService, urlUtils}) {
         this.settingsCache = settingsCache;
+        this.settingsHelpers = settingsHelpers;
         this.mailService = mailService;
         this.urlUtils = urlUtils;
     }
@@ -37,15 +39,26 @@ class Invites {
 
                 const adminUrl = this.urlUtils.urlFor('admin', true);
 
-                emailData = {
-                    blogName: this.settingsCache.get('title'),
-                    invitedByName: user.name,
-                    invitedByEmail: user.email,
-                    resetLink: this.urlUtils.urlJoin(adminUrl, 'signup', security.url.encodeBase64(invite.get('token')), '/'),
-                    recipientEmail: invite.get('email')
-                };
+                if (user.name || user.email) {
+                    emailData = {
+                        blogName: this.settingsCache.get('title'),
+                        invitedByName: user.name,
+                        invitedByEmail: user.email,
+                        resetLink: this.urlUtils.urlJoin(adminUrl, 'signup', security.url.encodeBase64(invite.get('token')), '/'),
+                        recipientEmail: invite.get('email')
+                    };
+
+                    return this.mailService.utils.generateContent({data: emailData, template: 'invite-user'});
+                } else {
+                    emailData = {
+                        blogName: this.settingsCache.get('title'),
+                        invitedByEmail: `ghost@${this.settingsHelpers.getDefaultEmailDomain()}`,
+                        resetLink: this.urlUtils.urlJoin(adminUrl, 'signup', security.url.encodeBase64(invite.get('token')), '/'),
+                        recipientEmail: invite.get('email')
+                    };
 
-                return this.mailService.utils.generateContent({data: emailData, template: 'invite-user'});
+                    return this.mailService.utils.generateContent({data: emailData, template: 'invite-user-by-api-key'});
+                }
             })
             .then((emailContent) => {
                 const payload = {
@@ -53,9 +66,11 @@ class Invites {
                         message: {
                             to: invite.get('email'),
                             replyTo: emailData.invitedByEmail,
-                            subject: tpl(messages.invitedByName, {
+                            subject: emailData.invitedByName ? tpl(messages.invitedByName, {
                                 invitedByName: emailData.invitedByName,
                                 blogName: emailData.blogName
+                            }) : tpl(messages.invitedByNoName, {
+                                blogName: emailData.blogName
                             }),
                             html: emailContent.html,
                             text: emailContent.text

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

@@ -1,10 +1,12 @@
 const settingsCache = require('../../../shared/settings-cache');
+const settingsHelpers = require('../settings-helpers');
 const mailService = require('../../services/mail');
 const urlUtils = require('../../../shared/url-utils');
-const Invites = require('./invites');
+const Invites = require('./Invites');
 
 module.exports = new Invites({
     settingsCache,
+    settingsHelpers,
     mailService,
     urlUtils
 });