Updated support/reply email address flow

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/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/services/bulk-email/index.js

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

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,11 @@ class MembersConfigProvider {
         return fromAddress;
     }
 
+    getAuthEmailFromAddress() {
+        const supportAddress = this._settingsCache.get('members_support_address');
+        return supportAddress || 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/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/web/api/canary/admin/routes.js

@@ -61,8 +61,8 @@ module.exports = function apiRoutes() {
     router.get('/settings', mw.authAdminApi, http(apiCanary.settings.browse));
     router.get('/settings/:key', mw.authAdminApi, http(apiCanary.settings.read));
     router.put('/settings', mw.authAdminApi, http(apiCanary.settings.edit));
-    router.get('/settings/members/email', http(apiCanary.settings.validateMembersFromEmail));
-    router.post('/settings/members/email', mw.authAdminApi, http(apiCanary.settings.updateMembersFromEmail));
+    router.get('/settings/members/email', http(apiCanary.settings.validateMembersEmailUpdate));
+    router.post('/settings/members/email', mw.authAdminApi, http(apiCanary.settings.updateMembersEmail));
     router.del('/settings/stripe/connect', mw.authAdminApi, http(apiCanary.settings.disconnectStripeConnectIntegration));
 
     // ## Users