Change SMTP provider (#156)

CodiTramuntana · Feb 20, 2024 · 02e27d1 · 02e27d1
1 parent d737ad8
commit 02e27d1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 36 deletions.
diff --git a/config/environments/integration.rb b/config/environments/integration.rb
@@ -88,17 +88,6 @@
     openssl_verify_mode: "none"
   }
 
-  if Rails.application.secrets.sendgrid
-    config.action_mailer.default_options = {
-      "X-SMTPAPI" => {
-        filters: {
-          clicktrack: { settings: { enable: 0 } },
-          opentrack: { settings: { enable: 0 } }
-        }
-      }.to_json
-    }
-  end
-
   # Use a different logger for distributed setups.
   # require 'syslog/logger'
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -82,17 +82,6 @@
     openssl_verify_mode: "none"
   }
 
-  if Rails.application.secrets.sendgrid
-    config.action_mailer.default_options = {
-      "X-SMTPAPI" => {
-        filters: {
-          clicktrack: { settings: { enable: 0 } },
-          opentrack: { settings: { enable: 0 } }
-        }
-      }.to_json
-    }
-  end
-
   # Use a different logger for distributed setups.
   # require 'syslog/logger'
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')

diff --git a/config/initializers/figaro.rb b/config/initializers/figaro.rb
@@ -5,7 +5,7 @@
   keys = %w(SECRET_KEY_BASE)
   unless env.development? || env.test?
     keys += %w(DB_DATABASE DB_PASSWORD DB_USERNAME)
-    keys += %w(SENDGRID_USERNAME SENDGRID_PASSWORD)
+    keys += %w(MAILER_SMTP_ADDRESS MAILER_SMTP_DOMAIN MAILER_SMTP_PORT MAILER_SMTP_USER_NAME MAILER_SMTP_PASSWORD)
     keys += %w(GEOCODER_LOOKUP_API_KEY)
     keys += %w(SANT_BOI_CENSUS_URL SANT_BOI_CENSUS_SECRET SANT_BOI_CENSUS_USER SANT_BOI_CENSUS_PASSWORD SANT_BOI_CENSUS_DBOID)
   end

diff --git a/config/secrets.yml b/config/secrets.yml
@@ -138,8 +138,8 @@ development:
   smtp_address: <%= ENV["MAILER_SMTP_ADDRESS"] %>
   smtp_domain: <%= ENV["MAILER_SMTP_DOMAIN"] %>
   smtp_port: <%= ENV["MAILER_SMTP_PORT"] %>
-  smtp_starttls_auto: false
-  smtp_authentication: "login"
+  smtp_starttls_auto: true
+  smtp_authentication: "plain"
 
 test:
   <<: *default
@@ -155,28 +155,26 @@ test:
 integration:
   <<: *default
   secret_key_base: <%= ENV['SECRET_KEY_BASE'] %>
-  sendgrid: <%= !ENV["SENDGRID_USERNAME"].blank? %>
   smtp_username: <%= ENV["MAILER_SMTP_USER_NAME"] %>
   smtp_password: <%= ENV["MAILER_SMTP_PASSWORD"] %>
   smtp_address: <%= ENV["MAILER_SMTP_ADDRESS"] %>
   smtp_domain: <%= ENV["MAILER_SMTP_DOMAIN"] %>
   smtp_port: <%= ENV["MAILER_SMTP_PORT"] %>
-  smtp_starttls_auto: false
-  smtp_authentication: "login"
+  smtp_starttls_auto: true
+  smtp_authentication: "plain"
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
   <<: *default
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
-  sendgrid: <%= !ENV["SENDGRID_USERNAME"].blank? %>
-  smtp_username: <%= ENV["MAILER_SMTP_USER_NAME"] || ENV["SENDGRID_USERNAME"] %>
-  smtp_password: <%= ENV["MAILER_SMTP_PASSWORD"] || ENV["SENDGRID_PASSWORD"] %>
-  smtp_address: <%= ENV["MAILER_SMTP_ADDRESS"] || "smtp.sendgrid.net" %>
-  smtp_domain: <%= ENV["MAILER_SMTP_DOMAIN"] || "heroku.com" %>
-  smtp_port: <%= ENV["MAILER_SMTP_PORT"] || "587" %>
-  smtp_starttls_auto: false
-  smtp_authentication: "login"
+  smtp_username: <%= ENV["MAILER_SMTP_USER_NAME"] %>
+  smtp_password: <%= ENV["MAILER_SMTP_PASSWORD"] %>
+  smtp_address: <%= ENV["MAILER_SMTP_ADDRESS"] %>
+  smtp_domain: <%= ENV["MAILER_SMTP_DOMAIN"] %>
+  smtp_port: <%= ENV["MAILER_SMTP_PORT"] %>
+  smtp_starttls_auto: true
+  smtp_authentication: "plain"
   omniauth:
     facebook:
       enabled: false