Add v3.32.1

core/server/api/canary/settings.js

@@ -74,30 +74,39 @@ module.exports = {
         }
     },
 
-    validateMembersFromEmail: {
+    validateMembersEmailUpdate: {
         options: [
-            'token'
+            'token',
+            'action'
         ],
         permissions: false,
         validation: {
             options: {
                 token: {
                     required: true
+                },
+                action: {
+                    values: ['fromaddressupdate', 'supportaddressupdate']
                 }
             }
         },
         async query(frame) {
             // This is something you have to do if you want to use the "framework" with access to the raw req/res
             frame.response = async function (req, res) {
                 try {
-                    const updatedFromAddress = membersService.settings.getEmailFromToken({token: frame.options.token});
-                    if (updatedFromAddress) {
+                    const {token, action} = frame.options;
+                    const updatedEmailAddress = membersService.settings.getEmailFromToken({token});
+                    const actionToKeyMapping = {
+                        fromAddressUpdate: 'members_from_address',
+                        supportAddressUpdate: 'members_support_address'
+                    };
+                    if (updatedEmailAddress) {
                         return models.Settings.edit({
-                            key: 'members_from_address',
-                            value: updatedFromAddress
+                            key: actionToKeyMapping[action],
+                            value: updatedEmailAddress
                         }).then(() => {
                             // Redirect to Ghost-Admin settings page
-                            const adminLink = membersService.settings.getAdminRedirectLink();
+                            const adminLink = membersService.settings.getAdminRedirectLink({type: action});
                             res.redirect(adminLink);
                         });
                     } else {
@@ -115,21 +124,32 @@ module.exports = {
         }
     },
 
-    updateMembersFromEmail: {
+    updateMembersEmail: {
         permissions: {
             method: 'edit'
         },
+        data: [
+            'email',
+            'type'
+        ],
         async query(frame) {
-            const email = frame.data.from_address;
+            const {email, type} = frame.data;
             if (typeof email !== 'string' || !validator.isEmail(email)) {
                 throw new BadRequestError({
                     message: i18n.t('errors.api.settings.invalidEmailReceived')
                 });
             }
+
+            if (!type || !['fromAddressUpdate', 'supportAddressUpdate'].includes(type)) {
+                throw new BadRequestError({
+                    message: 'Invalid email type recieved'
+                });
+            }
             try {
                 // Send magic link to update fromAddress
-                await membersService.settings.sendFromAddressUpdateMagicLink({
-                    email
+                await membersService.settings.sendEmailAddressUpdateMagicLink({
+                    email,
+                    type
                 });
             } catch (err) {
                 throw new BadRequestError({

core/server/api/shared/headers.js

@@ -101,41 +101,26 @@ module.exports = {
      * @param {Object} apiConfig
      * @return {Promise}
      */
-    get(result, apiConfig = {}) {
+    async get(result, apiConfig = {}) {
         let headers = {};
 
-        return Promise.resolve()
-            .then(() => {
-                let header;
+        if (apiConfig.disposition) {
+            const dispositionHeader = await disposition[apiConfig.disposition.type](result, apiConfig.disposition);
 
-                if (apiConfig.disposition) {
-                    header = disposition[apiConfig.disposition.type](result, apiConfig.disposition);
-                }
+            if (dispositionHeader) {
+                Object.assign(headers, dispositionHeader);
+            }
+        }
 
-                return header;
-            })
-            .then((header) => {
-                if (header) {
-                    Object.assign(headers, header);
-                }
-            })
-            .then(() => {
-                let header;
+        if (apiConfig.cacheInvalidate) {
+            const cacheInvalidationHeader = cacheInvalidate(result, apiConfig.cacheInvalidate);
 
-                if (apiConfig.cacheInvalidate) {
-                    header = cacheInvalidate(result, apiConfig.cacheInvalidate);
-                }
+            if (cacheInvalidationHeader) {
+                Object.assign(headers, cacheInvalidationHeader);
+            }
+        }
 
-                return header;
-            })
-            .then((header) => {
-                if (header) {
-                    Object.assign(headers, header);
-                }
-            })
-            .then(() => {
-                debug(headers);
-                return headers;
-            });
+        debug(headers);
+        return headers;
     }
 };

core/server/data/importer/importers/data/settings.js

@@ -143,7 +143,7 @@ class SettingsImporter extends BaseImporter {
             }
 
             // CASE: we do not import "from address" for members settings as that needs to go via validation with magic link
-            if (obj.key === 'members_from_address') {
+            if ((obj.key === 'members_from_address') || (obj.key === 'members_support_address')) {
                 obj.value = null;
             }
 

core/server/data/migrations/versions/3.32/01-add-member-support-address-setting.js

@@ -0,0 +1,27 @@
+const logging = require('../../../../../shared/logging');
+
+module.exports = {
+    config: {
+        transaction: true
+    },
+
+    async up({transacting: knex}) {
+        const fromAddressSetting = await knex('settings')
+            .select('value')
+            .where('key', 'members_from_address')
+            .first();
+        const fromAddressValue = fromAddressSetting ? fromAddressSetting.value : 'noreply';
+        logging.info(`Updating members_support_address setting to members group with value ${fromAddressValue}`);
+        await knex('settings')
+            .update({
+                group: 'members',
+                flags: 'PUBLIC,RO',
+                value: fromAddressValue
+            })
+            .where({
+                key: 'members_support_address'
+            });
+    },
+
+    async down() {}
+};

core/server/data/migrations/versions/3.32/02-add-member-reply-address-setting.js

@@ -0,0 +1,20 @@
+const logging = require('../../../../../shared/logging');
+
+module.exports = {
+    config: {
+        transaction: true
+    },
+
+    async up({transacting: knex}) {
+        logging.info('Updating members_reply_address setting to members group');
+        await knex('settings')
+            .update({
+                group: 'members'
+            })
+            .where({
+                key: 'members_reply_address'
+            });
+    },
+
+    async down() {}
+};

core/server/data/migrations/versions/3.32/03-add-routes-hash-setting.js

@@ -0,0 +1,20 @@
+const logging = require('../../../../../shared/logging');
+module.exports = {
+    config: {
+        transaction: true
+    },
+
+    async up({transacting: knex}) {
+        logging.info('Updating routes_hash to group: core, type: string, flags: null');
+
+        await knex('settings')
+            .update({
+                group: 'core',
+                type: 'string',
+                flags: null
+            })
+            .where('key', 'routes_hash');
+    },
+
+    async down() {}
+};

core/server/data/schema/default-settings.json

@@ -4,6 +4,10 @@
             "defaultValue": null,
             "type": "string"
         },
+        "routes_hash": {
+            "defaultValue": null,
+            "type": "string"
+        },
         "next_update_check": {
             "defaultValue": null,
             "type": "number"
@@ -241,6 +245,19 @@
             "flags": "RO",
             "type": "string"
         },
+        "members_support_address": {
+            "defaultValue": "noreply",
+            "flags": "PUBLIC,RO",
+            "type": "string"
+        },
+        "members_reply_address": {
+            "defaultValue": "newsletter",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["newsletter", "support"]]
+            },
+            "type": "string"
+        },
         "stripe_product_name": {
             "defaultValue": "Ghost Subscription",
             "type": "string"

core/server/services/bulk-email/index.js

@@ -81,6 +81,10 @@ module.exports = {
         }
 
         const blogTitle = settingsCache.get('title') ? settingsCache.get('title').replace(/"/g, '\\"') : '';
+        let supportAddress = message.supportAddress;
+        delete message.supportAddress;
+        const replyAddressOption = settingsCache.get('members_reply_address');
+        const replyToAddress = (replyAddressOption === 'support') ? supportAddress : fromAddress;
         fromAddress = blogTitle ? `"${blogTitle}"<${fromAddress}>` : fromAddress;
 
         const chunkedRecipients = _.chunk(recipients, BATCH_SIZE);
@@ -94,6 +98,7 @@ module.exports = {
             const batchData = {
                 to: toAddresses,
                 from: fromAddress,
+                'h:Reply-To': replyToAddress || fromAddress,
                 'recipient-variables': recipientVariables
             };
 

core/server/services/mega/mega.js

@@ -17,6 +17,7 @@ const getEmailData = async (postModel, memberModels = []) => {
     const {emailTmpl, replacements} = await postEmailSerializer.serialize(postModel);
 
     emailTmpl.from = membersService.config.getEmailFromAddress();
+    emailTmpl.supportAddress = membersService.config.getEmailSupportAddress();
 
     // update templates to use Mailgun variable syntax for replacements
     replacements.forEach((replacement) => {

core/server/services/members/api.js

@@ -26,7 +26,7 @@ function createApiInstance(config) {
                         logging.warn(message.text);
                     }
                     let msg = Object.assign({
-                        from: config.getEmailFromAddress(),
+                        from: config.getAuthEmailFromAddress(),
                         subject: 'Signin',
                         forceTextContent: true
                     }, message);

core/server/services/members/config.js

@@ -44,6 +44,20 @@ class MembersConfigProvider {
         return fromAddress;
     }
 
+    getEmailSupportAddress() {
+        const supportAddress = this._settingsCache.get('members_support_address') || 'noreply';
+
+        // Any fromAddress without domain uses site domain, like default setting `noreply`
+        if (supportAddress.indexOf('@') < 0) {
+            return `${supportAddress}@${this._getDomain()}`;
+        }
+        return supportAddress;
+    }
+
+    getAuthEmailFromAddress() {
+        return this.getEmailSupportAddress() || this.getEmailFromAddress();
+    }
+
     getPublicPlans() {
         const CURRENCY_SYMBOLS = {
             USD: '$',

core/server/services/members/index.js

@@ -39,6 +39,8 @@ events.on('settings.edited', function updateSettingFromModel(settingModel) {
     if (![
         'members_allow_free_signup',
         'members_from_address',
+        'members_support_address',
+        'members_reply_address',
         'stripe_publishable_key',
         'stripe_secret_key',
         'stripe_product_name',

core/server/services/members/middleware.js

@@ -71,7 +71,12 @@ const updateMemberData = async function (req, res) {
         const data = _.pick(req.body, 'name', 'subscribed');
         const member = await membersService.ssr.getMemberDataFromSession(req, res);
         if (member) {
-            const updatedMember = await membersService.api.members.update(data, {id: member.id});
+            const options = {
+                id: member.id,
+                withRelated: ['stripeSubscriptions', 'stripeSubscriptions.customer']
+            };
+            const updatedMember = await membersService.api.members.update(data, options);
+
             res.json(formattedMemberResponse(updatedMember.toJSON()));
         } else {
             res.json(null);

core/server/services/members/settings.js

@@ -17,7 +17,7 @@ function createSettingsInstance(config) {
                     logging.warn(message.text);
                 }
                 let msg = Object.assign({
-                    from: config.getEmailFromAddress(),
+                    from: config.getAuthEmailFromAddress(),
                     subject: 'Update email address',
                     forceTextContent: true
                 }, message);
@@ -70,21 +70,35 @@ function createSettingsInstance(config) {
         getSubject
     });
 
-    const sendFromAddressUpdateMagicLink = ({email, payload = {}}) => {
-        return magicLinkService.sendMagicLink({email, payload, subject: email, type: 'updateFromAddress'});
+    const sendEmailAddressUpdateMagicLink = ({email, payload = {}, type = 'fromAddressUpdate'}) => {
+        magicLinkService.transporter = {
+            sendMail(message) {
+                if (process.env.NODE_ENV !== 'production') {
+                    logging.warn(message.text);
+                }
+                let msg = Object.assign({
+                    from: email,
+                    subject: 'Update email address',
+                    forceTextContent: true
+                }, message);
+
+                return ghostMailer.send(msg);
+            }
+        };
+        return magicLinkService.sendMagicLink({email, payload, subject: email, type});
     };
 
     const getEmailFromToken = ({token}) => {
         return magicLinkService.getUserFromToken(token);
     };
 
-    const getAdminRedirectLink = () => {
+    const getAdminRedirectLink = ({type}) => {
         const adminUrl = urlUtils.urlFor('admin', true);
-        return urlUtils.urlJoin(adminUrl, '#/settings/labs/?fromAddressUpdate=success');
+        return urlUtils.urlJoin(adminUrl, `#/settings/labs/?${type}=success`);
     };
 
     return {
-        sendFromAddressUpdateMagicLink,
+        sendEmailAddressUpdateMagicLink,
         getEmailFromToken,
         getAdminRedirectLink
     };

core/server/services/settings/public.js

@@ -28,5 +28,6 @@ module.exports = {
     og_description: 'og_description',
     twitter_image: 'twitter_image',
     twitter_title: 'twitter_title',
-    twitter_description: 'twitter_description'
+    twitter_description: 'twitter_description',
+    members_support_address: 'members_support_address'
 };