From 532b9039d20f808af0dd294380e9cec0fe27b4be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergei=20Ts=C3=B5ganov?= Date: Wed, 12 Oct 2022 10:44:15 +0300 Subject: [PATCH] Modified files after rebase --- config/application.yml.sample | 3 +++ config/initializers/truemail.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config/application.yml.sample b/config/application.yml.sample index acc5ab6b4..5a92443c4 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -182,6 +182,9 @@ tara_rant_secret: 'secret' tara_rant_redirect_uri: 'redirect_uri' default_email_validation_type: 'mx' +# You can predefine regex only validation for domains (i.e. 'somedomain.com, otherdomain.com'): +regex_only_email_validations: '' + default_connection_timeout: '1' default_response_timeout: '1' diff --git a/config/initializers/truemail.rb b/config/initializers/truemail.rb index fd5a803ca..7a6a2256c 100644 --- a/config/initializers/truemail.rb +++ b/config/initializers/truemail.rb @@ -48,6 +48,9 @@ Truemail.configure do |config| # And all of validations for 'otherdomain.com' will be processed with mx validation only. # It is equal to empty hash by default. # config.validation_type_for = { 'somedomain.com' => :regex, 'otherdomain.com' => :mx } + config.validation_type_for = ENV['regex_only_email_validations'].split(/,/) + .collect { |d| [d.strip, :regex] } + .to_h # Optional parameter. Validation of email which contains whitelisted domain always will # return true. Other validations will not processed even if it was defined in validation_type_for