Views and tests for contact disclosure

app/helpers/epp/contacts_helper.rb

@@ -38,6 +38,8 @@ module Epp::ContactsHelper
   def info_contact
     handle_errors(@contact) and return unless @contact
     handle_errors(@contact) and return unless rights?
+    @disclosure = @contact.disclosure
+    @owner = owner?(false)
     render 'epp/contacts/info'
   end
 
@@ -54,14 +56,10 @@ module Epp::ContactsHelper
   def validate_contact_create_request
     @ph = params_hash['epp']['command']['create']['create']
     return false unless validate_params
-    # xml_attrs_present?(@ph, [%w(postalInfo)])
     xml_attrs_present?(@ph, [%w(postalInfo name), %w(postalInfo addr city), %w(postalInfo addr cc),
                              %w(ident), %w(voice), %w(email)])
 
-    epp_errors.empty? # unless @ph['postalInfo'].is_a?(Hash) || @ph['postalInfo'].is_a?(Array)
-
-    # (epp_errors << Address.validate_postal_info_types(parsed_frame)).flatten!
-    # xml_attrs_array_present?(@ph['postalInfo'], [%w(name), %w(addr city), %w(addr cc)])
+    epp_errors.empty?
   end
 
   ## UPDATE
@@ -118,10 +116,10 @@ module Epp::ContactsHelper
     contact
   end
 
-  def owner?
+  def owner?(with_errors = true)
     return false unless find_contact
-    # return true if current_epp_user.registrar == find_contact.created_by.try(:registrar)
     return true if @contact.registrar == current_epp_user.registrar
+    return false unless with_errors
     epp_errors << { code: '2201', msg: t('errors.messages.epp_authorization_error') }
     false
   end
@@ -132,14 +130,14 @@ module Epp::ContactsHelper
     return true if current_epp_user.try(:registrar) == @contact.try(:registrar)
     return true if pw && @contact.auth_info_matches(pw) # @contact.try(:auth_info_matches, pw)
 
-    epp_errors << { code: '2201', msg: t('errors.messages.epp_authorization_error'), value: { obj: 'pw', val: pw } }
+    epp_errors << { code: '2200', msg: t('errors.messages.epp_authentication_error') }
     false
   end
 
   def update_rights?
     pw = @ph.try(:[], :authInfo).try(:[], :pw)
     return true if pw && @contact.auth_info_matches(pw)
-    epp_errors << { code: '2201', msg: t('errors.messages.epp_authorization_error'), value: { obj: 'pw', val: pw } }
+    epp_errors << { code: '2200', msg: t('errors.messages.epp_authentication_error') }
     false
   end
 

app/models/contact.rb

@@ -5,7 +5,7 @@ class Contact < ActiveRecord::Base
   include EppErrors
 
   has_one :address, dependent: :destroy
-  has_one :disclosure, class_name: 'ContactDisclosure'
+  has_one :disclosure, class_name: 'ContactDisclosure', dependent: :destroy
 
   has_many :domain_contacts
   has_many :domains, through: :domain_contacts

app/views/epp/contacts/_postal_info.xml.builder

@@ -1,15 +1,13 @@
 address = @contact.address
 xml.tag!('contact:postalInfo', type: 'int') do
-  xml.tag!('contact:name', @contact.name)# if @contact.disclosure.try(:int_name)
-  xml.tag!('contact:org', @contact.org_name)# if @contact.disclosure.try(:int_org_name)
-  #if @contact.disclosure.try(:int_addr)
-  xml.tag!('contact:addr') do
-    xml.tag!('contact:street', address.street) if address
-    #xml.tag!('contact:street', address.street2) if address.street2
-    #xml.tag!('contact:street', address.street3) if address.street3
-    xml.tag!('contact:cc', address.try(:country).try(:iso)) unless address.try(:country).nil?
-    xml.tag!('contact:city', address.city) if address
+  xml.tag!('contact:name', @contact.name) if @disclosure.try(:name) || @owner
+  xml.tag!('contact:org', @contact.org_name) if @disclosure.try(:org_name) || @owner
+  if @disclosure.try(:addr) || @owner
+    xml.tag!('contact:addr') do
+      xml.tag!('contact:street', address.street) if address
+      xml.tag!('contact:cc', address.try(:country).try(:iso)) unless address.try(:country).nil?
+      xml.tag!('contact:city', address.city) if address
+    end
   end
-  #end
 end
 

app/views/epp/contacts/info.xml.builder

@@ -6,22 +6,23 @@ xml.epp_head do
 
     xml.resData do
       xml.tag!('contact:chkData', 'xmlns:contact' => 'urn:ietf:params:xml:ns:contact-1.0') do
-        xml << render('/epp/contacts/postal_info')
         xml.tag!('contact:id', @contact.code)
-        xml.tag!('contact:voice', @contact.phone) #if @contact.disclosure.try(:phone)
-        xml.tag!('contact:fax', @contact.fax) #if @contact.disclosure.try(:fax)
-        xml.tag!('contact:email', @contact.email) #if @contact.disclosure..try(:email)
-        xml.tag!('contact:clID', @current_epp_user.username) if @current_epp_user
-        xml.tag!('contact:crID', @contact.cr_id ) if @contact.cr_id
+        xml << render('/epp/contacts/postal_info')
+        xml.tag!('contact:voice', @contact.phone) if @disclosure.try(:phone) || @owner
+        xml.tag!('contact:fax', @contact.fax) if @disclosure.try(:fax) || @owner
+        xml.tag!('contact:email', @contact.email) if @disclosure.try(:email) || @owner
+        #xml.tag!('contact:clID', @current_epp_user.username) if @current_epp_user
+        #xml.tag!('contact:crID', @contact.cr_id ) if @contact.cr_id
         xml.tag!('contact:crDate', @contact.created_at)
         xml.tag!('contact:upID', @contact.up_id) if @contact.up_id
         xml.tag!('contact:upDate', @contact.updated_at) unless @contact.updated_at == @contact.created_at
         xml.tag!('contact:trDate', '123') if false
-        xml.tag!('contact:authInfo') do
-          xml.tag!('contact:pw', @contact.auth_info) # Doc says we have to return this but is it necessary?
+        if @owner
+          xml.tag!('contact:authInfo') do
+           xml.tag!('contact:pw', @contact.auth_info) # Doc says we have to return this but is it necessary?
+          end
         end
         xml.tag!('contact:disclose', '123') if false
-
       end
     end