ghost 4.47.3 → 5.0.0

package/core/server/services/mega/post-email-serializer.js

@@ -3,10 +3,11 @@ const template = require('./template');
 const settingsCache = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
 const moment = require('moment-timezone');
-const api = require('../../api');
+const api = require('../../api').endpoints;
+const apiShared = require('../../api').shared;
 const {URL} = require('url');
 const mobiledocLib = require('../../lib/mobiledoc');
-const htmlToText = require('html-to-text');
+const htmlToPlaintext = require('../../../shared/html-to-plaintext');
 const {isUnsplashImage, isLocalContentImage} = require('@tryghost/kg-default-cards/lib/utils');
 const {textColorForBackgroundColor, darkenToContrastThreshold} = require('@tryghost/color-utils');
 const logging = require('@tryghost/logging');
@@ -48,29 +49,16 @@ const getSite = () => {
     });
 };
 
-const htmlToPlaintext = (html) => {
-    // same options as used in Post model for generating plaintext but without `wordwrap: 80`
-    // to avoid replacement strings being split across lines and for mail clients to handle
-    // word wrapping based on user preferences
-    return htmlToText.fromString(html, {
-        wordwrap: false,
-        ignoreImage: true,
-        hideLinkHrefIfSameAsText: true,
-        preserveNewlines: true,
-        returnDomByDefault: true,
-        uppercaseHeadings: false
-    });
-};
-
 /**
  * createUnsubscribeUrl
  *
- * Takes a member uuid and returns the url that should be used to unsubscribe
+ * Takes a member and newsletter uuid. Returns the url that should be used to unsubscribe
  * In case of no member uuid, generates the preview unsubscribe url - `?preview=1`
  *
- * @param {string} uuid
+ * @param {string} uuid post uuid
+ * @param {string} newsletterUuid newsletter uuid
  */
-const createUnsubscribeUrl = (uuid) => {
+const createUnsubscribeUrl = (uuid, newsletterUuid) => {
     const siteUrl = urlUtils.getSiteUrl();
     const unsubscribeUrl = new URL(siteUrl);
     unsubscribeUrl.pathname = `${unsubscribeUrl.pathname}/unsubscribe/`.replace('//', '/');
@@ -79,21 +67,23 @@ const createUnsubscribeUrl = (uuid) => {
     } else {
         unsubscribeUrl.searchParams.set('preview', '1');
     }
+    if (newsletterUuid) {
+        unsubscribeUrl.searchParams.set('newsletter', newsletterUuid);
+    }
 
     return unsubscribeUrl.href;
 };
 
-// NOTE: serialization is needed to make sure we are using current API and do post transformations
-//       such as image URL transformation from relative to absolute
-const serializePostModel = async (model, apiVersion = 'v4') => {
+// NOTE: serialization is needed to make sure we do post transformations such as image URL transformation from relative to absolute
+const serializePostModel = async (model) => {
     // fetch mobiledoc rather than html and plaintext so we can render email-specific contents
     const frame = {options: {context: {user: true}, formats: 'mobiledoc'}};
     const docName = 'posts';
 
-    await api.shared
+    await apiShared
         .serializers
         .handle
-        .output(model, {docName: docName, method: 'read'}, api[apiVersion].serializers.output, frame);
+        .output(model, {docName: docName, method: 'read'}, api.serializers.output, frame);
 
     return frame.response[docName][0];
 };
@@ -222,8 +212,8 @@ const getTemplateSettings = async (newsletter) => {
     return templateSettings;
 };
 
-const serialize = async (postModel, newsletter, options = {isBrowserPreview: false, apiVersion: 'v4'}) => {
-    const post = await serializePostModel(postModel, options.apiVersion);
+const serialize = async (postModel, newsletter, options = {isBrowserPreview: false}) => {
+    const post = await serializePostModel(postModel);
 
     const timezone = settingsCache.get('timezone');
     const momentDate = post.published_at ? moment(post.published_at) : moment();
@@ -258,7 +248,7 @@ const serialize = async (postModel, newsletter, options = {isBrowserPreview: fal
     `).remove();
     post.html = _cheerio('body').html();
 
-    post.plaintext = htmlToPlaintext(post.html);
+    post.plaintext = htmlToPlaintext.email(post.html);
 
     // Outlook will render feature images at full-size breaking the layout.
     // Content images fix this by rendering max 600px images - do the same for feature image here
@@ -331,7 +321,7 @@ function renderEmailForSegment(email, memberSegment) {
     });
 
     result.html = formatHtmlForEmail($.html());
-    result.plaintext = htmlToPlaintext(result.html);
+    result.plaintext = htmlToPlaintext.email(result.html);
 
     return result;
 }

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

@@ -170,9 +170,6 @@ function createApiInstance(config) {
                 }
             }
         },
-        paymentConfig: {
-            stripe: config.getStripePaymentConfig()
-        },
         models: {
             EmailRecipient: models.EmailRecipient,
             StripeCustomer: models.MemberStripeCustomer,

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

@@ -53,36 +53,6 @@ class MembersConfigProvider {
         return this.getEmailSupportAddress() || this.getEmailFromAddress();
     }
 
-    getPublicPlans() {
-        const defaultPriceData = {
-            monthly: 0,
-            yearly: 0,
-            currency: 'USD'
-        };
-
-        try {
-            const plans = this._settingsCache.get('stripe_plans') || [];
-
-            const priceData = plans.reduce((prices, plan) => {
-                const numberAmount = 0 + plan.amount;
-                const dollarAmount = numberAmount ? Math.round(numberAmount / 100) : 0;
-                return Object.assign(prices, {
-                    [plan.name.toLowerCase()]: dollarAmount
-                });
-            }, {});
-
-            priceData.currency = plans[0].currency || 'USD';
-
-            if (Number.isInteger(priceData.monthly) && Number.isInteger(priceData.yearly)) {
-                return priceData;
-            }
-
-            return defaultPriceData;
-        } catch (err) {
-            return defaultPriceData;
-        }
-    }
-
     /**
      * @param {'direct' | 'connect'} type - The "type" of keys to fetch from settings
      * @returns {{publicKey: string, secretKey: string} | null}
@@ -128,25 +98,6 @@ class MembersConfigProvider {
         return this.getActiveStripeKeys() !== null;
     }
 
-    getStripePaymentConfig() {
-        if (!this.isStripeConnected()) {
-            return null;
-        }
-
-        const stripeApiKeys = this.getActiveStripeKeys();
-
-        if (!stripeApiKeys) {
-            return null;
-        }
-
-        return {
-            product: {
-                name: this._settingsCache.get('stripe_product_name')
-            },
-            plans: this._settingsCache.get('stripe_plans') || []
-        };
-    }
-
     getAuthSecret() {
         const hexSecret = this._settingsCache.get('members_email_auth_secret');
         if (!hexSecret) {

package/core/server/services/members/exporter/query.js

@@ -0,0 +1,88 @@
+const models = require('../../../models');
+const {knex} = require('../../../data/db');
+const moment = require('moment');
+
+module.exports = async function (options) {
+    const hasFilter = options.limit !== 'all' || options.filter || options.search;
+
+    let ids = null;
+    if (hasFilter) {
+        // do a very minimal query, only to fetch the ids of the filtered values
+        // should be quite fast
+        options.withRelated = [];
+        options.columns = ['id'];
+
+        const page = await models.Member.findPage(options);
+        ids = page.data.map(d => d.id);
+
+        /*
+        const filterOptions = _.pick(options, ['transacting', 'context']);
+
+        if (all !== true) {
+            // Include mongoTransformer to apply subscribed:{true|false} => newsletter relation mapping
+            Object.assign(filterOptions, _.pick(options, ['filter', 'search', 'mongoTransformer']));
+        }
+
+        const memberRows = await models.Member.getFilteredCollectionQuery(filterOptions)
+            .select('members.id')
+            .distinct();
+
+        ids = memberRows.map(row => row.id);
+        */
+    }
+
+    const allProducts = await models.Product.fetchAll();
+    const allLabels = await models.Label.fetchAll();
+
+    let query = knex('members')
+        .select('id', 'email', 'name', 'note', 'status', 'created_at')
+        .select(knex.raw(`
+            (CASE WHEN EXISTS (SELECT 1 FROM members_newsletters n WHERE n.member_id = members.id)
+                    THEN TRUE ELSE FALSE
+            END) as subscribed
+        `))
+        .select(knex.raw(`
+            (SELECT GROUP_CONCAT(product_id) FROM members_products f WHERE f.member_id = members.id) as tiers
+        `))
+        .select(knex.raw(`
+            (SELECT GROUP_CONCAT(label_id) FROM members_labels f WHERE f.member_id = members.id) as labels
+        `))
+        .select(knex.raw(`
+            (SELECT customer_id FROM members_stripe_customers f WHERE f.member_id = members.id limit 1) as stripe_customer_id
+        `));
+
+    if (hasFilter) {
+        query = query.whereIn('id', ids);
+    }
+
+    const rows = await query;
+    for (const row of rows) {
+        const tierIds = row.tiers ? row.tiers.split(',') : [];
+        const tiers = tierIds.map((id) => {
+            const tier = allProducts.find(p => p.id === id);
+            return {
+                name: tier.get('name')
+            };
+        });
+        row.tiers = tiers;
+
+        const labelIds = row.labels ? row.labels.split(',') : [];
+        const labels = labelIds.map((id) => {
+            const label = allLabels.find(l => l.id === id);
+            return {
+                name: label.get('name')
+            };
+        });
+        row.labels = labels;
+    }
+
+    for (const member of rows) {
+        // Note: we don't modify the array or change/duplicate objects
+        // to increase performance
+        member.subscribed = !!member.subscribed;
+        member.comped = member.status === 'comped';
+        member.created_at = moment(member.created_at).toISOString();
+    }
+
+    return rows;
+};

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

@@ -2,14 +2,8 @@ const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const membersService = require('./service');
 const models = require('../../models');
-const offersService = require('../offers/service');
 const urlUtils = require('../../../shared/url-utils');
-const ghostVersion = require('@tryghost/version');
-const settingsCache = require('../../../shared/settings-cache');
 const {formattedMemberResponse} = require('./utils');
-const labsService = require('../../../shared/labs');
-const config = require('../../../shared/config');
-const newslettersService = require('../newsletters');
 
 // @TODO: This piece of middleware actually belongs to the frontend, not to the member app
 // Need to figure a way to separate these things (e.g. frontend actually talks to members API)
@@ -61,14 +55,6 @@ const getMemberData = async function (req, res) {
     }
 };
 
-const getOfferData = async function (req, res) {
-    const offerId = req.params.id;
-    const offer = await offersService.api.getOffer({id: offerId});
-    return res.json({
-        offers: [offer]
-    });
-};
-
 const getMemberNewsletters = async function (req, res) {
     try {
         const memberUuid = req.query.uuid;
@@ -149,114 +135,6 @@ const updateMemberData = async function (req, res) {
     }
 };
 
-const getPortalProductPrices = async function () {
-    const page = await membersService.api.productRepository.list({
-        withRelated: ['monthlyPrice', 'yearlyPrice', 'benefits']
-    });
-
-    const products = page.data.map((productModel) => {
-        const product = productModel.toJSON();
-        const productPrices = [];
-        if (product.monthlyPrice) {
-            productPrices.push(product.monthlyPrice);
-        }
-        if (product.yearlyPrice) {
-            productPrices.push(product.yearlyPrice);
-        }
-        return {
-            id: product.id,
-            name: product.name,
-            description: product.description || '',
-            monthlyPrice: product.monthlyPrice,
-            yearlyPrice: product.yearlyPrice,
-            benefits: product.benefits,
-            active: product.active,
-            type: product.type,
-            visibility: product.visibility,
-            prices: productPrices
-        };
-    }).filter((product) => {
-        return !!product.active;
-    });
-    const defaultProduct = products.find((product) => {
-        return product.type === 'paid';
-    });
-    const defaultPrices = defaultProduct ? defaultProduct.prices : [];
-    let portalProducts = defaultProduct ? [defaultProduct] : [];
-    if (labsService.isSet('multipleProducts')) {
-        portalProducts = products;
-    }
-
-    return {
-        prices: defaultPrices,
-        products: portalProducts
-    };
-};
-
-const getSiteNewsletters = async function () {
-    try {
-        return await newslettersService.browse({filter: 'status:active', limit: 'all'});
-    } catch (err) {
-        logging.warn('Failed to fetch site newsletters');
-        logging.warn(err.message);
-        return [];
-    }
-};
-
-const getMemberSiteData = async function (req, res) {
-    const isStripeConfigured = membersService.config.isStripeConnected();
-    const domain = urlUtils.urlFor('home', true).match(new RegExp('^https?://([^/:?#]+)(?:[/:?#]|$)', 'i'));
-    const firstpromoterId = settingsCache.get('firstpromoter') ? settingsCache.get('firstpromoter_id') : '';
-    const blogDomain = domain && domain[1];
-    let supportAddress = settingsCache.get('members_support_address') || 'noreply';
-    if (!supportAddress.includes('@')) {
-        supportAddress = `${supportAddress}@${blogDomain}`;
-    }
-    const {products = [], prices = []} = await getPortalProductPrices() || {};
-    const portalVersion = config.get('portal:version');
-    const newsletters = await getSiteNewsletters();
-    const response = {
-        title: settingsCache.get('title'),
-        description: settingsCache.get('description'),
-        logo: settingsCache.get('logo'),
-        icon: settingsCache.get('icon'),
-        accent_color: settingsCache.get('accent_color'),
-        url: urlUtils.urlFor('home', true),
-        version: ghostVersion.safe,
-        portal_version: portalVersion,
-        free_price_name: settingsCache.get('members_free_price_name'),
-        free_price_description: settingsCache.get('members_free_price_description'),
-        allow_self_signup: membersService.config.getAllowSelfSignup(),
-        members_signup_access: settingsCache.get('members_signup_access'),
-        is_stripe_configured: isStripeConfigured,
-        portal_button: settingsCache.get('portal_button'),
-        portal_name: settingsCache.get('portal_name'),
-        portal_plans: settingsCache.get('portal_plans'),
-        portal_button_icon: settingsCache.get('portal_button_icon'),
-        portal_button_signup_text: settingsCache.get('portal_button_signup_text'),
-        portal_button_style: settingsCache.get('portal_button_style'),
-        firstpromoter_id: firstpromoterId,
-        members_support_address: supportAddress,
-        prices,
-        products
-    };
-
-    if (labsService.isSet('multipleNewsletters')) {
-        response.newsletters = newsletters;
-    }
-
-    if (labsService.isSet('multipleProducts')) {
-        response.portal_products = settingsCache.get('portal_products');
-    }
-    if (config.get('portal_sentry') && !config.get('portal_sentry').disabled) {
-        response.portal_sentry = {
-            dsn: config.get('portal_sentry').dsn,
-            env: config.get('env')
-        };
-    }
-    res.json({site: response});
-};
-
 const createSessionFromMagicLink = async function (req, res, next) {
     if (!req.url.includes('token=')) {
         return next();
@@ -287,18 +165,10 @@ const createSessionFromMagicLink = async function (req, res, next) {
                 })
                 .find(sub => ['active', 'trialing'].includes(sub.status));
             if (mostRecentActiveSubscription) {
-                if (labsService.isSet('tierWelcomePages')) {
-                    customRedirect = mostRecentActiveSubscription.tier.welcome_page_url;
-                } else {
-                    customRedirect = settingsCache.get('members_paid_signup_redirect') || '';
-                }
+                customRedirect = mostRecentActiveSubscription.tier.welcome_page_url;
             } else {
-                if (labsService.isSet('tierWelcomePages')) {
-                    const freeTier = await models.Product.findOne({type: 'free'});
-                    customRedirect = freeTier && freeTier.get('welcome_page_url') || '';
-                } else {
-                    customRedirect = settingsCache.get('members_free_signup_redirect') || '';
-                }
+                const freeTier = await models.Product.findOne({type: 'free'});
+                customRedirect = freeTier && freeTier.get('welcome_page_url') || '';
             }
 
             if (customRedirect && customRedirect !== '/') {
@@ -331,9 +201,7 @@ module.exports = {
     getIdentityToken,
     getMemberNewsletters,
     getMemberData,
-    getOfferData,
     updateMemberData,
     updateMemberNewsletters,
-    getMemberSiteData,
     deleteSession
 };

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

@@ -18,7 +18,6 @@ const jobsService = require('../jobs');
 const VerificationTrigger = require('@tryghost/verification-trigger');
 const DomainEvents = require('@tryghost/domain-events');
 const {LastSeenAtUpdater} = require('@tryghost/members-events-service');
-const events = require('../../lib/common/events');
 const DatabaseInfo = require('@tryghost/database-info');
 
 const messages = {
@@ -74,32 +73,6 @@ module.exports = {
         const createMembersApiInstance = require('./api');
         const env = config.get('env');
 
-        events.on('settings.edited', async function (settingModel) {
-            if (labsService.isSet('multipleProducts')) {
-                return;
-            }
-
-            const key = settingModel.get('key');
-            const value = settingModel.get('value');
-
-            if (key === 'members_free_signup_redirect') {
-                try {
-                    await models.Product.forge().query().update('welcome_page_url', value).where('type', 'free');
-                } catch (err) {
-                    logging.error(err);
-                }
-                return;
-            }
-            if (key === 'members_paid_signup_redirect') {
-                try {
-                    await models.Product.forge().query().update('welcome_page_url', value).where('type', 'paid');
-                } catch (err) {
-                    logging.error(err);
-                }
-                return;
-            }
-        });
-
         // @TODO Move to stripe service
         if (env !== 'production') {
             if (stripeService.api.configured && stripeService.api.mode === 'live') {
@@ -202,7 +175,7 @@ module.exports = {
 
     processImport: processImport,
 
-    stats: membersStats
-
+    stats: membersStats,
+    export: require('./exporter/query')
 };
 module.exports.middleware = require('./middleware');

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

@@ -52,7 +52,7 @@ function createSettingsInstance(config) {
             return updateEmailTemplate({url, email, siteTitle});
         },
         getSigninURL(token, type) {
-            const signinURL = new URL(getApiUrl({version: 'v4', type: 'admin'}));
+            const signinURL = new URL(urlUtils.urlFor('api', {type: 'admin'}, true));
             signinURL.pathname = path.join(signinURL.pathname, '/settings/members/email/');
             signinURL.searchParams.set('token', token);
             signinURL.searchParams.set('action', type);
@@ -60,10 +60,6 @@ function createSettingsInstance(config) {
         }
     };
 
-    const getApiUrl = ({version, type}) => {
-        return urlUtils.urlFor('api', {version: version, versionType: type}, true);
-    };
-
     const magicLinkService = new MagicLink({
         transporter,
         tokenProvider: new SingleUseTokenProvider(models.SingleUseToken, MAGIC_LINK_TOKEN_VALIDITY),
@@ -73,7 +69,7 @@ function createSettingsInstance(config) {
         getSubject
     });
 
-    const sendEmailAddressUpdateMagicLink = ({email, type = 'fromAddressUpdate'}) => {
+    const sendEmailAddressUpdateMagicLink = ({email, type = 'supportAddressUpdate'}) => {
         const [,toDomain] = email.split('@');
         let fromEmail = `noreply@${toDomain}`;
         if (fromEmail === email) {
@@ -103,9 +99,7 @@ function createSettingsInstance(config) {
 
     const getAdminRedirectLink = ({type}) => {
         const adminUrl = urlUtils.urlFor('admin', true);
-        if (type === 'fromAddressUpdate') {
-            return urlUtils.urlJoin(adminUrl, `#/settings/members-email/?${type}=success`);
-        } else if (type === 'supportAddressUpdate') {
+        if (type === 'supportAddressUpdate') {
             return urlUtils.urlJoin(adminUrl, `#/settings/members/?${type}=success`);
         } else {
             return urlUtils.urlJoin(adminUrl, `#/site/`);

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

@@ -3,6 +3,13 @@ const MagicLink = require('@tryghost/magic-link');
 const logging = require('@tryghost/logging');
 const verifyEmailTemplate = require('./emails/verify-email');
 const debug = require('@tryghost/debug')('services:newsletters');
+const tpl = require('@tryghost/tpl');
+const errors = require('@tryghost/errors');
+
+const messages = {
+    nameAlreadyExists: 'A newsletter with the same name already exists',
+    newsletterNotFound: 'Newsletter not found.'
+};
 
 class NewslettersService {
     /**
@@ -73,6 +80,23 @@ class NewslettersService {
         });
     }
 
+    /**
+     * @public
+     * @param {Object} options data (id, uuid, slug...)
+     * @param {Object} [options] options
+     * @returns {Promise<object>} JSONified Newsletter models
+     */
+    async read(data, options = {}) {
+        const newsletter = await this.NewsletterModel.findOne(data, options);
+
+        if (!newsletter) {
+            throw new errors.NotFoundError({
+                message: tpl(messages.newsletterNotFound)
+            });
+        }
+        return newsletter;
+    }
+
     /**
      * @public
      * @param {Object} [options] options
@@ -83,11 +107,13 @@ class NewslettersService {
 
         return newsletters.toJSON();
     }
+
     /**
      * @public
      * @param {object} attrs model properties
      * @param {Object} [options] options
-     * @param {Object} [options] options.transacting
+     * @param {boolean} [options.opt_in_existing] Opt in existing members
+     * @param {Object} [options.transacting]
      * @returns {Promise<{object}>} Newsetter Model with verification metadata
      */
     async add(attrs, options = {}) {
@@ -99,7 +125,9 @@ class NewslettersService {
             });
         }
 
-        await this.limitService.errorIfWouldGoOverLimit('newsletters');
+        if (!attrs.status || attrs.status === 'active') {
+            await this.limitService.errorIfWouldGoOverLimit('newsletters', options.transacting ? {transacting: options.transacting} : {});
+        }
 
         // remove any email properties that are not allowed to be set without verification
         const {cleanedAttrs, emailsToVerify} = await this.prepAttrsForEmailVerification(attrs);
@@ -108,8 +136,23 @@ class NewslettersService {
         const sortOrder = await this.NewsletterModel.getNextAvailableSortOrder(options);
         cleanedAttrs.sort_order = sortOrder;
 
-        // add the model now because we need the ID for sending verification emails
-        const newsletter = await this.NewsletterModel.add(cleanedAttrs, options);
+        let newsletter;
+        try {
+            // add the model now because we need the ID for sending verification emails
+            newsletter = await this.NewsletterModel.add(cleanedAttrs, options);
+        } catch (error) {
+            if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
+                throw new errors.ValidationError({
+                    message: tpl(messages.nameAlreadyExists),
+                    property: 'name'
+                });
+            }
+
+            throw error;
+        }
+
+        // Load relations correctly
+        newsletter = await this.NewsletterModel.findOne({id: newsletter.id}, {...options, require: true});
 
         // subscribe existing members if opt_in_existing=true
         if (options.opt_in_existing) {
@@ -135,18 +178,43 @@ class NewslettersService {
     /**
      * @public
      * @param {object} attrs model properties
-     * @param {Object} [options] options
+     * @param {Object} options options
+     * @param {string} options.id Newsletter id to edit
+     * @param {Object} [options.transacting]
      * @returns {Promise<{object}>} Newsetter Model with verification metadata
      */
-    async edit(attrs, options = {}) {
+    async edit(attrs, options) {
+        const sharedOptions = _.pick(options, 'transacting');
+
         // fetch newsletter first so we can compare changed emails
-        const originalNewsletter = await this.NewsletterModel.findOne(options, {require: true});
+        const originalNewsletter = await this.NewsletterModel.findOne({id: options.id}, {...sharedOptions, require: true});
 
         const {cleanedAttrs, emailsToVerify} = await this.prepAttrsForEmailVerification(attrs, originalNewsletter);
 
-        const updatedNewsletter = await this.NewsletterModel.edit(cleanedAttrs, options);
+        if (originalNewsletter.get('status') !== 'active' && cleanedAttrs.status === 'active') {
+            await this.limitService.errorIfWouldGoOverLimit('newsletters', sharedOptions);
+        }
+
+        let updatedNewsletter;
+        
+        try {
+            updatedNewsletter = await this.NewsletterModel.edit(cleanedAttrs, options);
+        } catch (error) {
+            if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
+                throw new errors.ValidationError({
+                    message: tpl(messages.nameAlreadyExists),
+                    property: 'name'
+                });
+            }
+
+            throw error;
+        }
 
-        return this.respondWithEmailVerification(updatedNewsletter, emailsToVerify);
+        // Load relations correctly in the response
+        updatedNewsletter = await this.NewsletterModel.findOne({id: updatedNewsletter.id}, {...options, require: true});
+        
+        await this.respondWithEmailVerification(updatedNewsletter, emailsToVerify);
+        return updatedNewsletter;
     }
 
     /**
@@ -249,7 +317,7 @@ class NewslettersService {
 
 /**
  * @typedef {object} ILimitService
- * @prop {(name: string) => Promise<void>} errorIfWouldGoOverLimit
+ * @prop {(name: string, options?: {transacting?: Object}) => Promise<void>} errorIfWouldGoOverLimit
  **/
 
 module.exports = NewslettersService;