zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-07 05:05:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1170 from internetee/add-custom-force-delete-from-config

Browse source 
Add custom `From` header for "force delete" email
This commit is contained in:
Timo Võhmar 2019-05-02 16:11:02 +03:00 • committed by GitHub
commit 24cb8f90cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/mailers/domain_delete_mailer.rb
View file

@ -41,7 +41,8 @@ class DomainDeleteMailer < ApplicationMailer
@redemption_grace_period = Setting.redemption_grace_period @redemption_grace_period = Setting.redemption_grace_period
subject = default_i18n_subject(domain_name: domain.name) subject = default_i18n_subject(domain_name: domain.name)
mail(to: domain.primary_contact_emails, mail(from: forced_email_from,
to: domain.primary_contact_emails,
subject: subject, subject: subject,
template_path: 'mailers/domain_delete_mailer/forced', template_path: 'mailers/domain_delete_mailer/forced',
template_name: template_name) template_name: template_name)
@ -52,4 +53,8 @@ class DomainDeleteMailer < ApplicationMailer
def confirmation_url(domain) def confirmation_url(domain)
registrant_domain_delete_confirm_url(domain, token: domain.registrant_verification_token) registrant_domain_delete_confirm_url(domain, token: domain.registrant_verification_token)
end end
def forced_email_from
ENV['action_mailer_force_delete_from'] || self.class.default[:from]
end
end end

2
config/application-example.yml
View file

@ -146,6 +146,7 @@ action_mailer_default_protocol: # default: http
action_mailer_default_host: action_mailer_default_host:
action_mailer_default_port: # default: no port (80) action_mailer_default_port: # default: no port (80)
action_mailer_default_from: # no-reply@example.com action_mailer_default_from: # no-reply@example.com
action_mailer_force_delete_from: # `From` header for `DomainDeleteMailer#forced` email
# Since the keys for staging are absent from the repo, we need to supply them separate for testing. # Since the keys for staging are absent from the repo, we need to supply them separate for testing.
test: test:
@ -155,6 +156,7 @@ test:
auction_api_allowed_ips: '' auction_api_allowed_ips: ''
action_mailer_default_host: 'registry.test' action_mailer_default_host: 'registry.test'
action_mailer_default_from: 'no-reply@registry.test' action_mailer_default_from: 'no-reply@registry.test'
action_mailer_force_delete_from: 'legal@registry.test'
# Airbrake // Errbit: # Airbrake // Errbit:
airbrake_host: "https://your-errbit-host.ee" airbrake_host: "https://your-errbit-host.ee"

2
test/mailers/domain_delete_mailer_test.rb
View file

@ -66,6 +66,7 @@ class DomainDeleteMailerTest < ActiveSupport::TestCase
assert_equal 'shop.test', @domain.name assert_equal 'shop.test', @domain.name
assert_equal 'john@inbox.test', @domain.registrant.email assert_equal 'john@inbox.test', @domain.registrant.email
assert_equal 'jane@mail.test', @domain.admin_contacts.first.email assert_equal 'jane@mail.test', @domain.admin_contacts.first.email
assert_equal 'legal@registry.test', ENV['action_mailer_force_delete_from']
email = DomainDeleteMailer.forced(domain: @domain, email = DomainDeleteMailer.forced(domain: @domain,
registrar: @domain.registrar, registrar: @domain.registrar,
@ -74,6 +75,7 @@ class DomainDeleteMailerTest < ActiveSupport::TestCase
.first).deliver_now .first).deliver_now
assert_emails 1 assert_emails 1
assert_equal ['legal@registry.test'], email.from
assert_equal %w[jane@mail.test john@inbox.test], email.to assert_equal %w[jane@mail.test john@inbox.test], email.to
assert_equal 'Domeen shop.test on kustutusmenetluses' \ assert_equal 'Domeen shop.test on kustutusmenetluses' \
' / Domain shop.test is in deletion process' \ ' / Domain shop.test is in deletion process' \