From 1fc4270613acb80a00554d1158ab703bab6eb4d4 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Tue, 16 Apr 2024 15:46:06 +1000 Subject: [PATCH] Remove indirection from MailSettings We can simply merge the option hashes now because they are not conditional anymore. Well, the magic `presence` method does the conditional logic for us now. --- lib/spree/core/mail_settings.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/spree/core/mail_settings.rb b/lib/spree/core/mail_settings.rb index ebd62fc4c0..9824283521 100644 --- a/lib/spree/core/mail_settings.rb +++ b/lib/spree/core/mail_settings.rb @@ -20,21 +20,14 @@ module Spree private def mail_server_settings - basic_settings.merge(user_credentials) - end - - def user_credentials - { user_name: Config.smtp_username.presence, - password: Config.smtp_password.presence } - end - - def basic_settings { address: Config.mail_host, domain: Config.mail_domain, port: Config.mail_port, authentication:, enable_starttls_auto: secure_connection?, + user_name: Config.smtp_username.presence, + password: Config.smtp_password.presence, } end