ghost 6.62.0 → 6.63.0

package/core/server/services/{members-custom-fields → members-metafields}/values-service.js

@@ -3,21 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomFieldValuesService = void 0;
+exports.MetafieldValuesService = void 0;
 const bson_objectid_1 = __importDefault(require("bson-objectid"));
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const logging_1 = __importDefault(require("@tryghost/logging"));
 const zod_1 = require("zod");
-const custom_field_types_1 = require("@tryghost/custom-field-types");
-const identity_1 = require("@tryghost/custom-field-types/identity");
+const metafield_types_1 = require("@tryghost/metafield-types");
+const identity_1 = require("@tryghost/metafield-types/identity");
 const schema_1 = require("./schema");
 const queries_1 = require("./queries");
+const access_1 = require("./access");
 const storage_1 = require("./storage");
-const FIELDS_TABLE = 'members_custom_fields';
-const VALUES_TABLE = 'members_custom_field_values';
+const FIELDS_TABLE = 'members_metafields';
+const VALUES_TABLE = 'members_metafield_values';
 /**
  * From the canonical schema, the same source definitions-service reads, so no key a site
- * could hold is refused and this cannot drift from the `members_custom_fields.key` column.
+ * could hold is refused and this cannot drift from the `members_metafields.key` column.
  */
 const MAX_KEY_LENGTH = require('../../data/schema').tables[FIELDS_TABLE].key.maxlength;
 /**
@@ -38,7 +39,7 @@ const wireProperty = (identity) => [identity_1.QUALIFIER, identity].join('.');
  * because a value belongs to the member and a definition belongs to the site's settings,
  * which are different aggregates rather than different layers.
  */
-class CustomFieldValuesService {
+class MetafieldValuesService {
     knex;
     /** A getter, not a number: the ceiling is an operator setting that changes between requests. */
     getMaxDefinitions;
@@ -62,7 +63,7 @@ class CustomFieldValuesService {
             { ...field, namespace: identity_1.CUSTOM_NAMESPACE },
         ]));
     }
-    async getValuesForMembers(memberIds) {
+    async getValuesForMembers(memberIds, audience) {
         if (memberIds.length === 0) {
             return new Map();
         }
@@ -70,7 +71,7 @@ class CustomFieldValuesService {
         // cannot carry an order. `path` is ordered so composite parts assemble the same
         // way every time.
         const rows = await this.knex(VALUES_TABLE)
-            .join(FIELDS_TABLE, `${VALUES_TABLE}.custom_field_key`, `${FIELDS_TABLE}.key`)
+            .join(FIELDS_TABLE, `${VALUES_TABLE}.metafield_key`, `${FIELDS_TABLE}.key`)
             .whereIn(`${VALUES_TABLE}.member_id`, memberIds)
             .where(`${FIELDS_TABLE}.status`, schema_1.FIELD_STATUS.active)
             .orderBy(`${VALUES_TABLE}.path`, 'asc')
@@ -78,18 +79,21 @@ class CustomFieldValuesService {
         const leaves = [];
         for (const row of rows) {
             try {
-                leaves.push(schema_1.DbCustomFieldLeaf.parse(row));
+                leaves.push(schema_1.DbMetafieldLeaf.parse(row));
             }
             catch (err) {
                 logging_1.default.warn({
-                    event: { name: 'members.custom_fields.value_unreadable' },
+                    event: { name: 'members.metafields.value_unreadable' },
                     err,
-                    customFieldKey: row.key,
+                    metafieldKey: row.key,
                     path: row.path,
-                }, 'Skipping an unreadable custom field value');
+                }, 'Skipping an unreadable metafield value');
             }
         }
-        const flat = (0, storage_1.valuesFromLeaves)(leaves);
+        // Narrowed before assembly, not after: a composite is one value spread across
+        // several rows, and dropping some of its parts later would hand back half an
+        // address rather than no address.
+        const flat = (0, storage_1.valuesFromLeaves)((0, access_1.readableFields)(audience, leaves));
         return new Map(memberIds.map((memberId) => [memberId, { [identity_1.CUSTOM_NAMESPACE]: flat.get(memberId) ?? {} }]));
     }
     parseValues(input) {
@@ -141,7 +145,7 @@ class CustomFieldValuesService {
      * validate before opening a transaction it would otherwise have to unwind, then apply
      * the same plan without re-resolving it.
      */
-    async planWrite(input) {
+    async planWrite(input, audience) {
         const values = this.parseValues(input);
         const identities = Object.keys(values);
         // Bounded by the definitions ceiling, which also holds the lookup below inside
@@ -163,10 +167,16 @@ class CustomFieldValuesService {
                     property: wireProperty(identity),
                 });
             }
+            if (!(0, access_1.canWrite)(audience, field)) {
+                throw new errors_1.default.ValidationError({
+                    message: `Cannot set custom field: ${identity}`,
+                    property: wireProperty(identity),
+                });
+            }
             // `null` clears any field, and `''` clears one with no parts. For a value
             // with parts `''` names nothing, so it is left to fail validation rather than
             // being read as a silent delete.
-            if (raw === null || (raw === '' && (0, custom_field_types_1.subFieldsOf)(field.type) === null)) {
+            if (raw === null || (raw === '' && (0, metafield_types_1.subFieldsOf)(field.type) === null)) {
                 writes.push({ field });
                 continue;
             }
@@ -174,7 +184,7 @@ class CustomFieldValuesService {
             // `context` when `context` is empty and prepends it when it is not, so
             // anything added here reaches the client glued to the front of the reason.
             // Which field failed rides in `property`.
-            const value = custom_field_types_1.FIELD_TYPES[field.type].value.safeParse(raw);
+            const value = metafield_types_1.FIELD_TYPES[field.type].value.safeParse(raw);
             if (!value.success) {
                 const issue = value.error.issues[0];
                 throw new errors_1.default.ValidationError({
@@ -224,7 +234,7 @@ class CustomFieldValuesService {
                 rows.push(...set.map((leaf) => ({
                     id: new bson_objectid_1.default().toHexString(),
                     member_id: memberId,
-                    custom_field_key: field.key,
+                    metafield_key: field.key,
                     path: leaf.path,
                     value_text: leaf.value_text,
                     written_by_type: writtenBy.type,
@@ -236,7 +246,7 @@ class CustomFieldValuesService {
             if (clearedKeys.length > 0) {
                 await trx(VALUES_TABLE)
                     .where('member_id', memberId)
-                    .whereIn('custom_field_key', clearedKeys)
+                    .whereIn('metafield_key', clearedKeys)
                     .del();
             }
             if (clearedPaths.length > 0) {
@@ -245,7 +255,7 @@ class CustomFieldValuesService {
                     .where('member_id', memberId)
                     .where((builder) => {
                     for (const { fieldKey, paths } of clearedPaths) {
-                        builder.orWhere((pair) => pair.where('custom_field_key', fieldKey).whereIn('path', paths));
+                        builder.orWhere((pair) => pair.where('metafield_key', fieldKey).whereIn('path', paths));
                     }
                 })
                     .del();
@@ -258,7 +268,7 @@ class CustomFieldValuesService {
                     .insert(rows.slice(from, from + UPSERT_CHUNK))
                     // Naming the columns rather than giving values takes each from the row
                     // that lost the conflict, so every part updates to its own value.
-                    .onConflict(['member_id', 'custom_field_key', 'path'])
+                    .onConflict(['member_id', 'metafield_key', 'path'])
                     // The writer is merged with the value, so a leaf names who wrote what
                     // it currently holds rather than who wrote its first value.
                     .merge(['value_text', 'written_by_type', 'written_by_id', 'updated_at']);
@@ -273,4 +283,4 @@ class CustomFieldValuesService {
         }
     }
 }
-exports.CustomFieldValuesService = CustomFieldValuesService;
+exports.MetafieldValuesService = MetafieldValuesService;

package/core/server/services/mentions/mention-sending-service.js

@@ -1,5 +1,6 @@
 const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
+const SendWebmentionsJob = require('./send-webmentions-job').default;
 
 module.exports = class MentionSendingService {
   #discoveryService;
@@ -8,8 +9,12 @@ module.exports = class MentionSendingService {
   #getPostData;
   #getPostUrl;
   #isEnabled;
-  #jobService;
+  #jobsService;
 
+  /**
+   * @param {object} deps
+   * @param {import('../jobs-service/jobs-service').JobsService} deps.jobsService
+   */
   constructor({
     discoveryService,
     externalRequest,
@@ -17,7 +22,7 @@ module.exports = class MentionSendingService {
     getPostData,
     getPostUrl,
     isEnabled,
-    jobService,
+    jobsService,
   }) {
     this.#discoveryService = discoveryService;
     this.#externalRequest = externalRequest;
@@ -25,7 +30,7 @@ module.exports = class MentionSendingService {
     this.#getPostData = getPostData;
     this.#getPostUrl = getPostUrl;
     this.#isEnabled = isEnabled;
-    this.#jobService = jobService;
+    this.#jobsService = jobsService;
   }
 
   get siteUrl() {
@@ -82,13 +87,13 @@ module.exports = class MentionSendingService {
         // Capture the source URL now, from the event's data, rather than
         // deferring the model into the job.
         const url = new URL(await this.#resolvePostUrl(post));
-        await this.#jobService.addJob('sendWebmentions', async () => {
-          await this.sendForHTMLResource({
-            url,
+        await this.#jobsService.dispatch(
+          new SendWebmentionsJob({
+            sourceUrl: url.href,
             html: html,
             previousHtml: previousHtml,
-          });
-        });
+          }),
+        );
       }
     } catch (e) {
       logging.error('Error in webmention sending service post update event handler:');
@@ -157,11 +162,23 @@ module.exports = class MentionSendingService {
     });
   }
 
+  /**
+   * Send the webmentions for a delivered job.
+   * @param {import('./send-webmentions-job').default} job
+   */
+  async sendWebmentions(job) {
+    await this.sendForHTMLResource({
+      url: new URL(job.sourceUrl),
+      html: job.html,
+      previousHtml: job.previousHtml,
+    });
+  }
+
   /**
    * Send a webmention call for the links in a resource.
    * @param {object} resource
    * @param {URL} resource.url
-   * @param {string} resource.html
+   * @param {string|null} resource.html
    * @param {string|null} [resource.previousHtml]
    */
   async sendForHTMLResource(resource) {

package/core/server/services/mentions/send-webmentions-job.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const job_1 = require("../jobs-service/job");
+// Carries the post's full html twice - the largest job payload in the system;
+// revisit if a durable backend puts size limits on envelopes.
+class SendWebmentionsJob extends job_1.Job {
+    static type = 'send-webmentions';
+    sourceUrl;
+    html;
+    previousHtml;
+    constructor({ sourceUrl, html, previousHtml, }) {
+        super();
+        this.sourceUrl = sourceUrl;
+        this.html = html ?? null;
+        this.previousHtml = previousHtml ?? null;
+    }
+}
+exports.default = SendWebmentionsJob;

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

@@ -14,8 +14,6 @@ const outputSerializerUrlUtil = require('../../../server/api/endpoints/utils/ser
 const urlService = require('../url');
 const settingsCache = require('../../../shared/settings-cache');
 const DomainEvents = require('@tryghost/domain-events');
-const logging = require('@tryghost/logging');
-const mentionsJobService = require('../mentions-jobs');
 
 // Serializes a post model to the data the URL service needs, loading the
 // relations it reads for filtered collections (event-emitted models don't
@@ -38,33 +36,6 @@ function getPostUrl(id, postData) {
   return jsonModel.url;
 }
 
-// Reports the same queued/started/finished/failed lifecycle for every mentions
-// background job. The wrapped callback's result and errors pass through unchanged,
-// so job manager outcomes and retries are unaffected.
-function makeLoggingJobService() {
-  return {
-    async addJob(name, fn) {
-      logging.info(`[Background Job] ${name} queued`);
-      mentionsJobService.addJob({
-        name,
-        job: async () => {
-          const startedAt = Date.now();
-          logging.info(`[Background Job] ${name} started`);
-          try {
-            const result = await fn();
-            logging.info(`[Background Job] ${name} completed in ${Date.now() - startedAt}ms`);
-            return result;
-          } catch (err) {
-            logging.error(err, `[Background Job] ${name} failed after ${Date.now() - startedAt}ms`);
-            throw err;
-          }
-        },
-        offloaded: false,
-      });
-    },
-  };
-}
-
 module.exports = {
   /** @type {import('./mentions-api')} */
   api: null,
@@ -141,7 +112,7 @@ module.exports = {
       getPostData: (post) => getPostData(post),
       getPostUrl: (id, data) => getPostUrl(id, data),
       isEnabled: () => !settingsCache.get('is_private'),
-      jobService: makeLoggingJobService(),
+      jobsService,
     });
     sendingService.listen(events);
 
@@ -152,4 +123,3 @@ module.exports = {
 // exposed for testing
 module.exports.getPostData = getPostData;
 module.exports.getPostUrl = getPostUrl;
-module.exports.makeLoggingJobService = makeLoggingJobService;

package/core/server/services/stripe/services/webhook/checkout-session-event-service.js

@@ -453,7 +453,7 @@ module.exports = class CheckoutSessionEventService {
 
   /**
    * This service knows how to read a completed Stripe session. It does not know, and must
-   * not know, which custom field any of those values belongs in — that is what a binding
+   * not know, which metafield any of those values belongs in — that is what a binding
    * decides, so no field key appears anywhere in this code.
    *
    * Nothing here may be fatal: a throw fails the webhook, which makes Stripe retry it and
@@ -493,7 +493,7 @@ module.exports = class CheckoutSessionEventService {
         return;
       }
 
-      await this.deps.customFieldBindings.writeCollected(
+      await this.deps.metafieldBindings.writeCollected(
         memberId,
         tierId,
         collectedByPort.parse(session),

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

@@ -10,7 +10,7 @@ const InvoiceEventService = require('./services/webhook/invoice-event-service');
 const CheckoutSessionEventService = require('./services/webhook/checkout-session-event-service');
 const ChargeRefundedEventService = require('./services/webhook/charge-refunded-event-service');
 const memberWelcomeEmailService = require('../member-welcome-emails/service');
-const customFields = require('../members-custom-fields');
+const metafields = require('../members-metafields');
 
 /**
  * @typedef {object} IStripeServiceConfig
@@ -135,10 +135,10 @@ module.exports = class StripeService {
         memberWelcomeEmailService.init();
         return memberWelcomeEmailService.api.isMemberWelcomeEmailActive('paid');
       },
-      // A getter because the custom field services are built during boot: reading the
+      // A getter because the metafields services are built during boot: reading the
       // binding at construction would capture the empty value it had beforehand.
-      get customFieldBindings() {
-        return customFields.bindings;
+      get metafieldBindings() {
+        return metafields.bindings;
       },
     });
 

package/core/server/services/tier-checkout-config/codec.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.questionRowCodec = exports.QuestionRow = exports.collectionRowCodec = exports.CollectionRow = exports.optionsCodec = void 0;
 const zod_1 = require("zod");
-const custom_field_types_1 = require("@tryghost/custom-field-types");
+const metafield_types_1 = require("@tryghost/metafield-types");
 const boolean_1 = require("../../lib/db-types/boolean");
 const schema_1 = require("./schema");
 const models_1 = require("./models");
@@ -67,7 +67,7 @@ exports.QuestionRow = zod_1.z.object({
     label: schema_1.DbCheckoutQuestion.shape.label,
     optional: schema_1.DbCheckoutQuestion.shape.optional,
     question_name: zod_1.z.string().nullable(),
-    question_type: custom_field_types_1.FieldTypeSchema.nullable(),
+    question_type: metafield_types_1.FieldTypeSchema.nullable(),
 });
 exports.questionRowCodec = exports.QuestionRow.transform((row) => ({
     tierId: row.product_id,

package/core/server/services/tier-checkout-config/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toCheckoutConfigResponse = exports.TierCheckoutConfig = exports.ShippingCollection = exports.ResolvedQuestion = exports.ResolvedCheckout = exports.PhoneCollection = exports.emptyCheckoutConfig = exports.CheckoutQuestion = exports.TierCheckoutConfigService = void 0;
+exports.requirementsByTier = exports.toCheckoutConfigResponse = exports.TierCheckoutConfig = exports.ShippingCollection = exports.ResolvedQuestion = exports.ResolvedCheckout = exports.PhoneCollection = exports.emptyCheckoutConfig = exports.CheckoutQuestion = exports.TierCheckoutConfigService = void 0;
 /**
  * What a tier's checkout asks and collects.
  *
@@ -24,3 +24,4 @@ Object.defineProperty(exports, "ShippingCollection", { enumerable: true, get: fu
 Object.defineProperty(exports, "TierCheckoutConfig", { enumerable: true, get: function () { return models_1.TierCheckoutConfig; } });
 var serializers_1 = require("./serializers");
 Object.defineProperty(exports, "toCheckoutConfigResponse", { enumerable: true, get: function () { return serializers_1.toCheckoutConfigResponse; } });
+Object.defineProperty(exports, "requirementsByTier", { enumerable: true, get: function () { return serializers_1.requirementsByTier; } });

package/core/server/services/tier-checkout-config/models.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolvedCheckout = exports.ResolvedQuestion = exports.CheckoutOptions = exports.emptyCheckoutConfig = exports.emptyCollection = exports.TierCheckoutConfig = exports.PhoneCollection = exports.ShippingCollection = exports.CheckoutQuestion = void 0;
 const zod_1 = require("zod");
-const custom_field_types_1 = require("@tryghost/custom-field-types");
+const metafield_types_1 = require("@tryghost/metafield-types");
 exports.CheckoutQuestion = zod_1.z.object({
     key: zod_1.z.string(),
     label: zod_1.z.string().nullable(),
@@ -53,7 +53,7 @@ exports.CheckoutOptions = zod_1.z.object({
 });
 exports.ResolvedQuestion = exports.CheckoutQuestion.extend({
     prompt: zod_1.z.string(),
-    type: custom_field_types_1.FieldTypeSchema,
+    type: metafield_types_1.FieldTypeSchema,
 });
 exports.ResolvedCheckout = zod_1.z.object({
     customFields: zod_1.z.array(exports.ResolvedQuestion),

package/core/server/services/tier-checkout-config/queries.js

@@ -4,13 +4,13 @@ exports.FIELDS_TABLE = exports.BINDINGS_TABLE = exports.CONFIG_TABLE = exports.Q
 exports.collectionRowsForTier = collectionRowsForTier;
 exports.configuredCollectionRows = configuredCollectionRows;
 exports.questionRows = questionRows;
-const schema_1 = require("../members-custom-fields/schema");
+const schema_1 = require("../members-metafields/schema");
 const checkout_1 = require("@tryghost/checkout");
 const schema_2 = require("./schema");
 exports.QUESTIONS_TABLE = 'products_checkout_fields';
 exports.CONFIG_TABLE = 'products_checkout_config';
-exports.BINDINGS_TABLE = 'members_custom_field_bindings';
-exports.FIELDS_TABLE = 'members_custom_fields';
+exports.BINDINGS_TABLE = 'members_metafield_bindings';
+exports.FIELDS_TABLE = 'members_metafields';
 const ACTIVE = schema_1.FIELD_STATUS.active;
 const optionColumns = Object.keys(schema_2.DbCheckoutOptions.shape).map((column) => `${exports.CONFIG_TABLE}.${column}`);
 function collectionQuery(db) {
@@ -18,7 +18,7 @@ function collectionQuery(db) {
         this.on(`${alias}.product_id`, 'products.id').andOn(db.raw(`${alias}.port = ?`, [port]));
     };
     const landsIn = (alias, binding) => function () {
-        this.on(`${alias}.key`, `${binding}.custom_field_key`).andOn(db.raw(`${alias}.status = ?`, [ACTIVE]));
+        this.on(`${alias}.key`, `${binding}.metafield_key`).andOn(db.raw(`${alias}.status = ?`, [ACTIVE]));
     };
     const query = db('products')
         .leftJoin(exports.CONFIG_TABLE, `${exports.CONFIG_TABLE}.product_id`, 'products.id')
@@ -33,11 +33,11 @@ function collectionQuery(db) {
         'products.id as product_id',
         `${exports.CONFIG_TABLE}.id as config_id`,
         ...optionColumns,
-        'name_binding.custom_field_key as shipping_name_key',
+        'name_binding.metafield_key as shipping_name_key',
         'name_field.key as shipping_name_collectable',
-        'shipping_binding.custom_field_key as shipping_address_key',
+        'shipping_binding.metafield_key as shipping_address_key',
         'shipping_field.key as shipping_address_collectable',
-        'phone_binding.custom_field_key as phone_key',
+        'phone_binding.metafield_key as phone_key',
         'phone_field.key as phone_collectable',
     ]);
     return query;
@@ -60,7 +60,7 @@ function questionRows(db, productId) {
     const query = db(exports.QUESTIONS_TABLE)
         .join(exports.BINDINGS_TABLE, `${exports.BINDINGS_TABLE}.id`, `${exports.QUESTIONS_TABLE}.binding_id`)
         .leftJoin({ question_field: exports.FIELDS_TABLE }, function () {
-        this.on('question_field.key', `${exports.BINDINGS_TABLE}.custom_field_key`).andOn(db.raw('question_field.status = ?', [ACTIVE]));
+        this.on('question_field.key', `${exports.BINDINGS_TABLE}.metafield_key`).andOn(db.raw('question_field.status = ?', [ACTIVE]));
     })
         .orderBy(`${exports.BINDINGS_TABLE}.product_id`, 'asc')
         .orderBy(`${exports.QUESTIONS_TABLE}.sort_order`, 'asc')

package/core/server/services/tier-checkout-config/serializers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toCheckoutConfigResponse = exports.CheckoutConfigInput = void 0;
+exports.requirementsByTier = requirementsByTier;
 const zod_1 = require("zod");
 const checkout_1 = require("@tryghost/checkout");
 const models_1 = require("./models");
@@ -126,3 +127,59 @@ exports.toCheckoutConfigResponse = zod_1.z
     })),
 }))
     .pipe(CheckoutConfigResponse);
+/**
+ * What a tier asks a member for, as the tier payload carries it.
+ *
+ * The same rows as the publisher's resource above, minus everything about where a value
+ * lands. A member supplies a delivery address rather than a value for a named field, and
+ * which field holds it is the publisher's business; naming it here would invite a client
+ * to write there directly. The tax number goes too, because the processor keeps one
+ * against the customer it invoices and Ghost never stores it. So do the checkout
+ * questions, which a tier change does not draw.
+ *
+ * Not named for the collection, deliberately: a collection in this domain is a collected
+ * thing together with the field it lands in, and that second half is exactly the part
+ * this drops.
+ */
+const TierRequirements = zod_1.z.object({
+    /**
+     * A block appears only when the tier asks for that thing, and says so as well, the same
+     * way the publisher's resource does. Presence and the flag agree, so a client may read
+     * whichever it finds clearer.
+     *
+     * Neither says whether a thing may be skipped, because nothing here may be: everything
+     * a tier requires is required. Collection a member could decline is the change that
+     * would need a field of its own rather than a new reading of these two.
+     */
+    shipping: zod_1.z
+        .object({
+        collect: zod_1.z.literal(true),
+        /** Absent means everywhere the processor ships, the same as for a publisher. */
+        allowed_countries: zod_1.z.array(zod_1.z.string()).optional(),
+    })
+        .optional(),
+    phone: zod_1.z.object({ collect: zod_1.z.literal(true) }).optional(),
+});
+/**
+ * Keyed by tier, because the payload this joins onto is a list of tiers and a lookup is
+ * the only thing it needs. Tiers a publisher has never set up are absent, and a tier that
+ * collects only a tax number resolves to nothing asked.
+ */
+function requirementsByTier(configs) {
+    return new Map(configs.map((config) => [
+        config.tierId,
+        TierRequirements.parse({
+            ...(config.shipping
+                ? {
+                    shipping: {
+                        collect: true,
+                        ...(config.shipping.allowedCountries
+                            ? { allowed_countries: config.shipping.allowedCountries }
+                            : {}),
+                    },
+                }
+                : {}),
+            ...(config.phone ? { phone: { collect: true } } : {}),
+        }),
+    ]));
+}

package/core/server/services/tier-checkout-config/service.js

@@ -7,7 +7,7 @@ exports.TierCheckoutConfigService = void 0;
 const bson_objectid_1 = __importDefault(require("bson-objectid"));
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const zod_1 = require("zod");
-const schema_1 = require("../members-custom-fields/schema");
+const schema_1 = require("../members-metafields/schema");
 const checkout_1 = require("@tryghost/checkout");
 const codec_1 = require("./codec");
 const queries_1 = require("./queries");

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

@@ -32,14 +32,14 @@ class TiersServiceWrapper {
     });
 
     // What a tier's checkout asks, kept beside the tier rather than inside it: these
-    // rows are read live on every request, because deleting a custom field cascades a
+    // rows are read live on every request, because deleting a metafield cascades a
     // question away without the repository above ever seeing it, and a cached copy
     // would go on naming a field the site no longer has.
     //
-    // Boot builds the custom fields services before this one, so both collaborators
+    // Boot builds the metafields services before this one, so both collaborators
     // are ready by the time this runs.
     const { TierCheckoutConfigService } = require('../tier-checkout-config');
-    const { bindings, definitions } = require('../members-custom-fields');
+    const { bindings, definitions } = require('../members-metafields');
     this.checkout = new TierCheckoutConfigService({
       knex: models.Base.knex,
       // A binding is where a collected value lands, and the same rows are what a completed

package/core/server/services/url/router-filter.js

@@ -1,11 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EXPANSIONS = void 0;
 exports.routerTypeOf = routerTypeOf;
 exports.buildFilter = buildFilter;
 exports.filterMatches = filterMatches;
-const nql = require('@tryghost/nql');
-const logging = require('@tryghost/logging');
+const nql_1 = __importDefault(require("@tryghost/nql"));
+const logging_1 = __importDefault(require("@tryghost/logging"));
 // NQL evaluation for routes.yaml collection filters, kept in one place so the
 // forward lookup, ownership check and reverse lookup all decide membership the
 // same way.
@@ -17,7 +20,7 @@ exports.EXPANSIONS = [
     { key: 'primary_tag', replacement: 'primary_tag.slug' },
     { key: 'primary_author', replacement: 'primary_author.slug' },
 ];
-const PAGE_TRANSFORMER = nql.utils.mapKeyValues({
+const PAGE_TRANSFORMER = nql_1.default.utils.mapKeyValues({
     key: { from: 'page', to: 'type' },
     values: [
         { from: false, to: 'post' },
@@ -45,7 +48,7 @@ function buildFilter(filter) {
     if (!filter) {
         return null;
     }
-    return nql(filter, { expansions: exports.EXPANSIONS, transformer: PAGE_TRANSFORMER });
+    return (0, nql_1.default)(filter, { expansions: exports.EXPANSIONS, transformer: PAGE_TRANSFORMER });
 }
 // A null filter always matches; anything that throws is a non-match, not an
 // error.
@@ -65,12 +68,7 @@ function filterMatches(compiledFilter, record) {
     }
     catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        logging.warn('NQL match failed', message);
+        logging_1.default.warn('NQL match failed', message);
         return false;
     }
 }
-module.exports = { EXPANSIONS: exports.EXPANSIONS, routerTypeOf, buildFilter, filterMatches };
-module.exports.EXPANSIONS = exports.EXPANSIONS;
-module.exports.routerTypeOf = routerTypeOf;
-module.exports.buildFilter = buildFilter;
-module.exports.filterMatches = filterMatches;

package/core/server/services/users.js

@@ -1,5 +1,4 @@
 // @ts-check
-const path = require('path');
 const ObjectId = require('bson-objectid').default;
 
 /**
@@ -7,11 +6,6 @@ const ObjectId = require('bson-objectid').default;
  */
 const DomainEvents = require('@tryghost/domain-events/lib/DomainEvents');
 
-/**
- * @typedef {Object} IdbBackup
- * @prop {() => Promise<string>} backup
- */
-
 /**
  * @typedef {Object} IModels
  * @prop {Object} Base
@@ -40,14 +34,12 @@ const DomainEvents = require('@tryghost/domain-events/lib/DomainEvents');
 class Users {
   /**
    * @param {Object} dependencies
-   * @param {IdbBackup} dependencies.dbBackup
    * @param {IModels} dependencies.models
    * @param {IAuth} dependencies.auth
    * @param {Object} dependencies.apiMail
    * @param {Object} dependencies.apiSettings
    */
-  constructor({ dbBackup, models, auth, apiMail, apiSettings }) {
-    this.dbBackup = dbBackup;
+  constructor({ models, auth, apiMail, apiSettings }) {
     this.models = models;
     this.auth = auth;
     this.apiMail = apiMail;
@@ -183,14 +175,6 @@ class Users {
    * @returns
    */
   async destroyUser(frameOptions) {
-    let filename = null;
-    const backupPath = await this.dbBackup.backup();
-
-    if (backupPath) {
-      const parsedFileName = path.parse(backupPath);
-      filename = `${parsedFileName.name}${parsedFileName.ext}`;
-    }
-
     return this.models.Base.transaction(async (t) => {
       frameOptions.transacting = t;
 
@@ -234,8 +218,6 @@ class Users {
       }
 
       await this.models.User.destroy(Object.assign({ status: 'all' }, frameOptions));
-
-      return filename;
     });
   }
 }