ghost 6.64.0 → 6.65.0

package/core/server/models/relations/authors.js

@@ -139,7 +139,7 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
       },
 
       serialize: function serialize(options) {
-        let attrs = proto.serialize.call(this, options);
+        const attrs = proto.serialize.call(this, options);
 
         // CASE: e.g. you stub model response in the test
         // CASE: you delete a model without fetching before
@@ -209,7 +209,7 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
                 .where(query)
                 .fetch(Object.assign({ columns: ['id'] }, _.pick(options, 'transacting')))
                 .then((user) => {
-                  let userId = user ? user.id : ownerUser.id;
+                  const userId = user ? user.id : ownerUser.id;
 
                   // CASE: avoid attaching duplicate authors relation
                   const userExists = _.find(authorsToSet, { id: userId.id });
@@ -243,10 +243,10 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
        * @param {Object} unfilteredOptions.transacting
        */
       reassignByAuthor: async function reassignByAuthor(unfilteredOptions) {
-        let options = this.filterOptions(unfilteredOptions, 'reassignByAuthor', {
+        const options = this.filterOptions(unfilteredOptions, 'reassignByAuthor', {
           extraAllowedProperties: ['id'],
         });
-        let authorId = options.id;
+        const authorId = options.id;
 
         if (!authorId) {
           return Promise.reject(
@@ -257,8 +257,8 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
         }
 
         const reassignPost = async () => {
-          let trx = options.transacting;
-          let knex = ghostBookshelf.knex;
+          const trx = options.transacting;
+          const knex = ghostBookshelf.knex;
 
           try {
             // There's only one possible owner per Ghost instance
@@ -350,9 +350,6 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
         const postModel = postModelOrId;
         let origArgs;
         const { isContributor, isAuthor } = setIsRoles(loadedPermissions);
-        let isEdit;
-        let isAdd;
-        let isDestroy;
 
         // If we passed in an id instead of a model, get the model
         // then check the permissions
@@ -377,9 +374,9 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
           });
         }
 
-        isEdit = action === 'edit';
-        isAdd = action === 'add';
-        isDestroy = action === 'destroy';
+        const isEdit = action === 'edit';
+        const isAdd = action === 'add';
+        const isDestroy = action === 'destroy';
 
         function isChangingAuthors() {
           if (!unsafeAttrs.authors) {

package/core/server/models/role.js

@@ -9,10 +9,7 @@ const messages = {
   notEnoughPermission: 'You do not have permission to perform this action',
 };
 
-let Role;
-let Roles;
-
-Role = ghostBookshelf.Model.extend(
+const Role = ghostBookshelf.Model.extend(
   {
     tableName: 'roles',
 
@@ -130,7 +127,7 @@ Role = ghostBookshelf.Model.extend(
   },
 );
 
-Roles = ghostBookshelf.Collection.extend({
+const Roles = ghostBookshelf.Collection.extend({
   model: Role,
 });
 

package/core/server/models/settings.js

@@ -16,7 +16,7 @@ const messages = {
 };
 
 const internalContext = { context: { internal: true } };
-let Settings;
+
 let defaultSettings;
 const imageSettingKeys = [
   'cover_image',
@@ -126,7 +126,7 @@ function transformNavigationIconUrls(value, transformUrl) {
     return value;
   }
 
-  if (!_.isArray(navigationItems)) {
+  if (!Array.isArray(navigationItems)) {
     return value;
   }
 
@@ -146,7 +146,7 @@ function transformNavigationIconUrls(value, transformUrl) {
 
 // Each setting is saved as a separate row in the database,
 // but the overlying API treats them as a single key:value mapping
-Settings = ghostBookshelf.Model.extend(
+const Settings = ghostBookshelf.Model.extend(
   {
     tableName: 'settings',
 

package/core/server/models/tag.js

@@ -7,10 +7,7 @@ const messages = {
   tagNotFound: 'Tag not found.',
 };
 
-let Tag;
-let Tags;
-
-Tag = ghostBookshelf.Model.extend(
+const Tag = ghostBookshelf.Model.extend(
   {
     tableName: 'tags',
 
@@ -221,7 +218,7 @@ Tag = ghostBookshelf.Model.extend(
   },
 );
 
-Tags = ghostBookshelf.Collection.extend({
+const Tags = ghostBookshelf.Collection.extend({
   model: Tag,
 });
 

package/core/server/models/user.js

@@ -55,10 +55,8 @@ const messages = {
 const inactiveStates = ['inactive', 'locked'];
 
 const allStates = activeStates.concat(inactiveStates);
-let User;
-let Users;
 
-User = ghostBookshelf.Model.extend(
+const User = ghostBookshelf.Model.extend(
   {
     tableName: 'users',
 
@@ -506,7 +504,7 @@ User = ghostBookshelf.Model.extend(
     findOne: function findOne(dataToClone, unfilteredOptions) {
       const options = this.filterOptions(unfilteredOptions, 'findOne');
       let query;
-      let status;
+
       let data = JSON.parse(JSON.stringify(dataToClone));
       const lookupRole = data.role;
 
@@ -520,7 +518,7 @@ User = ghostBookshelf.Model.extend(
       delete data.role;
       data = Object.assign({}, { status: 'all' }, data || {});
 
-      status = data.status;
+      const status = data.status;
       delete data.status;
 
       data = this.filterData(data);
@@ -988,11 +986,11 @@ User = ghostBookshelf.Model.extend(
 
       // CASE: i want to edit roles
       if (action === 'edit' && unsafeAttrs.roles && unsafeAttrs.roles[0]) {
-        let role = unsafeAttrs.roles[0];
-        let roleId = role.id || role;
-        let editedUserId = userModel.id;
+        const role = unsafeAttrs.roles[0];
+        const roleId = role.id || role;
+        const editedUserId = userModel.id;
         // @NOTE: role id of logged in user
-        let contextRoleId = loadedPermissions.user.roles[0].id;
+        const contextRoleId = loadedPermissions.user.roles[0].id;
 
         if (roleId !== contextRoleId && editedUserId === context.user) {
           return Promise.reject(
@@ -1298,7 +1296,7 @@ User = ghostBookshelf.Model.extend(
   },
 );
 
-Users = ghostBookshelf.Collection.extend({
+const Users = ghostBookshelf.Collection.extend({
   model: User,
 });
 

package/core/server/models/webhook.js

@@ -1,9 +1,7 @@
 const ghostBookshelf = require('./base');
 const ghostVersion = require('@tryghost/version');
-let Webhook;
-let Webhooks;
 
-Webhook = ghostBookshelf.Model.extend(
+const Webhook = ghostBookshelf.Model.extend(
   {
     tableName: 'webhooks',
 
@@ -87,7 +85,7 @@ Webhook = ghostBookshelf.Model.extend(
   },
 );
 
-Webhooks = ghostBookshelf.Collection.extend({
+const Webhooks = ghostBookshelf.Collection.extend({
   model: Webhook,
 });
 

package/core/server/notify.js

@@ -40,7 +40,7 @@ async function notify(type, error = null) {
   // Build our message
   // - if there's an error then the server is not ready, include the errors
   // - if there's no error then the server has started
-  let message = {};
+  const message = {};
   if (error) {
     message[type] = false;
     message.error = error;
@@ -56,7 +56,7 @@ async function notify(type, error = null) {
   }
 
   // CASE: use bootstrap socket to communicate with CLI for systemd
-  let socketAddress = config.get('bootstrap-socket');
+  const socketAddress = config.get('bootstrap-socket');
   if (socketAddress) {
     const bootstrapSocket = require('./lib/bootstrap-socket');
     return bootstrapSocket.connectAndSend(socketAddress, message);

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

@@ -207,9 +207,14 @@ function normalizeAdapterPaths(config, key, defaultPathsByAdapter) {
  */
 function normalizeAdapterConfig(config) {
     const adapterConfig = config.get('adapters');
+    const storage = adapterConfig?.storage ?? config.get('storage');
     return {
         ...adapterConfig,
-        storage: adapterConfig?.storage ?? config.get('storage'),
+        // adapters.storage replaces the top-level storage config, defaults included, so carry
+        // storage:imports over: import files must never fall back to the store that serves images.
+        storage: adapterConfig?.storage
+            ? { imports: config.get('storage:imports'), ...storage }
+            : storage,
         scheduling: getSchedulingConfig(config),
         redirects: normalizeAdapterPaths(config, 'redirects', {
             FileStore: {

package/core/server/services/api-version-compatibility/legacy-api-path-match.js

@@ -1,8 +1,8 @@
 const pathMatch = require('path-match')();
 
 module.exports = (url) => {
-  let basePath = 'ghost/api';
-  let apiRouteMatcher = '/:version(v2|v3|v4|canary)?/:api(admin|content)/*';
+  const basePath = 'ghost/api';
+  const apiRouteMatcher = '/:version(v2|v3|v4|canary)?/:api(admin|content)/*';
   let urlToMatch = url;
 
   if (url.includes(basePath)) {

package/core/server/services/auth/api-key/admin.js

@@ -16,7 +16,7 @@ const messages = {
   invalidApiKeyType: 'Invalid API Key type',
 };
 
-let JWT_OPTIONS_DEFAULTS = {
+const JWT_OPTIONS_DEFAULTS = {
   /** @type import('jsonwebtoken').Algorithm[] */
   algorithms: ['HS256'],
   maxAge: '5m',
@@ -202,7 +202,7 @@ const authenticateWithToken = async function apiKeyAuthenticateWithToken(
   }
 
   // authenticated OK
-  let result = {
+  const result = {
     user: null,
     apiKey: apiKey,
   };

package/core/server/services/auth/api-key/content.js

@@ -24,7 +24,7 @@ const authenticateContentApiKey = async function authenticateContentApiKey(req,
     );
   }
 
-  let key = req.query.key;
+  const key = req.query.key;
 
   try {
     const apiKey = await models.ApiKey.findOne({ secret: key }, { withRelated: ['integration'] });

package/core/server/services/auth/passwordreset.js

@@ -115,7 +115,7 @@ function doReset(options, tokenParts, settingsAPI) {
         require: true,
       });
 
-      let compareResult = security.tokens.resetToken.compare({
+      const compareResult = security.tokens.resetToken.compare({
         token: resetToken,
         dbHash: dbHash,
         password: user.get('password'),

package/core/server/services/auth/setup.js

@@ -87,13 +87,11 @@ async function doSettings(data, settingsAPI) {
   const blogTitle = data.userData.blogTitle;
   const description = data.userData.description ? data.userData.description.trim() : null;
 
-  let userSettings;
-
   if (!blogTitle || typeof blogTitle !== 'string') {
     return user;
   }
 
-  userSettings = [
+  const userSettings = [
     { key: 'title', value: blogTitle.trim() },
     { key: 'description', value: description || tpl(messages.sampleBlogDescription) },
   ];

package/core/server/services/automations/README.md

@@ -0,0 +1,19 @@
+# Automations
+
+Automations run a series of actions for a member after signup. Each automation is currently one ordered path of `wait` and `send_email` actions. It can be active or inactive.
+
+## How a run moves forward
+
+The member repository calls `trigger()` after signup.
+
+The database repository creates run(s) and queues their first step. Ghost's boot process starts the service, which checks for ready steps. It checks again when a new run starts or a later step becomes ready. An in-memory timer handles checks while Ghost is running; the scheduler can wake Ghost after a restart.
+
+Each check locks ready steps, then runs up to 100 at once. A `wait` action advances when its time arrives. A `send_email` action checks the member's current status and email preference before sending. Disabled automations and ineligible members stop.
+
+## Where to look
+
+- [`automations-api.ts`](automations-api.ts) handles reads, edits, validation, and signup triggers. Edits require one path with no branches or loops.
+- [`database-automations-repository.ts`](database-automations-repository.ts) stores automations, runs, and steps.
+- [`service.ts`](service.ts) starts checks and schedules future ones.
+- [`poll.ts`](poll.ts) runs ready steps.
+- [`welcome-email-automation-poll.ts`](welcome-email-automation-poll.ts) processes older welcome email runs.

package/core/server/services/automations/poll.js

@@ -64,7 +64,9 @@ const processStep = async ({ automationsApi, memberWelcomeEmailService, schedule
         return null;
     }
     // NOTE: This will change once we support additional automation triggers.
-    const memberStatus = slugToMemberStatus.get(step.automation_slug);
+    const memberStatus = step.automation_slug
+        ? slugToMemberStatus.get(step.automation_slug)
+        : undefined;
     if (!memberStatus) {
         logging_1.default.error({
             system: {

package/core/server/services/automations/service.js

@@ -41,7 +41,7 @@ const strict_1 = __importDefault(require("node:assert/strict"));
 const one_at_a_time_1 = require("../../../shared/one-at-a-time");
 const poll_1 = require("./poll");
 const automationsApi = __importStar(require("./automations-api"));
-const get_scheduler_idempotency_key_1 = require("./get-scheduler-idempotency-key");
+const get_scheduler_idempotency_key_1 = require("../../adapters/scheduling/get-scheduler-idempotency-key");
 const build_signed_job_1 = require("../../adapters/scheduling/build-signed-job");
 const promises_1 = require("node:timers/promises");
 const soonest_timer_1 = require("../../lib/soonest-timer");
@@ -96,7 +96,7 @@ class AutomationsService {
                     path: ['automations', 'poll'],
                     time: schedulerPollTime.getTime(),
                     key,
-                    getIdempotencyKey: (url) => (0, get_scheduler_idempotency_key_1.getSchedulerIdempotencyKey)(date, url),
+                    getIdempotencyKey: (url) => (0, get_scheduler_idempotency_key_1.getSchedulerIdempotencyKey)({ namespace: 'automations', date, url }),
                 }));
             }
             catch (err) {