Merge pull request #423 from internetee/disclose-registrant-org-phone

Add special phone disclosure handling for organizational registrants

Author: vohmar

app/presenters/registrant_presenter.rb

@@ -9,8 +9,7 @@ def email
   end
 
   def phone
-    # publishable_attribute('phone')
-    disclose_data_priv_registrant('phone')
+    registrant_is_org? ? disclose_registrant_org_phone : disclose_data_priv_registrant('phone')
   end
 
   def last_update
@@ -27,6 +26,18 @@ def disclose_attr(attr)
     end
   end
 
+  def disclose_registrant_org_phone
+    phone_disclosed_and_captcha_solved = contact.attribute_disclosed?('phone') && captcha_solved?
+
+    if phone_disclosed_and_captcha_solved || whitelisted_user? || registrant_publishable?
+      contact.send('phone')
+    elsif !contact.attribute_disclosed?('phone')
+      undisclosable_mask
+    else
+      disclosable_mask
+    end
+  end
+
   def disclose_data_priv_registrant(attr)
     return contact.send(attr.to_sym) if whitelisted_user?
     return undisclosable_mask unless contact.attribute_disclosed?(attr)

test/integration/whois_records/json_test.rb

@@ -125,7 +125,7 @@ def test_hide_sensitive_data_of_legal_entity_when_captcha_is_unsolved
     response_json = JSON.parse(response.body, symbolize_names: true)
 
     assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:email]
-    assert_equal 'Not Disclosed', response_json[:phone]
+    assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:phone]
 
     expected_admin_contacts = [
       { name: 'Not Disclosed - Visit www.internet.ee for web-based WHOIS',
@@ -233,7 +233,7 @@ def test_hide_sensitive_data_of_legal_entity_when_ip_is_not_in_whitelist
     response_json = JSON.parse(response.body, symbolize_names: true)
 
     assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:email]
-    assert_equal 'Not Disclosed', response_json[:phone]
+    assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:phone]
     assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS',
                  response_json[:registrant_changed]