From 398b98b5f61028294a75280db0af519bf90a99d7 Mon Sep 17 00:00:00 2001 From: Simon Backx Date: Tue, 31 Oct 2023 13:25:05 +0100 Subject: [PATCH] Cleaned up some email helpers (#18806) no issue --- .../core/server/services/members/MembersConfigProvider.js | 4 ---- ghost/core/core/server/services/members/api.js | 2 +- ghost/staff-service/lib/StaffServiceEmails.js | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ghost/core/core/server/services/members/MembersConfigProvider.js b/ghost/core/core/server/services/members/MembersConfigProvider.js index 560eb576f0..7d592e3652 100644 --- a/ghost/core/core/server/services/members/MembersConfigProvider.js +++ b/ghost/core/core/server/services/members/MembersConfigProvider.js @@ -35,10 +35,6 @@ class MembersConfigProvider { return this._settingsHelpers.getMembersSupportAddress(); } - getAuthEmailFromAddress() { - return this.getEmailSupportAddress(); - } - /** * @deprecated Use settingsHelpers.isStripeConnected instead */ diff --git a/ghost/core/core/server/services/members/api.js b/ghost/core/core/server/services/members/api.js index 69a8b98997..21d6318a53 100644 --- a/ghost/core/core/server/services/members/api.js +++ b/ghost/core/core/server/services/members/api.js @@ -47,7 +47,7 @@ function createApiInstance(config) { logging.warn(message.text); } let msg = Object.assign({ - from: config.getAuthEmailFromAddress(), + from: config.getEmailSupportAddress(), subject: 'Signin', forceTextContent: true }, message); diff --git a/ghost/staff-service/lib/StaffServiceEmails.js b/ghost/staff-service/lib/StaffServiceEmails.js index 19d3da73a7..c96c64cc90 100644 --- a/ghost/staff-service/lib/StaffServiceEmails.js +++ b/ghost/staff-service/lib/StaffServiceEmails.js @@ -419,11 +419,6 @@ class StaffServiceEmails { return this.settingsHelpers.getDefaultEmailDomain(); } - get membersAddress() { - // TODO: get from address of default newsletter? - return `noreply@${this.defaultEmailDomain}`; - } - get fromEmailAddress() { return `ghost@${this.defaultEmailDomain}`; }