Fix mailer issue

ifmeorg · May 14, 2022 · efc0369 · efc0369
1 parent 1d26279
commit efc0369
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
@@ -5,7 +5,7 @@ class ApplicationMailer < ActionMailer::Base
   include ApplicationMailerHelper
   include NotificationMailerHelper
   include GroupNotificationHelper
-  default from: ENV['SMTP_ADDRESS']
+  default from: ENV['SMTP_FROM']
   layout 'mailer'
   ALLY_NOTIFY_TYPES = %w[new_ally_request accepted_ally_request].freeze
 

diff --git a/app/mailers/banned_mailer.rb b/app/mailers/banned_mailer.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 class BannedMailer < ApplicationMailer
-  default from: ENV['SMTP_ADDRESS']
+  default from: ENV['SMTP_FROM']
 
   def add_ban_email(recipient)
     @recipient = recipient

diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class NotificationMailer < ApplicationMailer
-  default from: ENV['SMTP_ADDRESS']
+  default from: ENV['SMTP_FROM']
 
   def take_medication(reminder)
     return if reminder.medication.blank?

diff --git a/app/mailers/report_mailer.rb b/app/mailers/report_mailer.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 class ReportMailer < ApplicationMailer
-  default from: ENV['SMTP_ADDRESS']
+  default from: ENV['SMTP_FROM']
 
   def reported_email(recipient, reportee)
     @recipient = recipient

diff --git a/config/env/development.example.env b/config/env/development.example.env
@@ -27,7 +27,8 @@ PUSHER_SECRET=""
 PUSHER_CLUSTER=""
 
 # SMTP
-SMTP_ADDRESS="test@test.com"
+SMTP_FROM="test@test.com"
+SMTP_ADDRESS=""
 SMTP_PORT=""
 SMTP_USER_NAME=""
 SMTP_PASSWORD=""

diff --git a/config/env/test.example.env b/config/env/test.example.env
@@ -27,7 +27,8 @@ PUSHER_SECRET=""
 PUSHER_CLUSTER=""
 
 # SMTP
-SMTP_ADDRESS="test@test.com"
+SMTP_FROM="test@test.com"
+SMTP_ADDRESS=""
 SMTP_PORT=""
 SMTP_USER_NAME=""
 SMTP_PASSWORD=""

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -12,7 +12,7 @@
   # 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 = ENV['SMTP_ADDRESS']
+  config.mailer_sender = ENV['SMTP_FROM']
 
   # Configure the class responsible to send e-mails.
   config.mailer = 'CustomDeviseMailer'