ghost 6.56.0 → 6.57.1

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

@@ -96,11 +96,13 @@ module.exports = function (Bookshelf) {
                     (value, key) => key.startsWith(PIVOT_PREFIX)
                 );
 
-                if (this.relationships) {
-                    this.relationships.forEach((relation) => {
-                        if (this._previousRelations && Object.prototype.hasOwnProperty.call(this._previousRelations, relation)) {
-                            clonedModel.related(relation).models = this._previousRelations[relation].models;
-                        }
+                // Iterate `_previousRelations` rather than `relationships` — a relation
+                // can carry previous state without being managed by bookshelf-relations
+                // (e.g. a member's stripeSubscriptions). Behaviour is unchanged for
+                // relations that are in both.
+                if (this._previousRelations) {
+                    Object.keys(this._previousRelations).forEach((relation) => {
+                        clonedModel.related(relation).models = this._previousRelations[relation].models;
                     });
                 }
 

package/core/server/models/post.js

@@ -1006,8 +1006,8 @@ Post = ghostBookshelf.Model.extend({
      *     - `slug`: /:slug/
      *     - `published_at`: /:year/:slug
      *     - `author_id`: /:author/:slug, /:primary_author/:slug
-     *     - now, the UrlService pre-generates urls based on the resources
-     *     - you can ask `urlService.getUrlByResourceId(post.id)`
+     *     - now, the UrlService computes urls from the routing config
+     *     - you can ask `urlService.getUrlForResource(post)`
      *
      * ### events
      *   - you call `findAll` with `columns: id`

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

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdapterManager = void 0;
-const node_path_1 = __importDefault(require("node:path"));
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const utils_1 = require("./utils");
 /**
@@ -121,50 +120,7 @@ class AdapterManager {
                 message: `Unable to find ${adapterType} adapter in ${this.pathsToAdapters}.`
             });
         }
-        let Adapter = null;
-        for (const pathToAdapters of this.pathsToAdapters) {
-            let pathToAdapter = node_path_1.default.join(pathToAdapters, adapterType, adapterClassName);
-            if (pathToAdapters === '') {
-                // We are loading from node_modules, we can remove the `adapterType` prefix
-                pathToAdapter = node_path_1.default.join(pathToAdapters, adapterClassName);
-            }
-            // An adapter directory may be a full module with its own
-            // package.json, in which case this resolves the `exports` entry
-            // point; otherwise the path passes through unchanged.
-            const moduleToLoad = (0, utils_1.resolveAdapterEntryPoint)(pathToAdapter);
-            try {
-                const adapterModule = this.loadAdapterFromPath(moduleToLoad);
-                Adapter = (0, utils_1.resolveAdapterExport)(adapterModule);
-                if (Adapter) {
-                    break;
-                }
-            }
-            catch (err) {
-                // Catch runtime errors
-                if (!(err instanceof Error) || err.code !== 'MODULE_NOT_FOUND') {
-                    throw new errors_1.default.IncorrectUsageError({ err: err });
-                }
-                // Catch missing dependencies BUT NOT missing adapter.
-                // Only check the first line — Node appends a "Require stack"
-                // that includes the adapter's own path, which would false-positive.
-                const firstLine = err.message.split('\n')[0];
-                if (!firstLine.includes(pathToAdapter)) {
-                    // Name the unresolved module so the error is actionable, e.g.
-                    // "Cannot find module 'superagent'" -> 'superagent'.
-                    const missingMatch = /Cannot find module '([^']+)'/.exec(firstLine);
-                    const missingModule = missingMatch ? ` '${missingMatch[1]}'` : '';
-                    throw new errors_1.default.IncorrectUsageError({
-                        message: `You are missing a dependency${missingModule} in your adapter ${pathToAdapter}`,
-                        err: err
-                    });
-                }
-            }
-        }
-        if (!Adapter) {
-            throw new errors_1.default.IncorrectUsageError({
-                message: `Unable to find ${adapterType} adapter ${adapterClassName} in ${this.pathsToAdapters}.`
-            });
-        }
+        const Adapter = (0, utils_1.loadAdapterClass)(adapterType, adapterClassName, this.pathsToAdapters, this.loadAdapterFromPath);
         return { Adapter, adapterConfig: adapterConfig ?? {}, adapterType, adapterClassName };
     }
     /**

package/core/server/services/adapter-manager/adapter-manager.ts

@@ -1,6 +1,5 @@
-import path from 'node:path';
 import errors from '@tryghost/errors';
-import {resolveAdapterExport, resolveAdapterEntryPoint, resolveAdapterOptions, normalizeAdapterConfig, getConfiguredFeatures} from './utils';
+import {loadAdapterClass, resolveAdapterOptions, normalizeAdapterConfig, getConfiguredFeatures} from './utils';
 import type {ConfigInstance} from '../../../shared/config/loader';
 import type {
     Adapter,
@@ -186,52 +185,7 @@ export class AdapterManager<BaseClasses extends BaseClassMap = BaseClassMap> {
             });
         }
 
-        let Adapter: AdapterConstructor | null = null;
-        for (const pathToAdapters of this.pathsToAdapters) {
-            let pathToAdapter = path.join(pathToAdapters, adapterType, adapterClassName);
-            if (pathToAdapters === '') {
-                // We are loading from node_modules, we can remove the `adapterType` prefix
-                pathToAdapter = path.join(pathToAdapters, adapterClassName);
-            }
-            // An adapter directory may be a full module with its own
-            // package.json, in which case this resolves the `exports` entry
-            // point; otherwise the path passes through unchanged.
-            const moduleToLoad = resolveAdapterEntryPoint(pathToAdapter);
-
-            try {
-                const adapterModule = this.loadAdapterFromPath(moduleToLoad);
-                Adapter = resolveAdapterExport(adapterModule);
-                if (Adapter) {
-                    break;
-                }
-            } catch (err) {
-                // Catch runtime errors
-                if (!(err instanceof Error) || (err as NodeJS.ErrnoException).code !== 'MODULE_NOT_FOUND') {
-                    throw new errors.IncorrectUsageError({err: err as Error});
-                }
-
-                // Catch missing dependencies BUT NOT missing adapter.
-                // Only check the first line — Node appends a "Require stack"
-                // that includes the adapter's own path, which would false-positive.
-                const firstLine = err.message.split('\n')[0];
-                if (!firstLine.includes(pathToAdapter)) {
-                    // Name the unresolved module so the error is actionable, e.g.
-                    // "Cannot find module 'superagent'" -> 'superagent'.
-                    const missingMatch = /Cannot find module '([^']+)'/.exec(firstLine);
-                    const missingModule = missingMatch ? ` '${missingMatch[1]}'` : '';
-                    throw new errors.IncorrectUsageError({
-                        message: `You are missing a dependency${missingModule} in your adapter ${pathToAdapter}`,
-                        err: err as Error
-                    });
-                }
-            }
-        }
-
-        if (!Adapter) {
-            throw new errors.IncorrectUsageError({
-                message: `Unable to find ${adapterType} adapter ${adapterClassName} in ${this.pathsToAdapters}.`
-            });
-        }
+        const Adapter = loadAdapterClass(adapterType, adapterClassName, this.pathsToAdapters, this.loadAdapterFromPath);
 
         return {Adapter, adapterConfig: adapterConfig ?? {}, adapterType, adapterClassName};
     }

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

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adapterPaths = void 0;
+exports.buildAdapterPaths = buildAdapterPaths;
+const config_1 = __importDefault(require("../../../shared/config"));
+/**
+ * Where adapters are looked up, in order. Also read by bin/validate-adapters.ts,
+ * which checks adapter implementations at build time - keep this the only place
+ * the lookup order is declared, so a name resolves there exactly as it does here.
+ */
+function buildAdapterPaths(configInstance) {
+    return Array.from(new Set([
+        '', // A blank path will cause us to check node_modules for the adapter
+        configInstance.get('paths').internalAdaptersPath,
+        // custom docker builds may install adapters in a separate path from content,
+        // since the content dir is often bind-mounted into the container. Offering
+        // an escape hatch here to allow for this
+        configInstance.get('paths').installedAdaptersPath ?? '',
+        // load adapters from content last, so that they don't override any other
+        // internal or platform-installed adapters
+        // TODO: potentially deprecate/remove as part of Ghost 7.0
+        configInstance.getContentPath('adapters')
+    ]));
+}
+exports.adapterPaths = buildAdapterPaths(config_1.default);

package/core/server/services/adapter-manager/adapter-paths.ts

@@ -0,0 +1,26 @@
+import config from '../../../shared/config';
+import type {ConfigInstance} from '../../../shared/config/loader';
+
+/**
+ * Where adapters are looked up, in order. Also read by bin/validate-adapters.ts,
+ * which checks adapter implementations at build time - keep this the only place
+ * the lookup order is declared, so a name resolves there exactly as it does here.
+ */
+export function buildAdapterPaths(configInstance: ConfigInstance): string[] {
+    return Array.from(new Set<string>([
+        '', // A blank path will cause us to check node_modules for the adapter
+        configInstance.get('paths').internalAdaptersPath,
+
+        // custom docker builds may install adapters in a separate path from content,
+        // since the content dir is often bind-mounted into the container. Offering
+        // an escape hatch here to allow for this
+        configInstance.get('paths').installedAdaptersPath ?? '',
+
+        // load adapters from content last, so that they don't override any other
+        // internal or platform-installed adapters
+        // TODO: potentially deprecate/remove as part of Ghost 7.0
+        configInstance.getContentPath('adapters')
+    ]));
+}
+
+export const adapterPaths: string[] = buildAdapterPaths(config);

package/core/server/services/adapter-manager/base-classes.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.baseClasses = void 0;
+const ghost_storage_base_1 = require("ghost-storage-base");
+const adapter_base_scheduling_1 = require("@tryghost/adapter-base-scheduling");
+const adapter_base_sso_1 = require("@tryghost/adapter-base-sso");
+const adapter_base_cache_1 = require("@tryghost/adapter-base-cache");
+const adapter_base_redirects_1 = require("@tryghost/adapter-base-redirects");
+const adapter_base_route_settings_1 = require("@tryghost/adapter-base-route-settings");
+/**
+ * The base class every adapter of a given type must extend. Also read by
+ * bin/validate-adapters.js, which checks adapter implementations at build time -
+ * keep this the only place the mapping is declared.
+ */
+exports.baseClasses = {
+    storage: ghost_storage_base_1.StorageBase,
+    scheduling: adapter_base_scheduling_1.SchedulingBase,
+    sso: adapter_base_sso_1.SSOBase,
+    cache: adapter_base_cache_1.CacheBase,
+    redirects: adapter_base_redirects_1.RedirectsStoreBase,
+    'route-settings': adapter_base_route_settings_1.RouteSettingsStoreBase
+};

package/core/server/services/adapter-manager/base-classes.ts

@@ -0,0 +1,22 @@
+import {StorageBase} from 'ghost-storage-base';
+import {SchedulingBase} from '@tryghost/adapter-base-scheduling';
+import {SSOBase} from '@tryghost/adapter-base-sso';
+import {CacheBase} from '@tryghost/adapter-base-cache';
+import {RedirectsStoreBase} from '@tryghost/adapter-base-redirects';
+import {RouteSettingsStoreBase} from '@tryghost/adapter-base-route-settings';
+
+import type {BaseClassMap} from './adapter-manager';
+
+/**
+ * The base class every adapter of a given type must extend. Also read by
+ * bin/validate-adapters.js, which checks adapter implementations at build time -
+ * keep this the only place the mapping is declared.
+ */
+export const baseClasses = {
+    storage: StorageBase,
+    scheduling: SchedulingBase,
+    sso: SSOBase,
+    cache: CacheBase,
+    redirects: RedirectsStoreBase,
+    'route-settings': RouteSettingsStoreBase
+} satisfies BaseClassMap;

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

@@ -3,40 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ghost_storage_base_1 = require("ghost-storage-base");
-const adapter_base_scheduling_1 = require("@tryghost/adapter-base-scheduling");
-const adapter_base_sso_1 = require("@tryghost/adapter-base-sso");
-const adapter_base_cache_1 = require("@tryghost/adapter-base-cache");
-const adapter_base_redirects_1 = require("@tryghost/adapter-base-redirects");
-const adapter_base_route_settings_1 = require("@tryghost/adapter-base-route-settings");
 const adapter_manager_1 = require("./adapter-manager");
+const adapter_paths_1 = require("./adapter-paths");
+const base_classes_1 = require("./base-classes");
 const config_1 = __importDefault(require("../../../shared/config"));
-const adapterPaths = new Set([
-    '', // A blank path will cause us to check node_modules for the adapter
-    config_1.default.get('paths').internalAdaptersPath,
-    // custom docker builds may install adapters in a separate path from content,
-    // since the content dir is often bind-mounted into the container. Offering
-    // an escape hatch here to allow for this
-    config_1.default.get('paths').installedAdaptersPath ?? '',
-    // load adapters from content last, so that they don't override any other
-    // internal or platform-installed adapters
-    // TODO: potentially deprecate/remove as part of Ghost 7.0
-    config_1.default.getContentPath('adapters'),
-]);
 // A singleton adapter manager, preconfigured with the base classes for every
 // known adapter type. `getAdapter` resolves the active adapter and its options
 // from config on each call, so runtime config changes are always reflected.
 const adapterManager = new adapter_manager_1.AdapterManager({
     loadAdapterFromPath: require,
     config: config_1.default,
-    pathsToAdapters: Array.from(adapterPaths),
-    baseClasses: {
-        storage: ghost_storage_base_1.StorageBase,
-        scheduling: adapter_base_scheduling_1.SchedulingBase,
-        sso: adapter_base_sso_1.SSOBase,
-        cache: adapter_base_cache_1.CacheBase,
-        redirects: adapter_base_redirects_1.RedirectsStoreBase,
-        'route-settings': adapter_base_route_settings_1.RouteSettingsStoreBase
-    }
+    pathsToAdapters: adapter_paths_1.adapterPaths,
+    baseClasses: base_classes_1.baseClasses
 });
 exports.default = adapterManager;

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

@@ -1,43 +1,16 @@
-import {StorageBase} from 'ghost-storage-base';
-import {SchedulingBase} from '@tryghost/adapter-base-scheduling';
-import {SSOBase} from '@tryghost/adapter-base-sso';
-import {CacheBase} from '@tryghost/adapter-base-cache';
-import {RedirectsStoreBase} from '@tryghost/adapter-base-redirects';
-import {RouteSettingsStoreBase} from '@tryghost/adapter-base-route-settings';
-
 import {AdapterManager} from './adapter-manager';
+import {adapterPaths} from './adapter-paths';
+import {baseClasses} from './base-classes';
 import config from '../../../shared/config';
 
-const adapterPaths = new Set<string>([
-    '', // A blank path will cause us to check node_modules for the adapter
-    config.get('paths').internalAdaptersPath,
-
-    // custom docker builds may install adapters in a separate path from content,
-    // since the content dir is often bind-mounted into the container. Offering
-    // an escape hatch here to allow for this
-    config.get('paths').installedAdaptersPath ?? '',
-
-    // load adapters from content last, so that they don't override any other
-    // internal or platform-installed adapters
-    // TODO: potentially deprecate/remove as part of Ghost 7.0
-    config.getContentPath('adapters'),
-]);
-
 // A singleton adapter manager, preconfigured with the base classes for every
 // known adapter type. `getAdapter` resolves the active adapter and its options
 // from config on each call, so runtime config changes are always reflected.
 const adapterManager = new AdapterManager({
     loadAdapterFromPath: require,
     config,
-    pathsToAdapters: Array.from(adapterPaths),
-    baseClasses: {
-        storage: StorageBase,
-        scheduling: SchedulingBase,
-        sso: SSOBase,
-        cache: CacheBase,
-        redirects: RedirectsStoreBase,
-        'route-settings': RouteSettingsStoreBase
-    }
+    pathsToAdapters: adapterPaths,
+    baseClasses
 });
 
 export default adapterManager;

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

@@ -5,12 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAdapterEntryPoint = resolveAdapterEntryPoint;
 exports.resolveAdapterExport = resolveAdapterExport;
+exports.loadAdapterClass = loadAdapterClass;
 exports.normalizeAdapterConfig = normalizeAdapterConfig;
 exports.getConfiguredFeatures = getConfiguredFeatures;
 exports.resolveAdapterOptions = resolveAdapterOptions;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_module_1 = require("node:module");
+const errors_1 = __importDefault(require("@tryghost/errors"));
 /**
 * Whether `filePath` resolves to a location inside `directory`.
 *
@@ -116,6 +118,54 @@ function resolveAdapterExport(moduleExport) {
     }
     return null;
 }
+/**
+* Locate and load an adapter constructor by type and class name, trying each of
+* `pathsToAdapters` in order. Shared by the adapter manager and by
+* bin/validate-adapters.ts, so a name resolves — and fails — identically at build
+* time and at runtime.
+*/
+function loadAdapterClass(adapterType, adapterClassName, pathsToAdapters, loadAdapterFromPath) {
+    for (const pathToAdapters of pathsToAdapters) {
+        let pathToAdapter = node_path_1.default.join(pathToAdapters, adapterType, adapterClassName);
+        if (pathToAdapters === '') {
+            // We are loading from node_modules, we can remove the `adapterType` prefix
+            pathToAdapter = node_path_1.default.join(pathToAdapters, adapterClassName);
+        }
+        // An adapter directory may be a full module with its own
+        // package.json, in which case this resolves the `exports` entry
+        // point; otherwise the path passes through unchanged.
+        const moduleToLoad = resolveAdapterEntryPoint(pathToAdapter);
+        try {
+            const Adapter = resolveAdapterExport(loadAdapterFromPath(moduleToLoad));
+            if (Adapter) {
+                return Adapter;
+            }
+        }
+        catch (err) {
+            // Catch runtime errors
+            if (!(err instanceof Error) || err.code !== 'MODULE_NOT_FOUND') {
+                throw new errors_1.default.IncorrectUsageError({ err: err });
+            }
+            // Catch missing dependencies BUT NOT missing adapter.
+            // Only check the first line — Node appends a "Require stack"
+            // that includes the adapter's own path, which would false-positive.
+            const firstLine = err.message.split('\n')[0];
+            if (!firstLine.includes(pathToAdapter)) {
+                // Name the unresolved module so the error is actionable, e.g.
+                // "Cannot find module 'superagent'" -> 'superagent'.
+                const missingMatch = /Cannot find module '([^']+)'/.exec(firstLine);
+                const missingModule = missingMatch ? ` '${missingMatch[1]}'` : '';
+                throw new errors_1.default.IncorrectUsageError({
+                    message: `You are missing a dependency${missingModule} in your adapter ${pathToAdapter}`,
+                    err: err
+                });
+            }
+        }
+    }
+    throw new errors_1.default.IncorrectUsageError({
+        message: `Unable to find ${adapterType} adapter ${adapterClassName} in ${pathsToAdapters}.`
+    });
+}
 function getSchedulingConfig(config) {
     const adapterConfig = config.get('adapters:scheduling');
     if (!adapterConfig) {

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

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import {createRequire} from 'node:module';
+import errors from '@tryghost/errors';
 import type {AdapterConstructor} from "./types";
 import type {ConfigInstance} from '../../../shared/config/loader';
 
@@ -122,6 +123,62 @@ export function resolveAdapterExport(moduleExport: unknown): AdapterConstructor
     return null;
 }
 
+/**
+* Locate and load an adapter constructor by type and class name, trying each of
+* `pathsToAdapters` in order. Shared by the adapter manager and by
+* bin/validate-adapters.ts, so a name resolves — and fails — identically at build
+* time and at runtime.
+*/
+export function loadAdapterClass(
+    adapterType: string,
+    adapterClassName: string,
+    pathsToAdapters: string[],
+    loadAdapterFromPath: (path: string) => unknown
+): AdapterConstructor {
+    for (const pathToAdapters of pathsToAdapters) {
+        let pathToAdapter = path.join(pathToAdapters, adapterType, adapterClassName);
+        if (pathToAdapters === '') {
+            // We are loading from node_modules, we can remove the `adapterType` prefix
+            pathToAdapter = path.join(pathToAdapters, adapterClassName);
+        }
+        // An adapter directory may be a full module with its own
+        // package.json, in which case this resolves the `exports` entry
+        // point; otherwise the path passes through unchanged.
+        const moduleToLoad = resolveAdapterEntryPoint(pathToAdapter);
+
+        try {
+            const Adapter = resolveAdapterExport(loadAdapterFromPath(moduleToLoad));
+            if (Adapter) {
+                return Adapter;
+            }
+        } catch (err) {
+            // Catch runtime errors
+            if (!(err instanceof Error) || (err as NodeJS.ErrnoException).code !== 'MODULE_NOT_FOUND') {
+                throw new errors.IncorrectUsageError({err: err as Error});
+            }
+
+            // Catch missing dependencies BUT NOT missing adapter.
+            // Only check the first line — Node appends a "Require stack"
+            // that includes the adapter's own path, which would false-positive.
+            const firstLine = err.message.split('\n')[0];
+            if (!firstLine.includes(pathToAdapter)) {
+                // Name the unresolved module so the error is actionable, e.g.
+                // "Cannot find module 'superagent'" -> 'superagent'.
+                const missingMatch = /Cannot find module '([^']+)'/.exec(firstLine);
+                const missingModule = missingMatch ? ` '${missingMatch[1]}'` : '';
+                throw new errors.IncorrectUsageError({
+                    message: `You are missing a dependency${missingModule} in your adapter ${pathToAdapter}`,
+                    err: err as Error
+                });
+            }
+        }
+    }
+
+    throw new errors.IncorrectUsageError({
+        message: `Unable to find ${adapterType} adapter ${adapterClassName} in ${pathsToAdapters}.`
+    });
+}
+
 function getSchedulingConfig(config: ConfigInstance) {
     const adapterConfig = config.get('adapters:scheduling');
     if (!adapterConfig) {

package/core/server/services/audience-feedback/audience-feedback-controller.js

@@ -1,5 +1,6 @@
 const Feedback = require('./feedback');
 const errors = require('@tryghost/errors');
+const permissions = require('../../services/permissions');
 const tpl = require('@tryghost/tpl');
 
 const messages = {
@@ -50,7 +51,7 @@ class AudienceFeedbackController {
             // Load the full post (with tags/authors) rather than passing an
             // id-only resource: the URL service needs status to apply the
             // published base filter and tags/authors to evaluate filtered
-            // routes — the lazy backend rejects a bare {id} as thin.
+            // routes — the URL service reports a bare {id} as thin.
             const post = await this.#repository.getPostById(postId, {withRelated: ['tags', 'authors']});
             const target = post
                 ? this.#audienceFeedbackService.buildLink(uuid, post, score, key)
@@ -118,7 +119,8 @@ class AudienceFeedbackController {
         const postId = frame.data.id;
         const options = {
             limit: frame.options.limit || 10,
-            page: frame.options.page || 1
+            page: frame.options.page || 1,
+            withMember: false
         };
 
         // Add score filter if specified
@@ -126,6 +128,13 @@ class AudienceFeedbackController {
             options.score = parseInt(frame.options.score);
         }
 
+        try {
+            await permissions.canThis(frame.options.context).browse.member();
+            options.withMember = true;
+        } catch {
+            // permissions throws; we want to return data but without member info
+        }
+
         const result = await this.#repository.getForPost(postId, options);
         return result;
     }

package/core/server/services/audience-feedback/audience-feedback-service.js

@@ -24,7 +24,7 @@ class AudienceFeedbackService {
      */
     buildLink(uuid, post, score, key) {
         const postData = toPlain(post);
-        let postUrl = this.#urlService.facade.getUrlForResource({...postData, type: 'posts'}, {absolute: true});
+        let postUrl = this.#urlService.getUrlForResource({...postData, type: 'posts'}, {absolute: true});
 
         if (postUrl.match(/\/404\//)) {
             postUrl = this.#baseURL;
@@ -36,7 +36,7 @@ class AudienceFeedbackService {
      * Feedback link for a post that no longer exists. Goes straight to the
      * home page — the same destination buildLink picks when the URL service
      * has no URL for the post — without asking the URL service: an id-only
-     * resource can't be routed (the lazy backend rejects it as thin).
+     * resource can't be routed (the URL service reports it as thin).
      *
      * @param {string} uuid
      * @param {string} postId

package/core/server/services/audience-feedback/feedback-repository.js

@@ -76,10 +76,13 @@ module.exports = class FeedbackRepository {
             limit: options.limit || 10,
             page: options.page || 1,
             order: 'created_at DESC',
-            withRelated: ['member'],
             filter: filter
         };
 
+        if (options.withMember) {
+            findOptions.withRelated = ['member'];
+        }
+
         // Use findPage with filter
         const results = await this.#MemberFeedback.findPage(findOptions);
         

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

@@ -26,6 +26,7 @@ const AUTH_CODE_CHALLENGE_BYTES = 16;
  * @prop {string} user_agent
  * @prop {string} ip
  * @prop {boolean} verified
+ * @prop {string} [verified_user_id]
  * @prop {string} [auth_code_challenge]
  * @prop {number} [auth_code_generated_at]
  */
@@ -190,12 +191,14 @@ module.exports = function createSessionService({
 
             if (isAuthCodeVerified) {
                 session.verified = true;
+                session.verified_user_id = user.id;
                 invalidateAuthCodeChallenge(session);
             }
         }
 
         if (isStaffDeviceVerificationDisabled()) {
             session.verified = true;
+            session.verified_user_id = user.id;
         }
     }
 
@@ -214,6 +217,7 @@ module.exports = function createSessionService({
         const {
             user_id: previousUserId,
             verified: previousVerified,
+            verified_user_id: previousVerifiedUserId,
             auth_code_challenge: previousAuthCodeChallenge,
             auth_code_generated_at: previousAuthCodeGeneratedAt
         } = previousSession;
@@ -231,8 +235,11 @@ module.exports = function createSessionService({
 
         const session = req.session;
         session.user_id = previousUserId;
-        // A different user doesn't inherit the previous user's verification
-        session.verified = previousUserId && previousUserId !== user.id ? undefined : previousVerified;
+        // Verification is bound to the user who completed it — any other user
+        // (including sessions with no verified_user_id) must verify again
+        const carryVerification = previousVerified === true && previousVerifiedUserId === user.id;
+        session.verified = carryVerification ? true : undefined;
+        session.verified_user_id = carryVerification ? previousVerifiedUserId : undefined;
         session.auth_code_challenge = previousAuthCodeChallenge;
         session.auth_code_generated_at = previousAuthCodeGeneratedAt;
 
@@ -282,6 +289,7 @@ module.exports = function createSessionService({
         });
 
         session.verified = true;
+        session.verified_user_id = user.id;
         invalidateAuthCodeChallenge(session);
     }
 
@@ -480,6 +488,7 @@ module.exports = function createSessionService({
     async function verifySession(req, res) {
         const session = await getSession(req, res);
         session.verified = true;
+        session.verified_user_id = session.user_id;
         invalidateAuthCodeChallenge(session);
     }
 
@@ -491,7 +500,12 @@ module.exports = function createSessionService({
      */
     async function isVerifiedSession(req, res) {
         const session = await getSession(req, res);
-        return session.verified;
+        // Verification is bound to a user; a session with no verified_user_id
+        // (e.g. logged out, or predating this field) fails closed rather than
+        // matching an absent user_id via undefined === undefined
+        return session.verified === true &&
+            !!session.verified_user_id &&
+            session.verified_user_id === session.user_id;
     }
 
     /**
@@ -506,6 +520,7 @@ module.exports = function createSessionService({
 
         if (isVerificationRequired()) {
             session.verified = undefined;
+            session.verified_user_id = undefined;
         }
 
         invalidateAuthCodeChallenge(session);