From c303159c637b3d97a30a7c46db66f7572cddfb6d Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Wed, 23 Oct 2024 10:46:53 +0300 Subject: [PATCH] adjust email interceptor --- lib/action_mailer_configs_interceptor.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/action_mailer_configs_interceptor.rb b/lib/action_mailer_configs_interceptor.rb index 0eeddfa7..bc2adcfd 100644 --- a/lib/action_mailer_configs_interceptor.rb +++ b/lib/action_mailer_configs_interceptor.rb @@ -29,14 +29,16 @@ module ActionMailerConfigsInterceptor return message end - email_configs = EncryptedConfig.find_by(key: EncryptedConfig::EMAIL_SMTP_KEY) + unless Docuseal.multitenant? + email_configs = EncryptedConfig.find_by(key: EncryptedConfig::EMAIL_SMTP_KEY) - if email_configs - message.delivery_method(:smtp, build_smtp_configs_hash(email_configs)) + if email_configs + message.delivery_method(:smtp, build_smtp_configs_hash(email_configs)) - message.from = %("#{email_configs.account.name.to_s.delete('"')}" <#{email_configs.value['from_email']}>) - else - message.delivery_method(:test) + message.from = %("#{email_configs.account.name.to_s.delete('"')}" <#{email_configs.value['from_email']}>) + else + message.delivery_method(:test) + end end message