added dynamic parser idn email domain

internetee · Jun 26, 2024 · 73ed31e · 73ed31e
1 parent d6a1163
commit 73ed31e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,8 +1,6 @@
 class ApplicationController < ActionController::Base
   include Pagy::Backend
 
-  # prepend_before_action :convert_punycode_params
-
   helper_method :turbo_frame_request?
 
   protect_from_forgery with: :exception
@@ -66,12 +64,6 @@ def clear_flash
     flash.clear if turbo_frame_request?
   end
 
-  # def convert_punycode_params
-  #   return unless email = request.params.dig(:user, :email)
-
-  #   request.params[:user][:email] = email.split('@').map { |val| SimpleIDN.to_ascii(val) }.join('@')
-  # end
-
   protected
 
   def authenticate_user!

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
@@ -1,5 +1,6 @@
 class ApplicationMailer < ActionMailer::Base
   before_action :add_smtputf8_header
+  before_action :convert_email_to_punycode
 
   default from: Rails.application.config.customization['email_from_address']
   layout 'mailer'
@@ -9,4 +10,16 @@ class ApplicationMailer < ActionMailer::Base
   def add_smtputf8_header
     headers['SMTPUTF8'] = 'true'
   end
+
+  def convert_email_to_punycode
+    mail.to = Array(mail.to).map { |email| convert_domain_to_punycode(email) }
+    mail.cc = Array(mail.cc).map { |email| convert_domain_to_punycode(email) }
+    mail.bcc = Array(mail.bcc).map { |email| convert_domain_to_punycode(email) }
+  end
+
+  def convert_domain_to_punycode(email)
+    local, domain = email.split('@')
+    domain = SimpleIDN.to_ascii(domain)
+    "#{local}@#{domain}"
+  end
 end