ghost 6.24.0 → 6.25.1

package/core/server/data/seeders/importers/members-click-events-importer.js

@@ -50,7 +50,7 @@ class MembersClickEventsImporter extends TableImporter {
         }
         this.amount -= 1;
 
-        const openedAt = new Date(this.model.opened_at);
+        const openedAt = dateToDatabaseString.parse(this.model.opened_at);
         const laterOn = new Date(openedAt.getTime() + 1000 * 60 * 15);
         const clickTime = faker.date.between(openedAt.getTime(), laterOn.getTime()); //added getTime here because it threw random errors
 

package/core/server/data/seeders/importers/members-created-events-importer.js

@@ -47,7 +47,8 @@ class MembersCreatedEventsImporter extends TableImporter {
         };
 
         if (source === 'member' && luck(30)) {
-            const post = this.posts.find(p => p.visibility === 'public' && new Date(p.published_at) < new Date(this.model.created_at));
+            const memberCreatedAt = dateToDatabaseString.parse(this.model.created_at);
+            const post = this.posts.find(p => p.visibility === 'public' && dateToDatabaseString.parse(p.published_at) < memberCreatedAt);
             if (post) {
                 attribution = {
                     attribution_id: post.id,

package/core/server/data/seeders/importers/members-feedback-importer.js

@@ -1,5 +1,4 @@
 const TableImporter = require('./table-importer');
-const {faker} = require('@faker-js/faker');
 const {luck} = require('../utils/random');
 const dateToDatabaseString = require('../utils/database-date');
 
@@ -25,10 +24,10 @@ class MembersFeedbackImporter extends TableImporter {
             return null;
         }
 
-        const openedAt = new Date(this.model.opened_at);
-        const laterOn = new Date(this.model.opened_at);
+        const openedAt = dateToDatabaseString.parse(this.model.opened_at);
+        const laterOn = dateToDatabaseString.parse(this.model.opened_at);
         laterOn.setMinutes(laterOn.getMinutes() + 60);
-        const feedbackTime = faker.date.between(openedAt, laterOn);
+        const feedbackTime = dateToDatabaseString.randomBetween(openedAt, laterOn);
 
         const postId = this.emails.find(email => email.id === this.model.email_id).post_id;
         return {

package/core/server/data/seeders/importers/members-login-events-importer.js

@@ -35,9 +35,10 @@ class MembersLoginEventsImporter extends TableImporter {
 
     setReferencedModel(model) {
         this.model = model;
+        const memberCreatedAt = dateToDatabaseString.parse(model.created_at);
 
         const endDate = new Date();
-        const daysBetween = Math.ceil((endDate.valueOf() - new Date(model.created_at).valueOf()) / (1000 * 60 * 60 * 24));
+        const daysBetween = Math.ceil((endDate.valueOf() - memberCreatedAt.valueOf()) / (1000 * 60 * 60 * 24));
 
         // Assuming most people either subscribe and lose interest, or maintain steady readership
         const shape = luck(40) ? 'ease-out' : 'flat';
@@ -47,7 +48,7 @@ class MembersLoginEventsImporter extends TableImporter {
             // Steady readers login more, readers who lose interest read less overall.
             // ceil because members will all have logged in at least once
             total: Math.min(5, shape === 'flat' ? Math.ceil(daysBetween / 3) : Math.ceil(daysBetween / 7)),
-            startTime: new Date(model.created_at),
+            startTime: memberCreatedAt,
             endTime: endDate
         });
     }

package/core/server/data/seeders/importers/members-status-events-importer.js

@@ -1,5 +1,4 @@
 const TableImporter = require('./table-importer');
-const {faker} = require('@faker-js/faker');
 const dateToDatabaseString = require('../utils/database-date');
 
 class MembersStatusEventsImporter extends TableImporter {
@@ -41,7 +40,7 @@ class MembersStatusEventsImporter extends TableImporter {
                 member_id: model.id,
                 from_status: 'free',
                 to_status: model.status,
-                created_at: dateToDatabaseString(faker.date.between(new Date(model.created_at), new Date()))
+                created_at: dateToDatabaseString(dateToDatabaseString.randomBetween(model.created_at, new Date()))
             });
         }
     }

package/core/server/data/seeders/importers/members-stripe-customers-importer.js

@@ -1,5 +1,6 @@
 const {faker} = require('@faker-js/faker');
 const TableImporter = require('./table-importer');
+const dateToDatabaseString = require('../utils/database-date');
 
 class MembersStripeCustomersImporter extends TableImporter {
     static table = 'members_stripe_customers';
@@ -35,7 +36,7 @@ class MembersStripeCustomersImporter extends TableImporter {
             // Only 30% of free members should have a stripe customer = have had a subscription in the past or tried to subscribe
             // The number should increase the older the member is
 
-            const daysSinceMemberCreated = Math.floor((new Date() - new Date(this.model.created_at)) / (1000 * 60 * 60 * 24));
+            const daysSinceMemberCreated = Math.floor((new Date() - dateToDatabaseString.parse(this.model.created_at)) / (1000 * 60 * 60 * 24));
             const shouldHaveStripeCustomer = faker.datatype.number({min: 0, max: 100}) < Math.max(Math.min(daysSinceMemberCreated / 60, 15), 2);
 
             if (!shouldHaveStripeCustomer) {

package/core/server/data/seeders/importers/members-stripe-customers-subscriptions-importer.js

@@ -30,6 +30,7 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
             this.members = await this.transaction.select('id', 'status', 'created_at').from('members').whereIn('id', membersStripeCustomers.map(m => m.member_id));
 
             if (this.members.length === 0) {
+                offset += limit;
                 continue;
             }
 
@@ -95,6 +96,7 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
                 (isMonthly ? price.interval === 'month' : price.interval === 'year');
         });
         const mrr = createValid ? (isMonthly ? stripePrice.amount : Math.floor(stripePrice.amount / 12)) : 0;
+        const memberCreatedAt = dateToDatabaseString.parse(member.created_at);
 
         const referenceEndDate = this.lastSubscriptionStart ?? new Date();
 
@@ -106,7 +108,7 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
             }
         }
 
-        if (referenceEndDate < member.created_at) {
+        if (referenceEndDate < memberCreatedAt) {
             // Not possible to create an invalid subscription here
             return;
         }
@@ -114,7 +116,7 @@ class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
         const [startDate] = generateEvents({
             total: 1,
             trend: 'negative',
-            startTime: new Date(member.created_at),
+            startTime: memberCreatedAt,
             endTime: referenceEndDate,
             shape: 'ease-out'
         });

package/core/server/data/seeders/importers/members-subscribe-events-importer.js

@@ -1,5 +1,4 @@
 const TableImporter = require('./table-importer');
-const {faker} = require('@faker-js/faker');
 const {luck} = require('../utils/random');
 const dateToDatabaseString = require('../utils/database-date');
 
@@ -52,7 +51,7 @@ class MembersSubscribeEventsImporter extends TableImporter {
             return null;
         }
 
-        const createdAt = dateToDatabaseString(faker.date.between(new Date(this.model.created_at), new Date()));
+        const createdAt = dateToDatabaseString(dateToDatabaseString.randomBetween(this.model.created_at, new Date()));
         const newsletterId = this.newsletters[count % this.newsletters.length].id;
 
         return {

package/core/server/data/seeders/importers/members-subscription-created-events-importer.js

@@ -1,6 +1,7 @@
 const TableImporter = require('./table-importer');
 const {faker} = require('@faker-js/faker');
 const {luck} = require('../utils/random');
+const dateToDatabaseString = require('../utils/database-date');
 
 class MembersSubscriptionCreatedEventsImporter extends TableImporter {
     static table = 'members_subscription_created_events';
@@ -48,7 +49,8 @@ class MembersSubscriptionCreatedEventsImporter extends TableImporter {
         };
 
         if (luck(30)) {
-            const post = this.posts.find(p => p.visibility === 'public' && new Date(p.published_at) < new Date(this.model.created_at));
+            const createdAt = dateToDatabaseString.parse(this.model.created_at);
+            const post = this.posts.find(p => p.visibility === 'public' && dateToDatabaseString.parse(p.published_at) < createdAt);
             if (post) {
                 attribution = {
                     attribution_id: post.id,

package/core/server/data/seeders/importers/offer-redemptions-importer.js

@@ -53,7 +53,7 @@ class OfferRedemptionsImporter extends TableImporter {
             this.subscriptionPool.push({
                 memberId,
                 subscriptionId: subscription.id,
-                subscriptionCreatedAt: new Date(subscription.created_at),
+                subscriptionCreatedAt: dateToDatabaseString.parse(subscription.created_at),
                 redemptionEndAt: this.getRedemptionEndDate(subscription.current_period_end),
                 availableOffers: [...matchingOffers],
                 lastRedeemedAt: null
@@ -78,7 +78,7 @@ class OfferRedemptionsImporter extends TableImporter {
 
     getRedemptionEndDate(currentPeriodEnd) {
         const now = new Date();
-        const endDate = currentPeriodEnd ? new Date(currentPeriodEnd) : now;
+        const endDate = currentPeriodEnd ? dateToDatabaseString.parse(currentPeriodEnd) : now;
 
         return endDate > now ? now : endDate;
     }
@@ -86,7 +86,7 @@ class OfferRedemptionsImporter extends TableImporter {
     getCreatedAt(subscriptionState, offer) {
         const candidateEarliest = new Date(Math.max(
             subscriptionState.subscriptionCreatedAt.valueOf(),
-            new Date(offer.created_at).valueOf(),
+            dateToDatabaseString.parse(offer.created_at).valueOf(),
             subscriptionState.lastRedeemedAt ? subscriptionState.lastRedeemedAt.valueOf() + 1000 : 0
         ));
         const earliest = new Date(Math.min(

package/core/server/data/seeders/utils/database-date.js

@@ -1,7 +1,32 @@
-module.exports = function dateToDatabaseString(date) {
+const {faker} = require('@faker-js/faker');
+
+const databaseDatePattern = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?:\.\d+)?$/;
+
+function dateToDatabaseString(date) {
     if (typeof date === 'string') {
         // SQLite fix when reusing other dates from the db
         return date;
     }
     return date.toISOString().replace('Z','').replace('T', ' ');
+}
+
+dateToDatabaseString.parse = function parseDatabaseDate(date) {
+    if (date instanceof Date) {
+        return new Date(date);
+    }
+
+    if (typeof date === 'string' && databaseDatePattern.test(date)) {
+        return new Date(date.replace(' ', 'T') + 'Z');
+    }
+
+    return new Date(date);
+};
+
+dateToDatabaseString.randomBetween = function randomBetween(start, end) {
+    const earliest = dateToDatabaseString.parse(start);
+    const latest = dateToDatabaseString.parse(end);
+
+    return latest > earliest ? faker.date.between(earliest, latest) : earliest;
 };
+
+module.exports = dateToDatabaseString;

package/core/server/models/automated-email.js

@@ -1,10 +1,12 @@
 const ghostBookshelf = require('./base');
+const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const urlUtils = require('../../shared/url-utils');
 const lexicalLib = require('../lib/lexical');
 const {MEMBER_WELCOME_EMAIL_SLUGS} = require('../services/member-welcome-emails/constants');
 
 const MEMBER_WELCOME_EMAIL_SLUG_SET = new Set(Object.values(MEMBER_WELCOME_EMAIL_SLUGS));
+const DEFAULT_EMAIL_DESIGN_SETTING_SLUG = 'default-automated-email';
 
 const AutomatedEmail = ghostBookshelf.Model.extend({
     tableName: 'automated_emails',
@@ -15,6 +17,13 @@ const AutomatedEmail = ghostBookshelf.Model.extend({
         };
     },
 
+    /**
+     * @returns {import('bookshelf').Model}
+     */
+    emailDesignSetting() {
+        return this.belongsTo('EmailDesignSetting', 'email_design_setting_id', 'id');
+    },
+
     parse() {
         const attrs = ghostBookshelf.Model.prototype.parse.apply(this, arguments);
 
@@ -26,6 +35,24 @@ const AutomatedEmail = ghostBookshelf.Model.extend({
         return attrs;
     },
 
+    async onCreating(model, attrs, options) {
+        if (!model.get('email_design_setting_id')) {
+            const emailDesignSetting = await ghostBookshelf.model('EmailDesignSetting').findOne({
+                slug: DEFAULT_EMAIL_DESIGN_SETTING_SLUG
+            }, options);
+
+            if (!emailDesignSetting) {
+                throw new errors.InternalServerError({
+                    message: 'Missing default email design setting for automated emails'
+                });
+            }
+
+            model.set('email_design_setting_id', emailDesignSetting.get('id'));
+        }
+
+        return ghostBookshelf.Model.prototype.onCreating.call(this, model, attrs, options);
+    },
+
     // Alternative to Bookshelf's .format() that is only called when writing to db
     formatOnWrite(attrs) {
         // Ensure lexical URLs are stored as transform-ready with __GHOST_URL__ representing config.url

package/core/server/models/email-design-setting.js

@@ -0,0 +1,27 @@
+const ghostBookshelf = require('./base');
+
+const EmailDesignSetting = ghostBookshelf.Model.extend({
+    tableName: 'email_design_settings',
+
+    defaults() {
+        return {
+            background_color: 'light',
+            header_background_color: 'transparent',
+            show_header_title: true,
+            button_color: 'accent',
+            button_corners: 'rounded',
+            button_style: 'fill',
+            link_color: 'accent',
+            link_style: 'underline',
+            body_font_category: 'sans_serif',
+            title_font_category: 'sans_serif',
+            title_font_weight: 'bold',
+            image_corners: 'square',
+            show_badge: true
+        };
+    }
+});
+
+module.exports = {
+    EmailDesignSetting: ghostBookshelf.model('EmailDesignSetting', EmailDesignSetting)
+};

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

@@ -45,26 +45,6 @@ const membersStats = new MembersStats({
 let membersApi;
 let verificationTrigger;
 
-const sendVerificationEmail = async ({subject, message, amountTriggered}) => {
-    const escalationAddress = config.get('hostSettings:emailVerification:escalationAddress');
-    const replyTo = config.get('user_email');
-    const fromAddress = settingsHelpers.getDefaultEmailAddress();
-
-    if (escalationAddress) {
-        await ghostMailer.send({
-            subject,
-            html: tpl(message, {
-                amountTriggered: amountTriggered,
-                siteUrl: urlUtils.getSiteUrl()
-            }),
-            forceTextContent: true,
-            from: fromAddress,
-            replyTo,
-            to: escalationAddress
-        });
-    }
-};
-
 const initMembersCSVImporter = ({stripeAPIService}) => {
     return makeMembersCSVImporter({
         storagePath: config.getContentPath('data'),
@@ -113,8 +93,6 @@ const initVerificationTrigger = () => {
         isVerified: () => config.get('hostSettings:emailVerification:verified') === true,
         isVerificationRequired: () => settingsCache.get('email_verification_required') === true,
         setVerificationRequired: value => settingsCache.set('email_verification_required', {value}),
-        isVerificationFlowEnabled: () => labsService.isSet('verificationFlow'),
-        sendVerificationEmail,
         sendVerificationWebhook: verificationWebhookService.sendVerificationWebhook.bind(verificationWebhookService),
         membersStats,
         Settings: models.Settings,

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

@@ -17,8 +17,7 @@ const settingsCache = require('../../../shared/settings-cache');
 async function configureApi() {
     const cfg = getConfig({settingsHelpers, config, urlUtils});
     if (cfg) {
-        // @NOTE: to not start test mode when running playwright suite
-        cfg.testEnv = process.env.NODE_ENV.startsWith('test') && process.env.NODE_ENV !== 'testing-browser';
+        cfg.testEnv = process.env.NODE_ENV.startsWith('test');
         await module.exports.configure(cfg);
         return true;
     }

package/core/server/services/verification/verification-webhook-service.js

@@ -47,11 +47,11 @@ class VerificationWebhookService {
     async sendVerificationWebhook({ amountTriggered, threshold, method }) {
         const { webhookType, webhookUrl, webhookSecret, siteId } = this.#readWebhookConfig();
         if (typeof webhookUrl !== 'string' || webhookUrl.length === 0) {
-            this.#logging.warn('Verification webhook flow is enabled but webhookUrl is not configured.');
+            this.#logging.warn('Verification webhook is not configured because webhookUrl is missing.');
             return false;
         }
         if (typeof webhookType !== 'string' || webhookType.length === 0) {
-            this.#logging.warn('Verification webhook flow is enabled but webhookType is not configured.');
+            this.#logging.warn('Verification webhook is not configured because webhookType is missing.');
             return false;
         }
         const payload = {

package/core/server/services/verification/verification-webhook-service.ts

@@ -78,12 +78,12 @@ export class VerificationWebhookService {
         const {webhookType, webhookUrl, webhookSecret, siteId} = this.#readWebhookConfig();
 
         if (typeof webhookUrl !== 'string' || webhookUrl.length === 0) {
-            this.#logging.warn('Verification webhook flow is enabled but webhookUrl is not configured.');
+            this.#logging.warn('Verification webhook is not configured because webhookUrl is missing.');
             return false;
         }
 
         if (typeof webhookType !== 'string' || webhookType.length === 0) {
-            this.#logging.warn('Verification webhook flow is enabled but webhookType is not configured.');
+            this.#logging.warn('Verification webhook is not configured because webhookType is missing.');
             return false;
         }
 

package/core/server/services/verification-trigger.js

@@ -3,17 +3,7 @@ const DomainEvents = require('@tryghost/domain-events');
 const {MemberCreatedEvent} = require('../../shared/events');
 
 const messages = {
-    emailVerificationNeeded: `We're hard at work processing your import. To make sure you get great deliverability, we'll need to enable some extra features for your account. A member of our team will be in touch with you by email to review your account make sure everything is configured correctly so you're ready to go.`,
-    emailVerificationEmailSubject: `Email needs verification`,
-    emailVerificationEmailMessageImport: `Email verification needed for site: {siteUrl}, has imported: {amountTriggered} members in the last 30 days.`,
-    emailVerificationEmailMessageAdmin: `Email verification needed for site: {siteUrl} has added: {amountTriggered} members through the Admin client in the last 30 days.`,
-    emailVerificationEmailMessageAPI: `Email verification needed for site: {siteUrl} has added: {amountTriggered} members through the API in the last 30 days.`
-};
-
-const verificationMessageBySource = {
-    api: messages.emailVerificationEmailMessageAPI,
-    admin: messages.emailVerificationEmailMessageAdmin,
-    import: messages.emailVerificationEmailMessageImport
+    emailVerificationNeeded: `We're hard at work processing your import. To make sure you get great deliverability, we'll need to enable some extra features for your account. A member of our team will be in touch by email to review your account and make sure everything is configured correctly so you're ready to go.`
 };
 
 class VerificationTrigger {
@@ -26,8 +16,6 @@ class VerificationTrigger {
      * @param {() => boolean} deps.isVerified Check Ghost config to see if we are already verified
      * @param {() => boolean} deps.isVerificationRequired Check Ghost settings to see whether verification has been requested
      * @param {(value: boolean) => void} deps.setVerificationRequired Directly update the settings cache for email_verification_required
-     * @param {() => boolean} deps.isVerificationFlowEnabled Check whether webhook-based verification flow is enabled
-     * @param {(content: {subject: string, message: string, amountTriggered: number}) => Promise<void>} deps.sendVerificationEmail Sends an email to the escalation address to confirm that customer needs to be verified
      * @param {(content: {amountTriggered: number, threshold: number, method: string}) => Promise<boolean>} deps.sendVerificationWebhook Sends a webhook to the escalation service to confirm that customer needs to be verified
      * @param {any} deps.Settings Ghost Settings model
      * @param {any} deps.eventRepository For querying events
@@ -39,8 +27,6 @@ class VerificationTrigger {
         isVerified,
         isVerificationRequired,
         setVerificationRequired,
-        isVerificationFlowEnabled,
-        sendVerificationEmail,
         sendVerificationWebhook,
         Settings,
         eventRepository
@@ -51,9 +37,7 @@ class VerificationTrigger {
         this._isVerified = isVerified;
         this._isVerificationRequired = isVerificationRequired;
         this._setVerificationRequired = setVerificationRequired || (() => {});
-        this._isVerificationFlowEnabled = isVerificationFlowEnabled || (() => false);
-        this._sendVerificationEmail = sendVerificationEmail;
-        this._sendVerificationWebhook = sendVerificationWebhook;
+        this._sendVerificationWebhook = sendVerificationWebhook || (async () => false);
         this._Settings = Settings;
         this._eventRepository = eventRepository;
 
@@ -76,13 +60,9 @@ class VerificationTrigger {
         return this._getImportTriggerThreshold();
     }
 
-    _shouldUseWebhookFlow() {
-        return this._isVerificationFlowEnabled() && typeof this._sendVerificationWebhook === 'function';
-    }
-
     /**
      *
-     * @param {MemberCreatedEvent} event
+     * @param {InstanceType<typeof MemberCreatedEvent>} event
      */
     async _handleMemberCreatedEvent(event) {
         const source = event.data?.source;
@@ -94,25 +74,29 @@ class VerificationTrigger {
             sourceThreshold = this._adminTriggerThreshold;
         }
 
-        if (['api', 'admin'].includes(source) && isFinite(sourceThreshold)) {
+        if (['api', 'admin'].includes(source) && Number.isFinite(sourceThreshold)) {
             const createdAt = new Date();
             createdAt.setDate(createdAt.getDate() - 30);
             const events = await this._eventRepository.getSignupEvents({}, {
-                source: source,
+                source,
                 created_at: {
                     $gt: createdAt.toISOString().replace('T', ' ').substring(0, 19)
                 }
             });
 
+            // TODO: Fix off-by-one issue in event dispatch: https://linear.app/ghost/issue/BER-3507/off-by-one-errors-in-event-query-pagination
+            const addOneForCurrentEvent = events.meta.pagination.total < events.meta.pagination.limit && events.data.length !== events.meta.pagination.total;
+            const currentImport = events.meta.pagination.total + (addOneForCurrentEvent ? 1 : 0);
+
             const membersTotal = (await this._eventRepository.getSignupEvents({}, {
                 source: 'member'
             })).meta.pagination.total;
 
             const effectiveThreshold = Math.max(sourceThreshold, membersTotal);
 
-            if (events.meta.pagination.total > effectiveThreshold) {
+            if (currentImport > effectiveThreshold) {
                 await this._startVerificationProcess({
-                    amount: events.meta.pagination.total,
+                    amount: currentImport,
                     threshold: effectiveThreshold,
                     method: source,
                     throwOnTrigger: false,
@@ -148,24 +132,9 @@ class VerificationTrigger {
         };
     }
 
-    async _startLegacyEmailVerificationProcess({amount, triggerSource, throwOnTrigger}) {
-        // GA removal point: delete this method once webhook delivery fully replaces email escalation.
-        const verificationMessage = verificationMessageBySource[triggerSource] || messages.emailVerificationEmailMessageImport;
-
-        await this._markVerificationRequired();
-
-        await this._sendVerificationEmail({
-            message: verificationMessage,
-            subject: messages.emailVerificationEmailSubject,
-            amountTriggered: amount
-        });
-
-        return this._finishTrigger(throwOnTrigger);
-    }
-
     async getImportThreshold() {
         const volumeThreshold = this._importTriggerThreshold;
-        if (!isFinite(volumeThreshold)) {
+        if (!Number.isFinite(volumeThreshold)) {
             return volumeThreshold;
         }
 
@@ -186,7 +155,7 @@ class VerificationTrigger {
     }
 
     async testImportThreshold() {
-        if (!isFinite(this._importTriggerThreshold)) {
+        if (!Number.isFinite(this._importTriggerThreshold)) {
             // Infinite threshold, quick path
             return;
         }
@@ -210,16 +179,18 @@ class VerificationTrigger {
             }
         });
 
+        const currentImport = events.meta.pagination.total;
+
         const membersTotal = (await this._eventRepository.getSignupEvents({}, {
             source: 'member'
         })).meta.pagination.total;
 
         // Import threshold is either the total number of members (discounting any created by imports in
         // the last 30 days) or the threshold defined in config, whichever is greater.
-        const importThreshold = Math.max(membersTotal - events.meta.pagination.total, this._importTriggerThreshold);
-        if (isFinite(importThreshold) && events.meta.pagination.total > importThreshold) {
+        const importThreshold = Math.max(membersTotal - currentImport, this._importTriggerThreshold);
+        if (Number.isFinite(importThreshold) && currentImport > importThreshold) {
             await this._startVerificationProcess({
-                amount: events.meta.pagination.total,
+                amount: currentImport,
                 threshold: importThreshold,
                 method: 'import',
                 throwOnTrigger: false,
@@ -254,36 +225,30 @@ class VerificationTrigger {
             return {needsVerification: false};
         }
 
-        // Only trigger flag change and escalation notification the first time
+        // Only trigger verification once.
         if (this._isVerificationRequired()) {
             return {needsVerification: false};
         }
 
-        const triggerSource = method ?? source ?? 'import';
+        let webhookWasSent = false;
 
-        if (this._shouldUseWebhookFlow()) {
-            try {
-                const webhookWasSent = await this._sendVerificationWebhook({
-                    amountTriggered: amount,
-                    threshold: threshold ?? amount,
-                    method: triggerSource
-                });
+        try {
+            webhookWasSent = await this._sendVerificationWebhook({
+                amountTriggered: amount,
+                threshold: threshold ?? amount,
+                method: method ?? source ?? 'import'
+            });
+        } catch (error) {
+            // `sendVerificationWebhook` already logs delivery failures.
+            return {needsVerification: false};
+        }
 
-                if (webhookWasSent) {
-                    await this._markVerificationRequired();
-                    return this._finishTrigger(throwOnTrigger);
-                }
-            } catch (error) {
-                // `sendVerificationWebhook` already logs delivery failures.
-            }
+        if (!webhookWasSent) {
+            return {needsVerification: false};
         }
 
-        // Default email flow — used unless the webhook flow is enabled and succeeds.
-        return await this._startLegacyEmailVerificationProcess({
-            amount,
-            triggerSource,
-            throwOnTrigger
-        });
+        await this._markVerificationRequired();
+        return this._finishTrigger(throwOnTrigger);
     }
 }
 

package/core/server/services/webhooks/webhook-trigger.js

@@ -91,7 +91,7 @@ class WebhookTrigger {
                 error: `Request failed: ${err.code || 'unknown'}`
             });
 
-            logging.warn(`Request to ${webhook.get('target_url') || null} failed because of: ${err.code || ''}.`);
+            logging.error(`[WEBHOOK_DELIVERY_FAILURE] url=${webhook.get('target_url') || 'unknown'} status=${err.statusCode || 'none'} error_code=${err.code || 'unknown'} message=${err.message || ''}`, err);
         };
     }
 

package/core/shared/labs.js

@@ -47,11 +47,11 @@ const PRIVATE_FEATURES = [
     'emailUniqueid',
     'themeTranslation',
     'indexnow',
-    'verificationFlow',
     'membersForward',
     'welcomeEmailsDesignCustomization',
     'pictureImageFormats',
-    'smarterCounts'
+    'smarterCounts',
+    'giftSubscriptions'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];