From 192ccf4541cea1ead74849e991eb48a87b7b4876 Mon Sep 17 00:00:00 2001
From: Wilfried Hounyo <wilfried.hounyo@gmail.com>
Date: Sat, 18 Nov 2017 22:30:11 -0500
Subject: [PATCH] Update smtp_settings

---
 config/environments/development.rb   |  8 ++++++--
 config/environments/production.rb    |  7 +++++--
 config/environments/test.rb          |  4 ++++
 config/initializers/mailer_config.rb |  9 +++++++++
 config/mailer_config.rb              | 11 -----------
 5 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 config/initializers/mailer_config.rb
 delete mode 100644 config/mailer_config.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 0671d00..f12c516 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -31,6 +31,12 @@
 
   config.action_mailer.perform_caching = false
 
+  config.action_mailer.default charset: "utf-8"
+  config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.delivery_method = :smtp
+
+  config.action_mailer.default_options = { from: "no-reply@#{ENV['APP_DOMAIN']}" }
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
@@ -44,8 +50,6 @@
 
   # Suppress logger output for asset requests.
   config.assets.quiet = true
-  config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
-
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5d34ef5..b6277ad 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -61,11 +61,14 @@
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "learn_it_#{Rails.env}"
   config.action_mailer.perform_caching = false
+  config.action_mailer.default charset: "utf-8"
   config.action_mailer.default_url_options = { host: ENV['APP_DOMAIN'] }
-
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_options = { from: "no-reply@#{ENV['APP_DOMAIN']}" }
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation cannot be found).
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 816ed9c..59cd470 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -36,7 +36,11 @@
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+  config.action_mailer.default charset: "utf-8"
   config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+  config.action_mailer.perform_deliveries = true
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_options = { from: "no-reply@#{ENV['APP_DOMAIN']}" }
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
new file mode 100644
index 0000000..c55d46b
--- /dev/null
+++ b/config/initializers/mailer_config.rb
@@ -0,0 +1,9 @@
+ActionMailer::Base.smtp_settings = {
+  address:              ENV["SMTP_ADDRESS"],
+  port:                 587,
+  domain:               ENV["APP_DOMAIN"],
+  user_name:            ENV["MAILER_USERNAME"].present? ? ENV["MAILER_USERNAME"] : ENV["SENDGRID_USERNAME"],
+  password:             ENV["MAILER_PASSWORD"].present? ? ENV["MAILER_PASSWORD"] : ENV["SENDGRID_PASSWORD"],
+  authentication:       :plain,
+  enable_starttls_auto: true
+}
diff --git a/config/mailer_config.rb b/config/mailer_config.rb
deleted file mode 100644
index a6429e2..0000000
--- a/config/mailer_config.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Rails.application.configure do
-  config.action_mailer.smtp_settings = {
-    address:              ENV["SMTP_ADDRESS"],
-    port:                 587,
-    domain:               ENV["APP_DOMAIN"],
-    user_name:            ENV["MAILER_USERNAME"],
-    password:             ENV["MAILER_PASSWORD"],
-    authentication:       :plain,
-    enable_starttls_auto: true
-  }
-end