fix: properly setup mail config in production env

Author: G-Rath

variants/backend-base/config/environments/production.rb

@@ -27,31 +27,37 @@
              config.force_ssl = ENV.fetch("RAILS_FORCE_SSL", "true").downcase != "false"
            RUBY
 
-# TODO: it looks like these options are now spread across the config
-insert_into_file! "config/environments/production.rb",
-                  after: /# config\.action_mailer\.raise_deliv.*\n/ do
-  <<-RUBY
-
-  # Production email config
-  config.action_mailer.raise_delivery_errors = true
-  config.action_mailer.default_url_options = {
-    host: "#{TEMPLATE_CONFIG.production_hostname}",
-    protocol: "https"
-  }
-  config.action_mailer.asset_host = "https://#{TEMPLATE_CONFIG.production_hostname}"
+gsub_file! "config/environments/production.rb",
+           "# config.action_mailer.raise_delivery_errors = false",
+           "config.action_mailer.raise_delivery_errors = true"
 
-  config.action_mailer.smtp_settings = {
-    address: ENV.fetch("SMTP_HOSTNAME"),
-    port: ENV.fetch("SMTP_PORT", 587),
-    enable_starttls_auto: true,
-    user_name: ENV.fetch("SMTP_USERNAME"),
-    password: ENV.fetch("SMTP_PASSWORD"),
-    authentication: "login",
-    domain: "#{TEMPLATE_CONFIG.production_hostname}"
-  }
+gsub_file! "config/environments/production.rb",
+           'config.action_mailer.default_url_options = { host: "example.com" }',
+           "config.action_mailer.default_url_options = { host: \"#{TEMPLATE_CONFIG.production_hostname}\", protocol: \"https\" }"
 
-  RUBY
-end
+gsub_file! "config/environments/production.rb",
+           <<~RUBY
+               # Specify outgoing SMTP server. Remember to add smtp/* credentials via rails credentials:edit.
+               # config.action_mailer.smtp_settings = {
+               #   user_name: Rails.application.credentials.dig(:smtp, :user_name),
+               #   password: Rails.application.credentials.dig(:smtp, :password),
+               #   address: "smtp.example.com",
+               #   port: 587,
+               #   authentication: :plain
+               # }
+             RUBY,
+             <<-RUBY
+               config.action_mailer.asset_host = "https://#{TEMPLATE_CONFIG.production_hostname}"
+               config.action_mailer.smtp_settings = {
+                 address: ENV.fetch("SMTP_HOSTNAME"),
+                 port: ENV.fetch("SMTP_PORT", 587),
+                 enable_starttls_auto: true,
+                 user_name: ENV.fetch("SMTP_USERNAME"),
+                 password: ENV.fetch("SMTP_PASSWORD"),
+                 authentication: "login",
+                 domain: "#{TEMPLATE_CONFIG.production_hostname}"
+               }
+           RUBY
 
 gsub_file! "config/environments/production.rb",
            'ENV.fetch("RAILS_LOG_LEVEL", "info")',

variants/backend-base/config/environments/test.rb

@@ -1,18 +1,22 @@
+gsub_file! "config/environments/test.rb",
+           'config.action_mailer.default_url_options = { host: "example.com" }',
+           'config.action_mailer.default_url_options = { host: "localhost:3000" }'
+
 insert_into_file! \
   "config/environments/test.rb",
   after: /config\.action_mailer\.delivery_method = :test\n/ do
   <<-RUBY
 
   # Ensure mailer works in test
   config.action_mailer.raise_delivery_errors = true
-  config.action_mailer.default_url_options = { host: "localhost:3000" }
   config.action_mailer.asset_host = "http://localhost:3000"
-
-  # Raise an error if we try and look up a missing translation
-  config.i18n.raise_on_missing_translations = true
   RUBY
 end
 
+gsub_file! "config/environments/test.rb",
+           "# config.i18n.raise_on_missing_translations = true",
+           "config.i18n.raise_on_missing_translations = true"
+
 gsub_file! "config/environments/test.rb",
            "config.action_controller.raise_on_missing_callback_actions = true",
            "# config.action_controller.raise_on_missing_callback_actions = true"