From d3079bb8ee3d38c02110292f2eb991797fd56ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Mon, 4 Jan 2021 13:26:04 +0200 Subject: [PATCH 1/6] Registrant API: Add registrant ident to simplified domains list --- lib/serializers/registrant_api/domain.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/serializers/registrant_api/domain.rb b/lib/serializers/registrant_api/domain.rb index 2359d77c9..64913a7fb 100644 --- a/lib/serializers/registrant_api/domain.rb +++ b/lib/serializers/registrant_api/domain.rb @@ -59,7 +59,8 @@ module Serializers registrant_verification_asked_at: domain.registrant_verification_asked_at, registrar: { name: domain.registrar.name, website: domain.registrar.website }, registrant: { name: domain.registrant.name, id: domain.registrant.uuid, - phone: domain.registrant.phone, email: domain.registrant.email } + phone: domain.registrant.phone, email: domain.registrant.email, + ident: domain.registrant.ident } } end From 64d91c8f83b72992bcb266674530d0d4461e90b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 10:05:52 +0000 Subject: [PATCH 2/6] Bump nokogiri from 1.10.10 to 1.11.0 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.10 to 1.11.0. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.10...v1.11.0) Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2a0bb55b1..5eaa39b5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,7 +264,7 @@ GEM mime-types-data (3.2020.0512) mimemagic (0.3.5) mini_mime (1.0.2) - mini_portile2 (2.4.0) + mini_portile2 (2.5.0) minitest (5.14.2) monetize (1.9.4) money (~> 6.12) @@ -281,8 +281,9 @@ GEM ruby2_keywords (~> 0.0.1) netrc (0.11.0) nio4r (2.5.4) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) + nokogiri (1.11.0) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) nori (2.6.0) omniauth (1.9.1) hashie (>= 3.4.6) @@ -320,6 +321,7 @@ GEM erubis que (~> 0.8) sinatra + racc (1.5.2) rack (2.2.3) rack-oauth2 (1.16.0) activesupport From b534827dc53f68593e14f5178b8e53d251217960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Tue, 5 Jan 2021 15:59:00 +0200 Subject: [PATCH 3/6] Fix ok/inactive state, get disclosable fields strictly from Contact class --- app/models/domain.rb | 2 +- app/models/epp/domain.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/domain.rb b/app/models/domain.rb index 49f18d9db..88fa94fbc 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -574,7 +574,7 @@ class Domain < ApplicationRecord if statuses.empty? && valid? statuses << DomainStatus::OK - elsif (statuses.length > 1 && active?) || !valid? + elsif (statuses.length > 1) || !valid? statuses.delete(DomainStatus::OK) end diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index d8f5f2bb9..6a51b4cfe 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -27,7 +27,7 @@ class Epp::Domain < Domain active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? } # validate registrant here as well - ([registrant] + active_admins + active_techs).each do |x| + ([Contact.find_by(code: registrant.code)] + active_admins + active_techs).each do |x| unless x.valid? add_epp_error('2304', nil, nil, I18n.t(:contact_is_not_valid, value: x.code)) ok = false From f06b597dc46ac66ec8929561feb93b9e972478bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 5 Jan 2021 17:57:43 +0200 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9135d83f..32f0674ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +05.01.2021 +* Ident data to simplified domain list in registrant APO to help with sorting and filtering [#1783](https://github.com/internetee/registry/pull/1783) + 23.12.2020 * fix for REPP logging and registrar portal communication [#1782](https://github.com/internetee/registry/pull/1782) From 47abc172f245e5fc893c34290c531d20aeb60e55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 5 Jan 2021 17:59:24 +0200 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32f0674ef..d5f1421e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ 05.01.2021 * Ident data to simplified domain list in registrant APO to help with sorting and filtering [#1783](https://github.com/internetee/registry/pull/1783) +* Bumped Nokogiri to 1.11.0 [#1785](https://github.com/internetee/registry/pull/1785) 23.12.2020 * fix for REPP logging and registrar portal communication [#1782](https://github.com/internetee/registry/pull/1782) From 3cefaedd4dd2317f171ed321f9c838cf2e8096a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20V=C3=B5hmar?= Date: Tue, 5 Jan 2021 18:34:31 +0200 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5f1421e8..b7e9725fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ 05.01.2021 +* Fixed ok/inactive bug together with disclosed contact atribute handling [#1786](https://github.com/internetee/registry/pull/1786) * Ident data to simplified domain list in registrant APO to help with sorting and filtering [#1783](https://github.com/internetee/registry/pull/1783) * Bumped Nokogiri to 1.11.0 [#1785](https://github.com/internetee/registry/pull/1785)