Merge branch '107192666-ds-key-data-dnssec' of http://github.com/internetee/registry into staging

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

@@ -61,19 +61,34 @@ xml.epp_head do
     end
 
     xml.extension do
+      def tag_key_data(xml, key)
+        xml.tag!('secDNS:keyData') do
+          xml.tag!('secDNS:flags', key.flags)
+          xml.tag!('secDNS:protocol', key.protocol)
+          xml.tag!('secDNS:alg', key.alg)
+          xml.tag!('secDNS:pubKey', key.public_key)
+        end
+      end
+
+      def tag_ds_data(xml, key)
+        xml.tag!('secDNS:dsData') do
+          xml.tag!('secDNS:keyTag', key.ds_key_tag)
+          xml.tag!('secDNS:alg', key.ds_alg)
+          xml.tag!('secDNS:digestType', key.ds_digest_type)
+          xml.tag!('secDNS:digest', key.ds_digest)
+          tag_key_data(xml, key) if key.public_key.present?
+        end
+      end
+
       xml.tag!('secDNS:infData', 'xmlns:secDNS' => 'urn:ietf:params:xml:ns:secDNS-1.1') do
-        @domain.dnskeys.sort.each do |key|
+        # might not have ds in first key? maybe check any? k.ds_digest if requirements change (DS not accepted by EIS)
-          xml.tag!('secDNS:dsData') do
+        if @domain.dnskeys[0].ds_digest.blank?
-            xml.tag!('secDNS:keyTag', key.ds_key_tag)
+          @domain.dnskeys.sort.each do |key|
-            xml.tag!('secDNS:alg', key.ds_alg)
+            tag_key_data(xml, key)
-            xml.tag!('secDNS:digestType', key.ds_digest_type)
+          end
-            xml.tag!('secDNS:digest', key.ds_digest)
+        else
-            xml.tag!('secDNS:keyData') do
+          @domain.dnskeys.sort.each do |key|
-              xml.tag!('secDNS:flags', key.flags)
+            tag_ds_data(xml, key)
-              xml.tag!('secDNS:protocol', key.protocol)
-              xml.tag!('secDNS:alg', key.alg)
-              xml.tag!('secDNS:pubKey', key.public_key)
-            end
           end
         end
       end

app/views/registrar/domains/partials/_dnskeys.haml

@@ -19,7 +19,22 @@
         - if x.css('digest').text.present?
           %dt= t(:ds_digest)
           %dd= x.css('digest').text
+        - @data.css('keyData').each do |x|
+          %dl.dl-horizontal
+            %dt= t(:flag)
+            %dd= x.css('flags').text
 
+            %dt= t(:protocol)
+            %dd= x.css('protocol').text
+
+            %dt= t(:algorithm)
+            %dd= x.css('alg').text
+
+            %dt= t(:public_key)
+            %dd= x.css('pubKey').text
+
+    - @data.css('keyData').each do |x|
+      %dl.dl-horizontal
         %dt= t(:flag)
         %dd= x.css('flags').text
 
@@ -27,7 +42,7 @@
         %dd= x.css('protocol').text
 
         %dt= t(:algorithm)
-        %dd= x.css('keyData > alg').text
+        %dd= x.css('alg').text
 
         %dt= t(:public_key)
         %dd= x.css('pubKey').text