From cd20738d655ea37fe88ade40495cae05f6713d58 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <github.erisds@gmail.com>
Date: Thu, 12 May 2022 15:23:54 +0100
Subject: [PATCH] Removed support for editing members_from_address

refs: https://github.com/TryGhost/Team/issues/1625
refs: https://github.com/TryGhost/Team/issues/1558

- the members_from_address setting is no longer used, instead we use newsletters from address
---
 core/server/api/canary/settings.js                        | 3 +--
 core/server/api/canary/utils/validators/input/settings.js | 2 +-
 core/server/services/members/settings.js                  | 6 ++----
 test/e2e-api/admin/__snapshots__/settings.test.js.snap    | 4 ++--
 test/e2e-api/admin/settings.test.js                       | 6 +++---
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/server/api/canary/settings.js b/core/server/api/canary/settings.js
index 43d041689b..e50eddb20e 100644
--- a/core/server/api/canary/settings.js
+++ b/core/server/api/canary/settings.js
@@ -57,7 +57,7 @@ module.exports = {
                     required: true
                 },
                 action: {
-                    values: ['fromaddressupdate', 'supportaddressupdate']
+                    values: ['supportaddressupdate']
                 }
             }
         },
@@ -68,7 +68,6 @@ module.exports = {
                     const {token, action} = frame.options;
                     const updatedEmailAddress = await membersService.settings.getEmailFromToken({token});
                     const actionToKeyMapping = {
-                        fromAddressUpdate: 'members_from_address',
                         supportAddressUpdate: 'members_support_address'
                     };
                     if (updatedEmailAddress) {
diff --git a/core/server/api/canary/utils/validators/input/settings.js b/core/server/api/canary/utils/validators/input/settings.js
index af82ff8353..5f1be1787a 100644
--- a/core/server/api/canary/utils/validators/input/settings.js
+++ b/core/server/api/canary/utils/validators/input/settings.js
@@ -59,7 +59,7 @@ module.exports = {
             });
         }
 
-        if (!type || !['fromAddressUpdate', 'supportAddressUpdate'].includes(type)) {
+        if (!type || !['supportAddressUpdate'].includes(type)) {
             throw new BadRequestError({
                 message: messages.invalidEmailTypeReceived
             });
diff --git a/core/server/services/members/settings.js b/core/server/services/members/settings.js
index a24c3bf59e..ec82dbdccb 100644
--- a/core/server/services/members/settings.js
+++ b/core/server/services/members/settings.js
@@ -69,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) {
@@ -99,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/`);
diff --git a/test/e2e-api/admin/__snapshots__/settings.test.js.snap b/test/e2e-api/admin/__snapshots__/settings.test.js.snap
index b310158d3e..bcea6f495f 100644
--- a/test/e2e-api/admin/__snapshots__/settings.test.js.snap
+++ b/test/e2e-api/admin/__snapshots__/settings.test.js.snap
@@ -1153,9 +1153,9 @@ exports[`Settings API can do validateMembersEmailUpdate 1: [headers] 1`] = `
 Object {
   "access-control-allow-origin": "http://127.0.0.1:2369",
   "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0",
-  "content-length": "101",
+  "content-length": "98",
   "content-type": "text/plain; charset=utf-8",
-  "location": "http://127.0.0.1:2369/ghost/#/settings/members-email/?fromAddressUpdate=success",
+  "location": "http://127.0.0.1:2369/ghost/#/settings/members/?supportAddressUpdate=success",
   "vary": "Origin, Accept, Accept-Encoding",
   "x-powered-by": "Express",
 }
diff --git a/test/e2e-api/admin/settings.test.js b/test/e2e-api/admin/settings.test.js
index f63c30c76c..88e46d848c 100644
--- a/test/e2e-api/admin/settings.test.js
+++ b/test/e2e-api/admin/settings.test.js
@@ -169,7 +169,7 @@ describe('Settings API', function () {
             .post('settings/members/email/')
             .body({
                 email: 'test@test.com',
-                type: 'fromAddressUpdate'
+                type: 'supportAddressUpdate'
             })
             .expectStatus(204)
             .expectEmptyBody()
@@ -187,7 +187,7 @@ describe('Settings API', function () {
 
         // @TODO Fixing https://github.com/TryGhost/Team/issues/584 should result in this test changing
         await agent
-            .get(`settings/members/email/?token=${token}&action=fromAddressUpdate`)
+            .get(`settings/members/email/?token=${token}&action=supportAddressUpdate`)
             .expectStatus(302)
             .expectEmptyBody()
             .matchHeaderSnapshot();
@@ -197,7 +197,7 @@ describe('Settings API', function () {
         await agent.get('settings/')
             .expect(({body}) => {
                 const fromAddress = body.settings.find((setting) => {
-                    return setting.key === 'members_from_address';
+                    return setting.key === 'members_support_address';
                 });
                 assert.equal(fromAddress.value, 'test@test.com');
             });