Try setting email from address from SMTP settings and give confirmati…

…on of test email being sent
earthcubeprojects-chords · Dec 26, 2018 · 4f627b9 · 4f627b9
1 parent 31b1b72
commit 4f627b9
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
@@ -202,6 +202,7 @@ def test_sending_email
       Rails.logger.warn(e)
     end
 
+    flash[:notice] = 'Congrats, your SMTP settings appear in order. Check your username/email for receipt.'
     redirect_to action: :index
   end
 

diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
@@ -1,5 +1,5 @@
 class AdminMailer < Devise::Mailer
-  default from: 'admin@chordsrt.com'
+  default from: Rails.application.config.action_mailer.smtp_settings[:user_name]
   layout 'mailer'
 
   def test_sending_email(email)

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -42,7 +42,13 @@
   # config.action_view.raise_on_missing_translations = true
 
   # email config
-  config.action_mailer.default_options = {from: 'admin@chordsrt.com'}
+  from_email = if Rails.application.config.action_mailer.smtp_settings
+                 Rails.application.config.action_mailer.smtp_settings[:user_name]
+               else
+                 'admin@chordsrt.com'
+               end
+
+  config.action_mailer.default_options = {from: from_email}
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.delivery_method = :letter_opener
   config.action_mailer.perform_deliveries = true

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -64,9 +64,15 @@
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'
 
+  from_email = if Rails.application.config.action_mailer.smtp_settings
+                 Rails.application.config.action_mailer.smtp_settings[:user_name]
+               else
+                 'admin@chordsrt.com'
+               end
+
   config.action_mailer.perform_deliveries = true
   config.action_mailer.raise_delivery_errors = true
-  config.action_mailer.default_options = {from: 'admin@chordsrt.com'}
+  config.action_mailer.default_options = {from: from_email}
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = {
     address:               ENV['CHORDS_EMAIL_SERVER'],

diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -36,9 +36,15 @@
   #   location: '/usr/sbin/sendmail',
   #   arguments: '-i -t'
   # }
+  from_email = if Rails.application.config.action_mailer.smtp_settings
+                 Rails.application.config.action_mailer.smtp_settings[:user_name]
+               else
+                 'admin@chordsrt.com'
+               end
+
+  config.action_mailer.default_options = {from: from_email}
   config.action_mailer.perform_deliveries = true
   config.action_mailer.raise_delivery_errors = true
-  config.action_mailer.default_options = {from: 'admin@chordsrt.com'}
 
   # Randomize the order test cases are executed.
   config.active_support.test_order = :random

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -12,7 +12,11 @@
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = 'admin@chordsrt.com'
+  config.mailer_sender = if Rails.application.config.action_mailer.smtp_settings
+                           Rails.application.config.action_mailer.smtp_settings[:user_name]
+                         else
+                           'admin@chordsrt.com'
+                         end
 
   # Configure the class responsible to send e-mails.
   # config.mailer = 'Devise::Mailer'