From 2a832645dda3e702b15cd21d06ae343907f74d78 Mon Sep 17 00:00:00 2001
From: Simon Backx <simon@ghost.org>
Date: Mon, 28 Nov 2022 18:28:15 +0100
Subject: [PATCH] Added getNoReplyAddress settings helper

no issue

New settings method used for https://github.com/TryGhost/Ghost/pull/15877, which shouldn't belong in the member service like it currently is.
---
 ghost/core/core/server/services/members/config.js   | 13 +++++++++++--
 .../services/settings-helpers/settings-helpers.js   |  4 ++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ghost/core/core/server/services/members/config.js b/ghost/core/core/server/services/members/config.js
index be1f54bb04..560eb576f0 100644
--- a/ghost/core/core/server/services/members/config.js
+++ b/ghost/core/core/server/services/members/config.js
@@ -7,7 +7,7 @@ class MembersConfigProvider {
     /**
      * @param {object} options
      * @param {{get: (key: string) => any}} options.settingsCache
-     * @param {{getDefaultEmailDomain(): string, getMembersSupportAddress(): string, isStripeConnected(): boolean}} options.settingsHelpers
+     * @param {{getDefaultEmailDomain(): string, getMembersSupportAddress(): string, getNoReplyAddress(): string, isStripeConnected(): boolean}} options.settingsHelpers
      * @param {any} options.urlUtils
      */
     constructor({settingsCache, settingsHelpers, urlUtils}) {
@@ -20,11 +20,17 @@ class MembersConfigProvider {
         return this._settingsHelpers.getDefaultEmailDomain();
     }
 
+    /**
+     * @deprecated Use settingsHelpers.getNoReplyAddress or settingsHelpers.getMembersSupportAddress instead
+     */
     getEmailFromAddress() {
         // Individual from addresses are set per newsletter - this is the fallback address
-        return `noreply@${this.defaultEmailDomain}`;
+        return this._settingsHelpers.getNoReplyAddress();
     }
 
+    /**
+     * @deprecated Use settingsHelpers.getNoReplyAddress or settingsHelpers.getMembersSupportAddress instead
+     */
     getEmailSupportAddress() {
         return this._settingsHelpers.getMembersSupportAddress();
     }
@@ -33,6 +39,9 @@ class MembersConfigProvider {
         return this.getEmailSupportAddress();
     }
 
+    /**
+     * @deprecated Use settingsHelpers.isStripeConnected instead
+     */
     isStripeConnected() {
         return this._settingsHelpers.isStripeConnected();
     }
diff --git a/ghost/core/core/server/services/settings-helpers/settings-helpers.js b/ghost/core/core/server/services/settings-helpers/settings-helpers.js
index 3311031c7c..c095d58ecd 100644
--- a/ghost/core/core/server/services/settings-helpers/settings-helpers.js
+++ b/ghost/core/core/server/services/settings-helpers/settings-helpers.js
@@ -94,6 +94,10 @@ class SettingsHelpers {
         }
         return supportAddress;
     }
+
+    getNoReplyAddress() {
+        return `noreply@${this.getDefaultEmailDomain()}`;
+    }
 }
 
 module.exports = SettingsHelpers;