ghost 6.61.0 → 6.63.0

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

@@ -6,8 +6,8 @@ transactions, or Stripe objects.
 
 ## Interface
 
-- `startCheckout(input)` owns the `giftSubCustomization` flag, duration
-  catalogue, Portal plan gate, tier/cadence validation, authoritative price,
+- `startCheckout(input)` owns the duration catalogue, Portal plan gate,
+  tier/cadence validation, authoritative price,
   token, success parameters, metadata, customer, and one-time payment.
 - `preparePaidContinuation(input)` validates an active gift and returns the
   stable tier/cadence/trial decision consumed by the normal subscription

package/core/server/services/gifts/constants.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GIFT_DELIVERY_EMAIL_TAG = exports.GIFT_DELIVERY_STALE_AFTER_MS = exports.GIFT_REMINDER_FLOOR_DAYS = exports.GIFT_REMINDER_LEAD_DAYS = exports.GIFT_SEND_HOUR = exports.GIFT_MAX_SCHEDULE_DAYS = exports.GIFT_EXPIRY_DAYS = void 0;
 exports.GIFT_EXPIRY_DAYS = 365;
 // How far ahead a delivery may be scheduled. Portal's picker carries its own
-// copy (GIFT_MAX_SCHEDULE_DAYS in beta-gift-page.tsx) since Portal ships
+// copy (GIFT_MAX_SCHEDULE_DAYS in gift-page.tsx) since Portal ships
 // separately — change them together.
 exports.GIFT_MAX_SCHEDULE_DAYS = 365;
 // Site-local hour a scheduled delivery is sent at. Portal never derives

package/core/server/services/gifts/email-templates/gift-delivery.hbs

@@ -31,9 +31,9 @@
                     <tr>
                       <td align="left" style="padding-bottom: 22px; text-align: left;">
                         {{#if siteIconUrl}}
-                          <a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48" style="border-radius: 4px;"></a>
+                          <img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48" style="border-radius: 4px;">
                         {{else}}
-                          <a href="{{siteUrl}}" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 17px; font-weight: 700; color: {{accentColor}}; text-decoration: none;">{{siteTitle}}</a>
+                          <span style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 17px; font-weight: 700; color: {{accentColor}};">{{siteTitle}}</span>
                         {{/if}}
                       </td>
                     </tr>
@@ -92,7 +92,7 @@
                     </tr>
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 40px;">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;">{{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=(linkTag siteUrl siteDomain class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;") email=(linkTag (mailto toEmail) toEmail class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;") buyerName=buyerName buyerEmail=(linkTag (mailto buyerEmail) buyerEmail class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;")}}</p>
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;">{{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=siteDomain email=toEmail buyerName=buyerName buyerEmail=buyerEmail}}</p>
                       </td>
                     </tr>
                   </table>

package/core/server/services/gifts/gift-email-service.js

@@ -182,7 +182,6 @@ class GiftEmailService {
         const giftLink = `${siteUrl.replace(/\/$/, '')}/gift/${token}`;
         const { html, text } = await this.renderer.renderDelivery({
             siteTitle,
-            siteUrl,
             siteIconUrl: this.blogIcon.getIconUrl({ absolute: true, fallbackToDefault: false }),
             siteDomain,
             accentColor: this.accentColor,

package/core/server/services/gifts/gift-service.js

@@ -95,40 +95,22 @@ class GiftService {
         this.deps = deps;
     }
     async startCheckout(input) {
-        const customizationEnabled = this.deps.labsService.isSet('giftSubCustomization');
-        const populatedDeliveryFields = [
-            input.recipientEmail,
-            input.recipientName,
-            input.buyerName,
-            input.personalMessage,
-            input.deliveryDate,
-        ].some((value) => value !== undefined && value !== null && value !== '');
-        if (!customizationEnabled && (input.deliveryMethod === 'email' || populatedDeliveryFields)) {
-            throw new errors_1.default.BadRequestError({
-                message: 'Bad Request.',
-                context: 'Gift email delivery is not available',
-            });
-        }
         const parsedBuyerEmail = CheckoutBuyerEmailSchema.safeParse(input.buyer.email);
-        if (customizationEnabled && !parsedBuyerEmail.success) {
+        if (!parsedBuyerEmail.success) {
             throw new errors_1.default.BadRequestError({
                 message: 'Bad Request.',
                 context: `Invalid gift buyer email: ${parsedBuyerEmail.error.issues[0].message}`,
             });
         }
         const buyerEmail = parsedBuyerEmail.success ? parsedBuyerEmail.data : input.buyer.email;
-        const parsedDelivery = GiftCheckoutDeliverySchema.safeParse(customizationEnabled
-            ? {
-                deliveryMethod: input.deliveryMethod ?? 'link',
-                recipientEmail: input.recipientEmail,
-                recipientName: input.recipientName,
-                buyerName: input.buyerName,
-                personalMessage: input.personalMessage,
-                deliveryDate: input.deliveryDate,
-            }
-            : {
-                deliveryMethod: 'link',
-            });
+        const parsedDelivery = GiftCheckoutDeliverySchema.safeParse({
+            deliveryMethod: input.deliveryMethod ?? 'link',
+            recipientEmail: input.recipientEmail,
+            recipientName: input.recipientName,
+            buyerName: input.buyerName,
+            personalMessage: input.personalMessage,
+            deliveryDate: input.deliveryDate,
+        });
         if (!parsedDelivery.success) {
             const issue = parsedDelivery.error.issues[0];
             throw new errors_1.default.BadRequestError({
@@ -150,22 +132,7 @@ class GiftService {
                 context: 'Expected offerId or tierId, received none',
             });
         }
-        let resolvedDuration = null;
-        let cadence;
-        if (customizationEnabled) {
-            resolvedDuration = (0, gift_checkout_offer_1.resolveGiftDuration)(input);
-            cadence = resolvedDuration.cadence;
-        }
-        else {
-            if (input.cadence !== 'month' && input.cadence !== 'year') {
-                const receivedCadence = input.cadence ? `"${input.cadence}"` : input.cadence;
-                throw new errors_1.default.BadRequestError({
-                    message: 'Bad Request.',
-                    context: `Expected cadence to be "month" or "year", received ${receivedCadence}`,
-                });
-            }
-            cadence = input.cadence;
-        }
+        const resolvedDuration = (0, gift_checkout_offer_1.resolveGiftDuration)(input);
         let tier;
         try {
             tier = await this.deps.tiersService.api.read(input.tierId);
@@ -185,20 +152,15 @@ class GiftService {
                 message: 'This tier is archived.',
             });
         }
-        let duration = 1;
-        let totalMonths;
-        let amount = tier.getPrice(cadence);
-        if (resolvedDuration) {
-            const plan = (0, gift_checkout_offer_1.validateGiftCheckoutOffer)({
-                tier,
-                portalPlans: this.deps.settingsCache.get('portal_plans'),
-                offer: resolvedDuration,
-            });
-            cadence = plan.cadence;
-            duration = plan.duration;
-            totalMonths = plan.totalMonths;
-            amount = plan.amount;
-        }
+        const plan = (0, gift_checkout_offer_1.validateGiftCheckoutOffer)({
+            tier,
+            portalPlans: this.deps.settingsCache.get('portal_plans'),
+            offer: resolvedDuration,
+        });
+        const cadence = plan.cadence;
+        const duration = plan.duration;
+        const totalMonths = plan.totalMonths;
+        const amount = plan.amount;
         const tierId = typeof tier.id === 'string' ? tier.id : tier.id.toHexString();
         const token = this.generateToken();
         const successUrl = new URL(input.successUrl);

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

@@ -14,7 +14,7 @@ const send_gift_delivery_event_1 = require("./events/send-gift-delivery-event");
 // Persistent scheduling adapters keep their queue across restarts and opt out
 // of boot-time rebuilds (same contract post scheduling honours in boot.js).
 let rescheduleDeliveriesOnBoot = true;
-async function init(options) {
+function init(options) {
     if (exports.service) {
         return;
     }
@@ -34,10 +34,9 @@ async function init(options) {
     const MailgunClient = require('../lib/mailgun-client');
     const config = require('../../../shared/config');
     const settingsCache = require('../../../shared/settings-cache');
-    const labsService = require('../../../shared/labs');
     const urlUtils = require('../../../shared/url-utils').default;
     const settingsHelpers = require('../settings-helpers');
-    const EmailAddressParser = require('../email-address/email-address-parser');
+    const emailAddressParser = require('../email-address/email-address-parser');
     const { blogIcon } = require('../../../server/lib/image');
     const { t } = require('../i18n');
     const repository = new gift_bookshelf_repository_1.GiftBookshelfRepository({
@@ -57,7 +56,7 @@ async function init(options) {
         bulkMailer: new MailgunClient({ config, settings: settingsCache }),
         settingsCache,
         urlUtils,
-        getFromAddress: () => EmailAddressParser.stringify(settingsHelpers.getDefaultEmail()),
+        getFromAddress: () => emailAddressParser.stringify(settingsHelpers.getDefaultEmail()),
         getReplyToAddress: () => settingsHelpers.getMembersSupportAddress(),
         blogIcon,
         t,
@@ -110,7 +109,6 @@ async function init(options) {
         },
         giftReminderScheduler,
         checkoutAdapter,
-        labsService,
         settingsCache,
     });
     exports.service = giftService;

package/core/server/services/gifts/jobs/index.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const logging = require('@tryghost/logging');
-const jobsService = require('../../jobs');
+const jobManager = require('../../jobs');
 const CleanGiftsJob = require('./clean-gifts-job').default;
 
 let hasScheduled = {
@@ -31,7 +31,7 @@ function scheduleJob(key, name, jobFile) {
   const at = randomOffPeakDailyCron();
 
   logging.info(`[Background Job] ${name} scheduled at ${at}`);
-  jobsService.addJob({
+  jobManager.addJob({
     at,
     job: path.resolve(__dirname, jobFile),
     name,
@@ -43,14 +43,14 @@ function scheduleJob(key, name, jobFile) {
 }
 
 module.exports = {
-  async scheduleGiftCleanupJob(classBasedJobs) {
+  async scheduleGiftCleanupJob(jobsService) {
     if (alreadyScheduledOrTest('cleanup')) {
       return;
     }
 
     const cron = randomOffPeakDailyCron();
     logging.info(`[Background Job] clean-gifts scheduled at ${cron}`);
-    await classBasedJobs.scheduleRecurring(new CleanGiftsJob(), { cron });
+    await jobsService.scheduleRecurring(new CleanGiftsJob(), { cron });
 
     hasScheduled.cleanup = true;
   },

package/core/server/services/indexnow-ping/indexnow-ping-service.js

@@ -160,7 +160,7 @@ class IndexNowPingService {
                     err,
                     message: err.message,
                     context: (0, tpl_1.default)(constants_1.messages.requestFailedError, { service: 'IndexNow' }),
-                    help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://ghost.org/docs/' }),
+                    help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://docs.ghost.org/' }),
                 }),
             };
         }
@@ -181,7 +181,7 @@ class IndexNowPingService {
                 err,
                 message: err.message,
                 context: (0, tpl_1.default)(constants_1.messages.requestFailedError, { service: 'IndexNow' }),
-                help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://ghost.org/docs/' }),
+                help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://docs.ghost.org/' }),
             }),
         };
     }

package/core/server/services/invitations/accept.js

@@ -30,7 +30,9 @@ async function accept(invitation) {
       throw new errors.NotFoundError({ message: tpl(messages.inviteExpired) });
     }
 
-    let user = await models.User.findOne({ email: data.email }, options);
+    const email = invite.get('email');
+
+    let user = await models.User.findOne({ email }, options);
     if (user) {
       throw new errors.ValidationError({
         message: tpl(messages.inviteEmailAlreadyExist.message),
@@ -45,7 +47,7 @@ async function accept(invitation) {
 
     await models.User.add(
       {
-        email: data.email,
+        email,
         name: data.name,
         password: data.password,
         roles: [roleId],

package/core/server/services/jobs/job-service.js

@@ -9,22 +9,13 @@ const models = require('../../models');
 const sentry = require('../../../shared/sentry');
 const domainEvents = require('@tryghost/domain-events');
 const config = require('../../../shared/config');
-const WorkerModelEventBridge = require('./worker-model-event-bridge');
 const errorHandler = (error, workerMeta) => {
   logging.error(error, `[Background Job] ${workerMeta.name} failed`);
   sentry.captureException(error);
 };
 const events = require('../../lib/common/events');
-const workerModelEventBridge = new WorkerModelEventBridge({ models, events, logging, sentry });
 
 const workerMessageHandler = ({ name, message }) => {
-  if (workerModelEventBridge.isModelEventMessage(message)) {
-    // Carries its own `eventName` rather than job-manager's reserved `event` key,
-    // so it routes through the bridge instead of being dispatched as a raw domain event.
-    workerModelEventBridge.handle(message, { jobName: name });
-    return;
-  }
-
   if (typeof message === 'string' && !['done', 'cancelled'].includes(message)) {
     logging.info(`[Background Job] ${name}: ${message}`);
   }

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

@@ -10,6 +10,14 @@ const errors_1 = __importDefault(require("@tryghost/errors"));
 const jobs_service_1 = require("./jobs-service");
 let instance;
 function init() {
+    // The instance lives for the whole process: the didInit-guarded mentions
+    // service captures it in MentionController and MentionSendingService, so
+    // an in-process restart (test harness) must revive the same object rather
+    // than strand those references on a stopped queue.
+    if (instance) {
+        instance.clearHandlers();
+        return instance;
+    }
     const adapterManager = require('../adapter-manager').default;
     const logging = require('@tryghost/logging');
     const sentry = require('../../../shared/sentry');

package/core/server/services/jobs-service/jobs-service.js

@@ -11,12 +11,14 @@ class JobsService {
     #logging;
     #sentry;
     #registry = new Map();
+    #queueByType = new Map();
+    #queues = new Map();
     constructor({ backend, logging, sentry }) {
         this.#backend = backend;
         this.#logging = logging;
         this.#sentry = sentry;
     }
-    handle(JobClass, handler) {
+    handle(JobClass, handler, options) {
         const type = JobClass.type;
         if (typeof type !== 'string' || type.length === 0) {
             throw new errors_1.default.IncorrectUsageError({
@@ -28,14 +30,52 @@ class JobsService {
                 message: `A handler for job type "${type}" is already registered.`,
             });
         }
+        this.#declareQueue(type, options);
         this.#registry.set(type, (payload) => handler(new JobClass(JSON.parse(payload))));
     }
+    #declareQueue(type, options) {
+        if (!options) {
+            return;
+        }
+        const { queue, concurrency } = options;
+        if (typeof queue !== 'string' || queue.length === 0) {
+            throw new errors_1.default.IncorrectUsageError({
+                message: `Invalid queue for job type "${type}": ${JSON.stringify(queue)}. Expected a non-empty string.`,
+            });
+        }
+        // "default" is the backend's shared lane for types that declare no queue;
+        // declaring it would silently re-size that lane for every unrouted type.
+        if (queue === 'default') {
+            throw new errors_1.default.IncorrectUsageError({
+                message: `Queue name "default" is reserved for the shared lane; job type "${type}" must omit options to use it.`,
+            });
+        }
+        if (!Number.isInteger(concurrency) || concurrency < 1) {
+            throw new errors_1.default.IncorrectUsageError({
+                message: `Invalid concurrency for job type "${type}": ${JSON.stringify(concurrency)}. Expected a positive integer.`,
+            });
+        }
+        const existing = this.#queues.get(queue);
+        if (existing && existing.concurrency !== concurrency) {
+            throw new errors_1.default.IncorrectUsageError({
+                message: `Conflicting concurrency for queue "${queue}": ${existing.concurrency} is already declared, job type "${type}" declares ${concurrency}.`,
+            });
+        }
+        this.#queues.set(queue, { concurrency });
+        this.#queueByType.set(type, queue);
+    }
+    #routingFor(type) {
+        const queue = this.#queueByType.get(type);
+        return queue === undefined ? undefined : { queue };
+    }
     async dispatch(job) {
-        await this.#backend.enqueue(this.#buildEnvelope(job));
+        const envelope = this.#buildEnvelope(job);
+        await this.#backend.enqueue(envelope, this.#routingFor(envelope.type));
     }
     async scheduleRecurring(job, schedule) {
         this.#assertValidCron(schedule.cron);
-        await this.#backend.scheduleRecurring(this.#buildEnvelope(job), schedule);
+        const envelope = this.#buildEnvelope(job);
+        await this.#backend.scheduleRecurring(envelope, schedule, this.#routingFor(envelope.type));
     }
     // later.parse.cron does not strictly validate: it silently coerces a
     // malformed expression into a bogus schedule (garbage -> every minute,
@@ -55,11 +95,20 @@ class JobsService {
     async start() {
         await this.#backend.start({
             processor: (envelope) => this.#process(envelope),
+            queues: Object.fromEntries(this.#queues),
         });
     }
     async shutdown(options) {
         await this.#backend.shutdown(options);
     }
+    // An in-process restart (test harness) re-runs handler registration on the
+    // same instance, so all registration state resets - handlers and queue
+    // declarations alike. The duplicate-type guard still holds within a boot.
+    clearHandlers() {
+        this.#registry.clear();
+        this.#queueByType.clear();
+        this.#queues.clear();
+    }
     #buildEnvelope(job) {
         return { type: this.#typeOf(job), payload: JSON.stringify(job) };
     }

package/core/server/services/jobs-service/register-job-handlers.js

@@ -37,25 +37,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = registerJobHandlers;
-const errors_1 = __importDefault(require("@tryghost/errors"));
 const clean_tokens_job_1 = __importDefault(require("../members/jobs/clean-tokens-job"));
-const clean_tokens_task_1 = __importDefault(require("../members/jobs/clean-tokens-task"));
-const gifts = __importStar(require("../gifts"));
+const clean_expired_comped_job_1 = __importDefault(require("../members/jobs/clean-expired-comped-job"));
 const clean_gifts_job_1 = __importDefault(require("../gifts/jobs/clean-gifts-job"));
 const external_media_inliner_job_1 = __importDefault(require("../media-inliner/external-media-inliner-job"));
-function registerJobHandlers({ jobsService, db, logging, mediaInliner, }) {
+const content_csv_import_job_1 = __importDefault(require("../content-import/jobs/content-csv-import-job"));
+const contentImport = __importStar(require("../content-import"));
+const update_check_job_1 = __importDefault(require("../update-check/jobs/update-check-job"));
+const process_webmention_job_1 = __importDefault(require("../mentions/process-webmention-job"));
+const send_webmentions_job_1 = __importDefault(require("../mentions/send-webmentions-job"));
+const updateCheck = require('../update-check');
+// Webmention processing fetches external pages and is triggered by
+// unauthenticated requests, so webmention jobs run in their own lane where a
+// flood cannot occupy the shared workers. The concurrency matches the old
+// dedicated mentions job queue. Every webmention job type must register with
+// this shared declaration so none can declare the queue with a different
+// concurrency.
+const WEBMENTIONS_QUEUE = { queue: 'webmentions', concurrency: 3 };
+function registerJobHandlers({ jobsService, memberJobs, giftService, mediaInliner, mentionsController, mentionsSendingService, }) {
     jobsService.handle(clean_tokens_job_1.default, async () => {
-        await (0, clean_tokens_task_1.default)({ db, logging });
+        await memberJobs.cleanTokens();
+    });
+    jobsService.handle(clean_expired_comped_job_1.default, async () => {
+        await memberJobs.cleanExpiredComped();
     });
     jobsService.handle(clean_gifts_job_1.default, async () => {
-        if (!gifts.service) {
-            throw new errors_1.default.IncorrectUsageError({
-                message: 'clean-gifts ran before the gifts service was initialised',
-            });
-        }
-        await gifts.service.cleanup();
+        await giftService.cleanup();
     });
     jobsService.handle(external_media_inliner_job_1.default, async (job) => {
         await mediaInliner.inline(job.domains);
     });
+    jobsService.handle(content_csv_import_job_1.default, async (job) => {
+        await contentImport.handleJob(job);
+    });
+    jobsService.handle(update_check_job_1.default, async () => {
+        await updateCheck({ rethrowErrors: true });
+    });
+    jobsService.handle(process_webmention_job_1.default, async (job) => {
+        await mentionsController.processWebmention(job);
+    }, WEBMENTIONS_QUEUE);
+    jobsService.handle(send_webmentions_job_1.default, async (job) => {
+        await mentionsSendingService.sendWebmentions(job);
+    }, WEBMENTIONS_QUEUE);
 }

package/core/server/services/mail/ghost-mailer.js

@@ -17,7 +17,7 @@ const messages = {
   reason: ' Reason: {reason}.',
   messageSent: 'Message sent. Double check inbox and spam folder!',
 };
-const EmailAddressParser = require('../email-address/email-address-parser');
+const emailAddressParser = require('../email-address/email-address-parser');
 const DEFAULT_TAGS = ['ghost-email', 'transactional-email'];
 const MAX_MAILGUN_TAGS = 10;
 
@@ -54,8 +54,8 @@ function getFromAddress(requestedFromAddress, requestedReplyToAddress) {
   }
 
   return {
-    from: EmailAddressParser.stringify(addresses.from),
-    replyTo: addresses.replyTo ? EmailAddressParser.stringify(addresses.replyTo) : null,
+    from: emailAddressParser.stringify(addresses.from),
+    replyTo: addresses.replyTo ? emailAddressParser.stringify(addresses.replyTo) : null,
   };
 }
 
@@ -100,7 +100,7 @@ function createMessage(message) {
  */
 function createMailError({ message, err, ignoreDefaultMessage } = { message: '' }) {
   const helpMessage = tpl(messages.checkEmailConfigInstructions, {
-    url: 'https://ghost.org/docs/config/#mail',
+    url: 'https://docs.ghost.org/config/#mail',
   });
   const defaultErrorMessage = tpl(messages.failedSendingEmailError);
 

package/core/server/services/member-welcome-emails/service.js

@@ -7,7 +7,7 @@ const MagicLink = require('../lib/magic-link/magic-link');
 const sentry = require('../../../shared/sentry');
 const emailAddressService = require('../email-address');
 const settingsHelpers = require('../settings-helpers');
-const EmailAddressParser = require('../email-address/email-address-parser');
+const emailAddressParser = require('../email-address/email-address-parser');
 const mail = require('../mail');
 const MailgunClient = require('../lib/mailgun-client');
 const config = require('../../../shared/config');
@@ -152,7 +152,7 @@ class MemberWelcomeEmailService {
       },
     });
 
-    const from = EmailAddressParser.stringify(fromAddresses.from);
+    const from = emailAddressParser.stringify(fromAddresses.from);
     const replyToSetting = newsletter.get('sender_reply_to');
     let replyTo = null;
 
@@ -173,7 +173,7 @@ class MemberWelcomeEmailService {
       });
 
       if (addresses.replyTo) {
-        replyTo = EmailAddressParser.stringify(addresses.replyTo);
+        replyTo = emailAddressParser.stringify(addresses.replyTo);
       }
     }
 
@@ -199,10 +199,10 @@ class MemberWelcomeEmailService {
   async #getEffectiveSenderOptions(automatedSender = {}) {
     const defaultOptions = await this.#getSenderOptions();
     const defaultFrom =
-      EmailAddressParser.parse(defaultOptions.from || '') ||
+      emailAddressParser.parse(defaultOptions.from || '') ||
       emailAddressService.service.defaultFromEmail;
     const defaultReplyTo = defaultOptions.replyTo
-      ? EmailAddressParser.parse(defaultOptions.replyTo)
+      ? emailAddressParser.parse(defaultOptions.replyTo)
       : undefined;
 
     const senderName = trimValue(automatedSender.senderName) || defaultFrom?.name || undefined;
@@ -218,10 +218,10 @@ class MemberWelcomeEmailService {
     });
 
     return {
-      from: EmailAddressParser.stringify(addresses.from),
+      from: emailAddressParser.stringify(addresses.from),
       ...(addresses.replyTo
         ? {
-            replyTo: EmailAddressParser.stringify(addresses.replyTo),
+            replyTo: emailAddressParser.stringify(addresses.replyTo),
           }
         : {}),
     };

package/core/server/services/members/account-service.js

@@ -0,0 +1,98 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MemberAccountService = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+const members_metafields_1 = require("../members-metafields");
+/**
+ * A member's own account: what they are shown about themselves, and what they may
+ * change.
+ *
+ * Separate from the request handlers that used to hold this, because none of it is
+ * a question about HTTP. Which fields a member may set is a fact about members, and
+ * the answer is the same whoever is asking.
+ *
+ * Takes a member id rather than a member. Everything here either writes or reads
+ * afresh, and a record loaded before a write is stale by the time the answer is
+ * built, so there is nothing a caller could usefully hand over.
+ */
+/** What a member is allowed to change about themselves. */
+const WRITABLE_FIELDS = [
+    'name',
+    'expertise',
+    'subscribed',
+    'newsletters',
+    'enable_comment_notifications',
+    'enable_updates_and_announcements',
+];
+/**
+ * The relations a write needs loaded to work out what it is changing.
+ *
+ * Newsletters because the older `subscribed` flag is stored as a list of them, and
+ * the subscription chain because changing what a member is entitled to has to
+ * reconcile against what they are paying for.
+ */
+const WRITE_RELATIONS = [
+    'stripeSubscriptions',
+    'stripeSubscriptions.customer',
+    'stripeSubscriptions.stripePrice',
+    'newsletters',
+];
+class MemberAccountService {
+    #memberBREADService;
+    #members;
+    #emailSuppressionList;
+    #metafieldValues;
+    constructor({ memberBREADService, members, emailSuppressionList, metafieldValues, }) {
+        this.#memberBREADService = memberBREADService;
+        this.#members = members;
+        this.#emailSuppressionList = emailSuppressionList;
+        this.#metafieldValues = metafieldValues;
+    }
+    /** Everything a member is shown about themselves. */
+    async read(memberId) {
+        // As the member rather than as staff: how much of the extra fields a publisher
+        // defines is answered depends on which side of Ghost is asking.
+        return this.#memberBREADService.read({ id: memberId }, { metafieldsFor: members_metafields_1.MEMBERS });
+    }
+    /** Apply what a member asked to change about themselves, and say what they now hold. */
+    async edit(data, memberId) {
+        // Worked out before the member is touched, so a value the catalog refuses fails
+        // the whole request rather than leaving a member renamed with their answers
+        // rejected. The write below reconciles subscriptions with Stripe and sends
+        // events, none of which giving up halfway could undo.
+        const plannedMetafields = data.metafields === undefined
+            ? null
+            : await this.#metafieldValues.planWrite(this.#metafieldValues.unwrapWire(data.metafields), members_metafields_1.MEMBERS);
+        await this.#members.update(lodash_1.default.pick(data, WRITABLE_FIELDS), {
+            id: memberId,
+            withRelated: WRITE_RELATIONS,
+        });
+        if (plannedMetafields) {
+            // A member is recorded as the author of their own answers, and is the one
+            // writer whose changes leave nothing in the staff action log: that log
+            // records what staff did.
+            await this.#metafieldValues.applyWrite(memberId, plannedMetafields, {
+                writtenBy: { type: 'member', id: memberId },
+            });
+        }
+        // Read back rather than returning what was written: a member is told what
+        // Ghost now holds, which is not always what they sent. Setting the older
+        // `subscribed` flag, for one, is stored as a list of newsletters.
+        return this.read(memberId);
+    }
+    /**
+     * Let Ghost email this member again.
+     *
+     * Two records rather than one: the address is on a list the email provider also
+     * writes to, and the member carries a flag of their own. A member asking to hear
+     * from a site again means both.
+     */
+    async allowEmail(memberId, email) {
+        await this.#emailSuppressionList.removeEmail(email);
+        await this.#members.update({ email_disabled: false }, { id: memberId });
+    }
+}
+exports.MemberAccountService = MemberAccountService;