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

Fix domain expiration mailer email validation

Browse source
This commit is contained in:
Alex Sherman 2021-03-23 12:50:25 +05:00
parent b5cbb33e1c
commit ab248a641e
7 changed files with 64 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

39
app/mailers/domain_expire_mailer.rb
View file

@ -1,23 +1,23 @@
class DomainExpireMailer < ApplicationMailer
attr_accessor :domain, :registrar
attr_accessor :domain, :registrar, :email
def expired(domain:, registrar:)
process_mail(domain: domain, registrar: registrar, method_name: __method__.to_s)
def expired(domain:, registrar:, email:)
process_mail(domain: domain, registrar: registrar, email: email, method_name: __method__.to_s)
end
def expired_soft(domain:, registrar:)
process_mail(domain: domain, registrar: registrar, method_name: __method__.to_s)
def expired_soft(domain:, registrar:, email:)
process_mail(domain: domain, registrar: registrar, email: email, method_name: __method__.to_s)
end
private
def process_mail(domain:, registrar:, method_name:)
def process_mail(domain:, registrar:, email:, method_name:)
init(domain, registrar)
logger.info("Send DomainExpireMailer##{method_name} email for #{domain.name} (##{domain.id})" \
" to #{recipient(domain).join(', ')}")
" to #{email}")
mail(to: recipient(domain), subject: subject(method_name))
mail(to: email, subject: subject(method_name))
end
def init(domain, registrar)
@ -25,10 +25,6 @@ class DomainExpireMailer < ApplicationMailer
@registrar = registrar_presenter(registrar: registrar)
end
def recipient(domain)
filter_invalid_emails(emails: domain.primary_contact_emails, domain: @domain)
end
def subject(method_name)
I18n.t("domain_expire_mailer.#{method_name}.subject", domain_name: @domain.name)
end
@ -40,23 +36,4 @@ class DomainExpireMailer < ApplicationMailer
def registrar_presenter(registrar:)
RegistrarPresenter.new(registrar: registrar, view: view_context)
end
# Needed because there are invalid emails in the database, which have been imported from legacy app
def filter_invalid_emails(emails:, domain:)
old_validation_type = Truemail.configure.default_validation_type
Truemail.configure.default_validation_type = :regex
results = emails.select do |email|
valid = Truemail.valid?(email)
unless valid
logger.info("Unable to send DomainExpireMailer#expired email for domain #{domain.name} (##{domain.id})" \
" to invalid recipient #{email}")
end
valid
end
Truemail.configure.default_validation_type = old_validation_type
results
end
end