ghost 6.61.0 → 6.63.0

package/core/server/services/stripe/config.js

@@ -4,7 +4,7 @@ const labs = require('../../../shared/labs');
 
 const messages = {
   remoteWebhooksInDevelopment:
-    'Cannot use remote webhooks in development. See https://ghost.org/docs/webhooks/#stripe-webhooks for developing with Stripe.',
+    'Cannot use remote webhooks in development. See https://docs.ghost.org/webhooks/#stripe-webhooks for developing with Stripe.',
 };
 
 // @TODO Refactor to a class w/ constructor
@@ -62,16 +62,19 @@ module.exports = {
     }
 
     const env = config.get('env');
-    let webhookSecret = process.env.WEBHOOK_SECRET;
+    const remoteWebhooks = env !== 'production' && config.get('stripeRemoteWebhooks') === true;
+    let webhookSecret = remoteWebhooks ? undefined : process.env.WEBHOOK_SECRET;
 
-    if (env !== 'production') {
-      if (!webhookSecret) {
-        webhookSecret = 'DEFAULT_WEBHOOK_SECRET';
-        logging.warn(tpl(messages.remoteWebhooksInDevelopment));
-      }
+    if (env !== 'production' && !remoteWebhooks && !webhookSecret) {
+      webhookSecret = 'DEFAULT_WEBHOOK_SECRET';
+      logging.warn(tpl(messages.remoteWebhooksInDevelopment));
     }
 
-    const webhookHandlerUrl = new URL('members/webhooks/stripe/', urlUtils.getSiteUrl());
+    // Development can tunnel the webhook URL alone while the site stays on localhost.
+    const webhookHandlerUrl = new URL(
+      config.get('stripeWebhookUrl') || 'members/webhooks/stripe/',
+      urlUtils.getSiteUrl(),
+    );
     const webhookCustomerIgnoreList = parseIgnoreCustomerList(
       config.get('stripeWebhookCustomerIgnoreList'),
     );
@@ -88,6 +91,9 @@ module.exports = {
       },
       webhookSecret: webhookSecret,
       webhookHandlerUrl: webhookHandlerUrl.href,
+      // A development registration points at a tunnel that closes with the process,
+      // so it is removed on shutdown rather than kept for the next boot.
+      ephemeralWebhook: remoteWebhooks,
       webhookCustomerIgnoreList,
       siteUrl,
     };

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

@@ -14,6 +14,12 @@ const giftService = require('../gifts');
 const staffService = require('../staff');
 const labs = require('../../../shared/labs');
 const settingsCache = require('../../../shared/settings-cache');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+  remoteWebhooksWithoutStripe:
+    'stripeRemoteWebhooks is set but Stripe is not connected, so no webhook endpoint was registered. Connect Stripe in Ghost Admin under Settings, then restart.',
+};
 
 async function configureApi() {
   const cfg = getConfig({ settingsHelpers, config, urlUtils });
@@ -84,7 +90,10 @@ function stripeSettingsChanged(model) {
 
 module.exports.init = async function init() {
   try {
-    await configureApi();
+    const configured = await configureApi();
+    if (!configured && config.get('stripeRemoteWebhooks') === true) {
+      logging.warn(tpl(messages.remoteWebhooksWithoutStripe));
+    }
   } catch (err) {
     logging.error(err);
   }

package/core/server/services/stripe/services/checkout/completed-session.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectedByPort = exports.CompletedSession = void 0;
 const zod_1 = require("zod");
-const field_ports_1 = require("./field-ports");
+const checkout_1 = require("@tryghost/checkout");
 /**
  * What Ghost reads off a completed session.
  *
@@ -63,6 +63,6 @@ exports.collectedByPort = exports.CompletedSession.transform((session) => {
     const answers = (session.custom_fields ?? [])
         .filter((field) => Boolean(field?.key && field.text?.value))
         .map((field) => ({ port: field.key, value: field.text.value }));
-    const ports = field_ports_1.STRIPE_PORTS.map((port) => ({ port, value: PORT_VALUES[port](session) })).filter((entry) => entry.value !== undefined);
+    const ports = checkout_1.STRIPE_PORTS.map((port) => ({ port, value: PORT_VALUES[port](session) })).filter((entry) => entry.value !== undefined);
     return [...answers, ...ports];
 });

package/core/server/services/stripe/services/checkout/session-options.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stripeCheckoutCollectionOptions = stripeCheckoutCollectionOptions;
 const logging_1 = __importDefault(require("@tryghost/logging"));
-const field_ports_1 = require("./field-ports");
+const checkout_1 = require("@tryghost/checkout");
 /** Keyed on the eligible types, so this and the configure-time rule cannot drift apart. */
 const QUESTION_TYPES = {
     short_text: 'text',
 };
 function askable(question) {
-    if (!(0, field_ports_1.isCheckoutEligible)(question.type)) {
+    if (!(0, checkout_1.isCheckoutEligible)(question.type)) {
         logging_1.default.warn({
             event: { name: 'stripe.checkout.question_skipped' },
             customFieldKey: question.key,
@@ -20,7 +20,7 @@ function askable(question) {
         }, 'Skipping a Stripe checkout question');
         return false;
     }
-    if (question.prompt.length > field_ports_1.MAX_CHECKOUT_LABEL_LENGTH) {
+    if (question.prompt.length > checkout_1.MAX_CHECKOUT_LABEL_LENGTH) {
         logging_1.default.warn({
             event: { name: 'stripe.checkout.question_skipped' },
             customFieldKey: question.key,
@@ -43,7 +43,7 @@ function stripeCheckoutCollectionOptions(checkout) {
         return options;
     }
     const eligible = checkout.customFields.filter(askable);
-    const questions = eligible.slice(0, field_ports_1.MAX_CHECKOUT_CUSTOM_FIELDS);
+    const questions = eligible.slice(0, checkout_1.MAX_CHECKOUT_CUSTOM_FIELDS);
     if (questions.length < eligible.length) {
         logging_1.default.warn({
             event: { name: 'stripe.checkout.questions_trimmed' },
@@ -64,15 +64,20 @@ function stripeCheckoutCollectionOptions(checkout) {
         }));
     }
     if (checkout.shipping) {
-        // The country list is what makes this reach Stripe at all. An empty
-        // `shipping_address_collection` form-encodes to nothing, so a request built that
-        // way carries no parameter and Stripe accepts it precisely because it was never
-        // asked to collect anything — which reads as success and collects no addresses.
+        // Ghost stores "everywhere" as no list, because the set of countries moves and a
+        // stored copy of it would quietly become a restriction. Stripe has no such sentinel:
+        // `allowed_countries` is the only key `shipping_address_collection` has, so a request
+        // that omits it carries no parameter at all, and Stripe accepts it precisely because
+        // it was never asked to collect anything — a session that succeeds and collects no
+        // address. So everywhere is expanded to every country here, at the one point that
+        // builds the request.
         //
-        // Defended again here rather than trusted from the settings screen: this is the
-        // checkout path, and a malformed configuration must cost the collection rather than
-        // throw inside a session build.
-        if (checkout.shipping.allowedCountries.length === 0) {
+        // An empty list is neither everywhere nor a real restriction, and would encode to the
+        // same absent parameter. Defended here rather than trusted from the settings screen:
+        // this is the checkout path, and a malformed configuration must cost the collection
+        // rather than throw inside a session build.
+        const allowedCountries = checkout.shipping.allowedCountries ?? [...checkout_1.STRIPE_ALLOWED_COUNTRIES];
+        if (allowedCountries.length === 0) {
             logging_1.default.warn({
                 event: { name: 'stripe.checkout.collection_skipped' },
                 port: 'shipping_address',
@@ -80,9 +85,7 @@ function stripeCheckoutCollectionOptions(checkout) {
             }, 'Skipping a Stripe checkout collection');
         }
         else {
-            options.shipping_address_collection = {
-                allowed_countries: checkout.shipping.allowedCountries,
-            };
+            options.shipping_address_collection = { allowed_countries: allowedCountries };
         }
     }
     // Unioned with whatever automatic tax asks for. Both want the same thing, so a site

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

@@ -1,7 +1,10 @@
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
-const { canWelcomeEmailReplaceSignupPaidEmail } = require('../../../lib/member-signup-contexts');
+const {
+  SIGNUP_CONTEXTS,
+  canWelcomeEmailReplaceSignupPaidEmail,
+} = require('../../../lib/member-signup-contexts');
 const { collectedByPort } = require('../checkout/completed-session');
 /** @typedef {import('../../../lib/member-signup-contexts').SignupContext} SignupContext */
 
@@ -335,6 +338,7 @@ module.exports = class CheckoutSessionEventService {
       email: customer.email,
     });
 
+    const memberPreexisted = Boolean(member);
     const checkoutType = _.get(session, 'metadata.checkoutType');
 
     if (!member) {
@@ -426,7 +430,7 @@ module.exports = class CheckoutSessionEventService {
     // After the subscription work, and deliberately not part of it: a value the member
     // gave us for free must never be able to fail the webhook. A throw here would make
     // Stripe retry the event and risk doing the payment work twice.
-    await this.writeCollectedFields(member.id, session);
+    await this.writeCollectedFields(member.id, session, { memberPreexisted });
 
     if (checkoutType !== 'upgrade') {
       const ghostSignupContext = /** @type {SignupContext | undefined} */ (
@@ -449,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
@@ -457,22 +461,39 @@ module.exports = class CheckoutSessionEventService {
    *
    * @param {string} memberId
    * @param {import('stripe').Stripe.Checkout.Session} session
+   * @param {object} options
+   * @param {boolean} options.memberPreexisted Whether the member's record existed before this event resolved it
    */
-  async writeCollectedFields(memberId, session) {
+  async writeCollectedFields(memberId, session, { memberPreexisted }) {
     // Stamped at create time. A session predating this feature carries none. Read
     // outside the try so a failure below can name the tier whose answers were lost.
     const tierId = session.metadata?.ghostTierId;
 
     try {
-      if (!this.deps.labsService.isSet('membersCustomFields')) {
+      if (!tierId) {
         return;
       }
 
-      if (!tierId) {
+      // A checkout can be started with nothing but an email address, and typing an
+      // email is not proof of owning it. Values may land on the member this event just
+      // created — that record holds nothing the buyer didn't supply — but a record
+      // that existed before the checkout belongs to whoever verified that email, so it
+      // is only written when the session was created by a signed-in member.
+      const wasAuthenticated =
+        session.metadata?.ghostSignupContext === SIGNUP_CONTEXTS.ALREADY_AUTHENTICATED;
+      if (memberPreexisted && !wasAuthenticated) {
+        logging.warn(
+          {
+            event: { name: 'stripe_checkout.collected_fields.write_skipped' },
+            memberId,
+            tierId,
+          },
+          'Skipped storing the fields an unverified checkout collected for an existing member',
+        );
         return;
       }
 
-      await this.deps.customFieldBindings.writeCollected(
+      await this.deps.metafieldBindings.writeCollected(
         memberId,
         tierId,
         collectedByPort.parse(session),

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

@@ -62,6 +62,8 @@ const MANAGED_PAYMENTS_DISABLED = { enabled: false };
  */
 
 module.exports = class StripeAPI {
+  static API_VERSION = STRIPE_API_VERSION;
+
   /**
    * StripeAPI
    * @param {object} deps

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
@@ -25,6 +25,7 @@ const customFields = require('../members-custom-fields');
  * @prop {boolean} testEnv Whether this is a test environment
  * @prop {string} webhookSecret The Stripe webhook secret
  * @prop {string} webhookHandlerUrl The URL to handle Stripe webhooks
+ * @prop {boolean} [ephemeralWebhook] Whether the webhook endpoint is deleted on shutdown
  * @prop {string[]} webhookCustomerIgnoreList List of customer IDs for customer.subscription.updated webhook bypass
  * @prop {string} siteUrl The site URL for billing portal return URL
  */
@@ -134,11 +135,10 @@ module.exports = class StripeService {
         memberWelcomeEmailService.init();
         return memberWelcomeEmailService.api.isMemberWelcomeEmailActive('paid');
       },
-      labsService: labs,
-      // 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;
       },
     });
 
@@ -162,6 +162,8 @@ module.exports = class StripeService {
     this.migrations = migrations;
     this.webhookController = webhookController;
     this.billingPortalManager = billingPortalManager;
+    /** @private */
+    this.ephemeralWebhook = false;
   }
 
   async connect() {
@@ -213,23 +215,31 @@ module.exports = class StripeService {
       webhookSecret: config.webhookSecret,
       webhookHandlerUrl: config.webhookHandlerUrl,
     });
+    this.ephemeralWebhook = config.ephemeralWebhook === true;
 
     this.billingPortalManager.configure({
       siteUrl: config.siteUrl,
     });
 
-    // webhookManager.start() already self-guards: configure() above puts it in
-    // 'local' mode whenever a webhookSecret is set, which is always true outside
-    // production (config.js defaults it to DEFAULT_WEBHOOK_SECRET), so start()
-    // returns immediately without touching Stripe. Only billingPortalManager
-    // needs an explicit test-env skip — in the test env there is no real Stripe
-    // to register against, and the mock returns 500 for billing_portal/
-    // configurations, so this network-registration call only error-logs on
-    // every boot. Tests never need a registered portal configuration. Skip it
-    // under test; prod and dev register exactly as before.
+    // webhookManager.start() registers a webhook URL with Stripe only when no webhook
+    // secret was supplied. Outside production config.js supplies a placeholder secret
+    // unless stripeRemoteWebhooks is set, so start() normally returns without touching
+    // Stripe. billingPortalManager has no such guard: in the test environment the mock
+    // Stripe answers its registration call with a 500 on every boot, and tests never
+    // need a registered portal, so skip it under test only.
     await this.webhookManager.start();
     if (!config.testEnv) {
       await this.billingPortalManager.start();
     }
   }
+
+  /**
+   * Removes the webhook registration from Stripe, but only when it was marked ephemeral.
+   * A production registration is kept and reused on the next boot.
+   */
+  async shutdown() {
+    if (this.ephemeralWebhook) {
+      await this.webhookManager.stop();
+    }
+  }
 };

package/core/server/services/stripe/webhook-controller.js

@@ -1,4 +1,5 @@
 const logging = require('@tryghost/logging');
+const StripeAPI = require('./stripe-api');
 
 module.exports = class WebhookController {
   /**
@@ -89,6 +90,15 @@ module.exports = class WebhookController {
       return res.end();
     }
 
+    // Stripe shapes each event for the API version of the URL it was sent to. A different
+    // version means this event did not come through the URL Ghost registered, and fields
+    // may not be where Ghost reads them.
+    if (event.api_version !== StripeAPI.API_VERSION) {
+      logging.error(
+        `Webhook ${event.type} was rendered at Stripe API version ${event.api_version}, Ghost expects ${StripeAPI.API_VERSION}`,
+      );
+    }
+
     const customerId = this.getEventCustomerId(event);
     if (this.shouldIgnoreEvent(event, customerId)) {
       logging.info(

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

@@ -2,25 +2,29 @@
 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");
 const SEPARATOR = ',';
 exports.optionsCodec = zod_1.z.codec(schema_1.DbCheckoutOptions, models_1.CheckoutOptions, {
+    // An absent list is everywhere, so the column is null rather than a copy of every
+    // country. An empty list is neither, and stays representable on purpose: nothing writes
+    // one, and the session builder refuses to collect against it rather than asking the
+    // processor for an address form it would never render.
     decode: (columns) => ({
-        shippingAllowedCountries: splitList(columns.shipping_allowed_countries),
+        shippingAllowedCountries: columns.shipping_allowed_countries === null
+            ? null
+            : splitList(columns.shipping_allowed_countries),
         taxNumber: columns.tax_number_collect,
     }),
     encode: (options) => ({
-        shipping_allowed_countries: options.shippingAllowedCountries.length
-            ? joinList(options.shippingAllowedCountries)
-            : null,
+        shipping_allowed_countries: options.shippingAllowedCountries === null ? null : joinList(options.shippingAllowedCountries),
         tax_number_collect: options.taxNumber,
     }),
 });
 function splitList(stored) {
-    return stored ? stored.split(SEPARATOR).filter(Boolean) : [];
+    return stored.split(SEPARATOR).filter(Boolean);
 }
 function joinList(values) {
     return [...new Set(values)].join(SEPARATOR);
@@ -63,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(),
@@ -13,8 +13,14 @@ exports.CheckoutQuestion = zod_1.z.object({
  * under one parameter, but a publisher keeps a name and an address in different fields.
  */
 exports.ShippingCollection = zod_1.z.object({
-    /** ISO 3166-1 alpha-2. A processor will not render an address form without them. */
-    allowedCountries: zod_1.z.array(zod_1.z.string()),
+    /**
+     * ISO 3166-1 alpha-2, or null for everywhere the processor ships.
+     *
+     * Null rather than a stored enumeration of every country, because that list moves: the
+     * day the processor adds one, a saved "everywhere" would silently be a restriction that
+     * excludes it, and nothing would say so.
+     */
+    allowedCountries: zod_1.z.array(zod_1.z.string()).nullable(),
     nameCustomFieldKey: zod_1.z.string(),
     addressCustomFieldKey: zod_1.z.string(),
 });
@@ -42,12 +48,12 @@ const emptyCheckoutConfig = (tierId) => ({
 });
 exports.emptyCheckoutConfig = emptyCheckoutConfig;
 exports.CheckoutOptions = zod_1.z.object({
-    shippingAllowedCountries: zod_1.z.array(zod_1.z.string()),
+    shippingAllowedCountries: zod_1.z.array(zod_1.z.string()).nullable(),
     taxNumber: zod_1.z.boolean(),
 });
 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 field_ports_1 = require("../stripe/services/checkout/field-ports");
+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,26 +18,26 @@ 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')
-        .leftJoin({ name_binding: exports.BINDINGS_TABLE }, bindTo('name_binding', field_ports_1.STRIPE_PORT.shippingName))
+        .leftJoin({ name_binding: exports.BINDINGS_TABLE }, bindTo('name_binding', checkout_1.STRIPE_PORT.shippingName))
         .leftJoin({ name_field: exports.FIELDS_TABLE }, landsIn('name_field', 'name_binding'))
-        .leftJoin({ shipping_binding: exports.BINDINGS_TABLE }, bindTo('shipping_binding', field_ports_1.STRIPE_PORT.shippingAddress))
+        .leftJoin({ shipping_binding: exports.BINDINGS_TABLE }, bindTo('shipping_binding', checkout_1.STRIPE_PORT.shippingAddress))
         .leftJoin({ shipping_field: exports.FIELDS_TABLE }, landsIn('shipping_field', 'shipping_binding'))
-        .leftJoin({ phone_binding: exports.BINDINGS_TABLE }, bindTo('phone_binding', field_ports_1.STRIPE_PORT.phone))
+        .leftJoin({ phone_binding: exports.BINDINGS_TABLE }, bindTo('phone_binding', checkout_1.STRIPE_PORT.phone))
         .leftJoin({ phone_field: exports.FIELDS_TABLE }, landsIn('phone_field', 'phone_binding'))
         .orderBy('products.id', 'asc')
         .select([
         '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')