From 87fe23003570e9514f3d1988150b36e0ecf23620 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 7 Sep 2020 16:12:47 +0500 Subject: [PATCH 1/5] Add default email validation type to application.yml --- config/application.yml.sample | 3 +++ config/initializers/truemail.rb | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/application.yml.sample b/config/application.yml.sample index d5753adb6..478af216f 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -156,6 +156,9 @@ lhv_dev_mode: 'false' epp_session_timeout_seconds: '300' +# Email validation setting for Truemail gem. Possible values: 'regex', 'mx', 'smtp' +default_email_validation_type: 'regex' + # Since the keys for staging are absent from the repo, we need to supply them separate for testing. test: payments_seb_bank_certificate: 'test/fixtures/files/seb_bank_cert.pem' diff --git a/config/initializers/truemail.rb b/config/initializers/truemail.rb index f4517fbc0..badc0cc82 100644 --- a/config/initializers/truemail.rb +++ b/config/initializers/truemail.rb @@ -28,7 +28,10 @@ Truemail.configure do |config| # Optional parameter. You can predefine default validation type for # Truemail.validate('email@email.com') call without with-parameter # Available validation types: :regex, :mx, :smtp - if Rails.env.production? + if ENV['default_email_validation_type'].present? && + %w[regex, mx, smtp].include?(ENV['default_email_validation_type']) + config.default_validation_type = ENV['default_email_validation_type'].to_sym + elsif Rails.env.production? config.default_validation_type = :mx else config.default_validation_type = :regex From 5db69a62ee823db40df5fdb4d715bd778d1dfac8 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Fri, 2 Oct 2020 17:26:49 +0500 Subject: [PATCH 2/5] Raise directo gem version to test --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6ba54e871..88c7d4be0 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem 'domain_name' gem 'haml', '~> 5.0' gem 'wkhtmltopdf-binary', '~> 0.12.5.1' -gem 'directo', github: 'internetee/directo', branch: 'master' +gem 'directo', github: 'internetee/directo', branch: '10-fix-vat-vat-code-if-reverse-charge-vat' group :development do # deploy diff --git a/Gemfile.lock b/Gemfile.lock index 1a45ed826..25a182f20 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,8 @@ GIT GIT remote: https://github.com/internetee/directo.git - revision: e4ba54f601d1815fd8782a196788730d47861e86 - branch: master + revision: 9193bd9bcd3ab48a2e25543270b62fb8cb9ff1b2 + branch: 10-fix-vat-vat-code-if-reverse-charge-vat specs: directo (1.0.1) money (~> 6.13) From 2b3dd801cc395f9e1a57c8744cebe3f3bfe20523 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Tue, 6 Oct 2020 12:48:56 +0500 Subject: [PATCH 3/5] Renew directo gem version --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 88c7d4be0..6ba54e871 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ gem 'domain_name' gem 'haml', '~> 5.0' gem 'wkhtmltopdf-binary', '~> 0.12.5.1' -gem 'directo', github: 'internetee/directo', branch: '10-fix-vat-vat-code-if-reverse-charge-vat' +gem 'directo', github: 'internetee/directo', branch: 'master' group :development do # deploy diff --git a/Gemfile.lock b/Gemfile.lock index 25a182f20..4ebedc95c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,8 @@ GIT GIT remote: https://github.com/internetee/directo.git - revision: 9193bd9bcd3ab48a2e25543270b62fb8cb9ff1b2 - branch: 10-fix-vat-vat-code-if-reverse-charge-vat + revision: 711ce2d942456ee830b649b03b7141e903a1d86b + branch: master specs: directo (1.0.1) money (~> 6.13) From 44d9edacbb26b42d8ceea1fbfa1cc3c7ee482446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 6 Oct 2020 12:02:11 +0300 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 873166aed..ec99de6e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +06.10.2020 +* Updated Directo gem to fix vat codes for EU and non-EU clients [#1699](https://github.com/internetee/registry/pull/1699) + 01.10.2020 * Fixed EPP authentication [#1697](https://github.com/internetee/registry/pull/1697) From 285be463da9f00a8724b9569cefec111486e01f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 6 Oct 2020 16:20:22 +0300 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec99de6e4..853a50604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ 06.10.2020 * Updated Directo gem to fix vat codes for EU and non-EU clients [#1699](https://github.com/internetee/registry/pull/1699) +* Email validation level is now configurable [#1675](https://github.com/internetee/registry/pull/1675) 01.10.2020 * Fixed EPP authentication [#1697](https://github.com/internetee/registry/pull/1697)