epics 2.11.0 → 3.0.0.rc1

data/lib/epics/factories/request_factory/v3.rb

@@ -0,0 +1,305 @@
+class Epics::Factories::RequestFactory::V3 < Epics::Factories::RequestFactory::Base
+  def initialize(client)
+    @digest_resolver = Epics::Services::DigestResolver::V3.new
+    @user_signature_handle = Epics::Handlers::UserSignatureHandler::V3.new(client)
+    @crypt_service = Epics::Services::CryptService.new
+    super
+  end
+
+  def create_btd(options = {})
+    auth_signature_handler = Epics::Handlers::AuthSignatureHandler.new(@client.keyring)
+    request_builder.add_container_secured do |xml_builder|
+      xml_builder.add_header do |header_builder|
+        header_builder.add_static do |static_builder|
+          static_builder.add_host_id @client.host_id
+          static_builder.add_random_nonce
+          static_builder.add_timestamp Time.now.utc
+          static_builder.add_partner_id @client.partner_id
+          static_builder.add_user_id @client.user_id
+          static_builder.add_product @client.product_name, @client.locale
+          static_builder.add_order_details do |order_details_builder|
+            add_order_type(order_details_builder, 'BTD')
+            order_details_builder.add_btd_order_params **options
+          end
+          static_builder.add_bank_pubbey_digests(
+            @client.keyring.bank_authentication.version,
+            @digest_resolver.sign_digest(@client.keyring.bank_authentication),
+            @client.keyring.bank_encryption.version,
+            @digest_resolver.sign_digest(@client.keyring.bank_encryption)
+          )
+          static_builder.add_security_medium Epics::Builders::StaticBuilder::SECURITY_MEDIUM_0000
+        end
+        header_builder.add_mutable do |mutable_builder|
+          mutable_builder.add_transaction_phase Epics::Builders::MutableBuilder::PHASE_INITIALIZATION
+        end
+      end
+      xml_builder.add_body
+      auth_signature_handler.handle(xml_builder)
+    end
+  end
+
+  def create_btu(transaction_key, digest, num_segments, options = {})
+    signature_data = @user_signature_handle.handle(digest).to_xml
+    auth_signature_handler = Epics::Handlers::AuthSignatureHandler.new(@client.keyring)
+    request_builder.add_container_secured do |xml_builder|
+      xml_builder.add_header do |header_builder|
+        header_builder.add_static do |static_builder|
+          static_builder.add_host_id @client.host_id
+          static_builder.add_random_nonce
+          static_builder.add_timestamp Time.now.utc
+          static_builder.add_partner_id @client.partner_id
+          static_builder.add_user_id @client.user_id
+          static_builder.add_product @client.product_name, @client.locale
+          static_builder.add_order_details do |order_details_builder|
+            add_order_type(order_details_builder, 'BTU')
+            order_details_builder.add_btu_order_params **options
+          end
+          static_builder.add_bank_pubbey_digests(
+            @client.keyring.bank_authentication.version,
+            @digest_resolver.sign_digest(@client.keyring.bank_authentication),
+            @client.keyring.bank_encryption.version,
+            @digest_resolver.sign_digest(@client.keyring.bank_encryption)
+          )
+          static_builder.add_security_medium Epics::Builders::StaticBuilder::SECURITY_MEDIUM_0000
+          static_builder.add_num_segments num_segments
+        end
+        header_builder.add_mutable do |mutable_builder|
+          mutable_builder.add_transaction_phase Epics::Builders::MutableBuilder::PHASE_INITIALIZATION
+        end
+      end
+      xml_builder.add_body do |body_builder|
+        body_builder.add_data_transfer do |data_transfer_builder|
+          data_transfer_builder.add_data_encryption_info do |data_encryption_info_builder|
+            data_encryption_info_builder.add_encryption_pubkey_digest @client.keyring
+            data_encryption_info_builder.add_transaction_key transaction_key, @client.keyring
+          end
+          data_transfer_builder.add_signature_data signature_data, transaction_key
+          data_transfer_builder.add_data_digest @client.keyring.user_signature.version, digest
+          data_transfer_builder.add_additional_order_info
+        end
+      end
+      auth_signature_handler.handle(xml_builder)
+    end
+  end
+
+  # Client#C52 unzips the response, so the request has to ask for a ZIP container.
+  def create_c52(start_date, end_date, scope: nil, msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'STM',
+      msg_name: 'camt.052',
+      scope: scope,
+      msg_name_version: msg_name_version,
+      container_type: container_type,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+
+  def create_c53(start_date, end_date, scope: nil, msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'EOP',
+      msg_name: 'camt.053',
+      container_type: container_type,
+      scope: scope,
+      msg_name_version: msg_name_version,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+
+  def create_c54(start_date, end_date, scope: nil, msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'REP',
+      msg_name: 'camt.054',
+      scope: scope,
+      msg_name_version: msg_name_version,
+      container_type: container_type,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+
+  def create_sta(start_date, end_date)
+    create_btd(service_name: 'EOP', msg_name: 'mt940', start_date: start_date, end_date: end_date)
+  end
+
+  def create_vmk(start_date, end_date)
+    create_btd(service_name: 'STM', msg_name: 'mt942', start_date: start_date, end_date: end_date)
+  end
+  def create_z52(start_date, end_date, scope: nil, service_option: nil,
+                 msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'STM',
+      msg_name: 'camt.052',
+      scope: scope,
+      service_option: service_option,
+      msg_name_version: msg_name_version,
+      container_type: container_type,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+  def create_z53(start_date, end_date, scope: nil, service_option: nil,
+                 msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'EOP',
+      msg_name: 'camt.053',
+      scope: scope,
+      service_option: service_option,
+      msg_name_version: msg_name_version,
+      container_type: container_type,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+  def create_z54(start_date, end_date, scope: nil, service_option: 'XQRR',
+                 msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'EOP',
+      msg_name: 'camt.054',
+      scope: scope,
+      service_option: service_option,
+      msg_name_version: msg_name_version,
+      container_type: container_type,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+  def create_xek(start_date, end_date, scope: nil, service_option: nil,
+                 msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'EOP',
+      msg_name: 'pdf',
+      scope: scope,
+      service_option: service_option,
+      msg_name_version: msg_name_version,
+      container_type: container_type,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+  def create_z01(start_date, end_date, scope: nil, service_option: 'CH003GEN',
+                 msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'PSR',
+      msg_name: 'pain.002',
+      scope: scope,
+      service_option: service_option,
+      msg_name_version: msg_name_version,
+      container_type: container_type,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+
+  def create_bka(start_date, end_date)
+    create_btd(service_name: 'EOP', scope: 'DE', msg_name: 'camt.053', container_type: 'ZIP', start_date: start_date, end_date: end_date)
+  end
+
+  def create_c5n(start_date, end_date)
+    create_btd(service_name: 'STM', scope: 'DE', service_option: 'SCI', msg_name: 'camt.054', container_type: 'ZIP', start_date: start_date, end_date: end_date)
+  end
+
+  def create_cdz(start_date, end_date)
+    create_btd(service_name: 'REP', scope: 'DE', service_option: 'SDD', msg_name: 'pain.002', container_type: 'ZIP', start_date: start_date, end_date: end_date)
+  end
+
+  def create_crz(start_date, end_date)
+    create_btd(service_name: 'REP', scope: 'DE', service_option: 'SCT', msg_name: 'pain.002', container_type: 'ZIP', start_date: start_date, end_date: end_date)
+  end
+
+  def create_azv(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'XCT', scope: 'DE', msg_name: 'dtazv', filename: 'azv.dtazv.xxx.xml' }.merge(overrides))
+  end
+
+  def create_b2b(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SDD', scope: 'BIL', service_option: 'B2B', msg_name: 'pain.008', filename: 'b2b.pain.008.xxx.xml' }.merge(overrides))
+  end
+
+  def create_ccs(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SCT', scope: 'DE', msg_name: 'pain.001', filename: 'ccs.pain.001.xxx.xml' }.merge(overrides))
+  end
+
+  def create_cds(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SDD', scope: 'BIL', msg_name: 'pain.008', filename: 'cds.pain.008.xxx.xml' }.merge(overrides))
+  end
+
+  def create_c2s(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SDD', scope: 'BIL', msg_name: 'pain.008', filename: 'c2s.pain.008.xxx.xml' }.merge(overrides))
+  end
+
+  def create_ful(*, **)
+    raise Epics::VersionSupportError.new(3.0, 'below')
+  end
+
+  def create_fdl(*, **)
+    raise Epics::VersionSupportError.new(3.0, 'below')
+  end
+
+  def create_cd1(*, **)
+    raise Epics::VersionSupportError.new(3.0, 'below')
+  end
+
+  def create_wss(*, **)
+    raise Epics::VersionSupportError.new(3.0, 'below')
+  end
+
+  def create_xds(*, **)
+    raise Epics::VersionSupportError.new(3.0, 'below')
+  end
+
+  def create_xct(*, **)
+    raise Epics::VersionSupportError.new(3.0, 'below')
+  end
+  def create_zsr(start_date, end_date, scope: 'BIL', service_option: nil,
+                 msg_name_version: nil, container_type: 'ZIP')
+    create_btd(
+      service_name: 'PSR',
+      msg_name: 'pain.002',
+      scope: scope,
+      service_option: service_option,
+      msg_name_version: msg_name_version,
+      container_type: container_type,
+      start_date: start_date,
+      end_date: end_date
+    )
+  end
+
+  def create_cct(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SCT', scope: 'DE', msg_name: 'pain.001', filename: 'cct.pain.001.xxx.xml' }.merge(overrides))
+  end
+
+  def create_cdd(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SDD', scope: 'DE', msg_name: 'pain.008', service_option: 'COR', filename: 'cdd.pain.008.xxx.xml' }.merge(overrides))
+  end
+
+  def create_cdb(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SDD', msg_name: 'pain.008', service_option: 'B2B', filename: 'cdb.pain.008.xxx.xml' }.merge(overrides))
+  end
+
+  def create_cip(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SCI', msg_name: 'pain.001', filename: 'cip.pain.001.xxx.xml' }.merge(overrides))
+  end
+
+  def create_xe2(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'MCT', msg_name: 'pain.001', filename: 'xe2.pain.001.xxx.xml' }.merge(overrides))
+  end
+
+  def create_xe3(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'SDD', msg_name: 'pain.008', filename: 'xe3.pain.008.xxx.xml' }.merge(overrides))
+  end
+
+  def create_yct(digest, transaction_key, **overrides)
+    create_btu(transaction_key, digest, 1, **{ service_name: 'MCT', scope: 'BIL', msg_name: 'pain.001', filename: 'yct.pain.001.xxx.xml' }.merge(overrides))
+  end
+
+  protected
+
+  def xml_builder
+    Epics::Builders::XmlBuilder::V3.new
+  end
+
+  def add_order_type(order_details_builder, order_type, with_es = false)
+    order_details_builder.add_admin_order_type order_type
+  end
+end

data/lib/epics/factories/request_factory.rb

@@ -0,0 +1,8 @@
+module Epics::Factories::RequestFactory
+end
+
+require 'epics/factories/request_factory/base'
+require 'epics/factories/request_factory/v2'
+require 'epics/factories/request_factory/v24'
+require 'epics/factories/request_factory/v25'
+require 'epics/factories/request_factory/v3'

data/lib/epics/factories.rb

@@ -0,0 +1,5 @@
+module Epics::Factories
+end
+
+require 'epics/factories/crypt'
+require 'epics/factories/request_factory'

data/lib/epics/fdl.rb

@@ -1,23 +1,8 @@
 # frozen_string_literal: true
 
 class Epics::FDL < Epics::GenericRequest
-  def header
-    fdl_order_params = Hash.new.tap do |params|
-      params[:DateRange] = {
-        Start: options[:from],
-        End: options[:to],
-      } if options[:from] && options[:to]
-      params[:FileFormat] = options[:file_format]
-    end
-
-    client.header_request.build(
-      nonce: nonce,
-      timestamp: timestamp,
-      order_type: 'FDL',
-      order_attribute: 'DZHNN',
-      order_id: 'A00A',
-      custom_order_params: { FDLOrderParams: fdl_order_params },
-      mutable: { TransactionPhase: 'Initialisation' }
-    )
+  def to_xml
+    builder = request_factory.create_fdl(options[:file_format], options[:from], options[:to])
+    builder.to_xml
   end
 end

data/lib/epics/ful.rb

@@ -1,18 +1,6 @@
-# frozen_string_literal: true
-
 class Epics::FUL < Epics::GenericUploadRequest
-  def header
-    ful_order_params = Hash.new.tap do |params|
-      params[:FileFormat] = options[:file_format]
-    end
-
-    client.header_request.build(
-      nonce: nonce,
-      timestamp: timestamp,
-      order_type: 'FUL',
-      order_attribute: 'DZHNN',
-      custom_order_params: { FULOrderParams: ful_order_params },
-      mutable: { TransactionPhase: 'Initialisation' }
-    )
+  def to_xml
+    builder = request_factory.create_ful(document_digest, transaction_key, file_format: options[:file_format])
+    builder.to_xml
   end
 end

data/lib/epics/generic_request.rb

@@ -8,115 +8,54 @@ class Epics::GenericRequest
     @options = options
   end
 
-  def nonce
-    SecureRandom.hex(16)
+  def request_factory
+    @request_factory ||= case client.version
+    when Epics::Keyring::VERSION_25
+      Epics::Factories::RequestFactory::V25.new(client)
+    when Epics::Keyring::VERSION_24
+      Epics::Factories::RequestFactory::V24.new(client)
+    when Epics::Keyring::VERSION_30
+      Epics::Factories::RequestFactory::V3.new(client)
+    end
   end
 
-  def timestamp
-    Time.now.utc.iso8601
+  def order_data_handle
+    @order_data_handle ||= case client.version
+    when Epics::Keyring::VERSION_25
+      Epics::Handlers::OrderDataHandler::V25.new(client)
+    when Epics::Keyring::VERSION_24
+      Epics::Handlers::OrderDataHandler::V24.new(client)
+    when Epics::Keyring::VERSION_30
+      Epics::Handlers::OrderDataHandler::V3.new(client)
+    end
   end
 
-  def_delegators :client, :host_id, :user_id, :partner_id
-
-  def root
-    "ebicsRequest"
+  # BTF service parameters for the request, i.e. everything but the date range.
+  # Compacted so unset options fall through to the factory defaults.
+  def service_options
+    options.except(:from, :to).compact
   end
 
-  def body
-    Nokogiri::XML::Builder.new do |xml|
-      xml.body
-    end.doc.root
+  def nonce
+    SecureRandom.hex(16)
   end
 
-  def header
-    raise NotImplementedError
+  def timestamp
+    Time.now.utc.iso8601
   end
 
-  def auth_signature
-    Nokogiri::XML::Builder.new do |xml|
-      xml.AuthSignature{
-        xml.send('ds:SignedInfo') {
-          xml.send('ds:CanonicalizationMethod', '', Algorithm: "http://www.w3.org/TR/2001/REC-xml-c14n-20010315")
-          xml.send('ds:SignatureMethod', '', Algorithm: "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256")
-          xml.send('ds:Reference', '', URI: "#xpointer(//*[@authenticate='true'])") {
-            xml.send('ds:Transforms') {
-              xml.send('ds:Transform', '', Algorithm: "http://www.w3.org/TR/2001/REC-xml-c14n-20010315")
-            }
-            xml.send('ds:DigestMethod', '', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256")
-            xml.send('ds:DigestValue', '')
-          }
-        }
-        xml.send('ds:SignatureValue', '')
-      }
-    end.doc.root
-  end
+  def_delegators :client, :host_id, :user_id, :partner_id
 
   def to_transfer_xml
-    Nokogiri::XML::Builder.new do |xml|
-      xml.send(root, 'xmlns:ds' => 'http://www.w3.org/2000/09/xmldsig#', 'xmlns' => 'urn:org:ebics:H004', 'Version' => 'H004', 'Revision' => '1') {
-        xml.header(authenticate: true) {
-          xml.static {
-            xml.HostID host_id
-            xml.TransactionID transaction_id
-          }
-          xml.mutable {
-            xml.TransactionPhase 'Transfer'
-            xml.SegmentNumber(1, lastSegment: true)
-          }
-        }
-        xml.parent.add_child(auth_signature)
-        xml.body {
-          xml.DataTransfer {
-            xml.OrderData encrypted_order_data
-          }
-        }
-      }
-    end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML, encoding: 'utf-8')
+    raise NotImplementedError
   end
 
   def to_receipt_xml
-    Nokogiri::XML::Builder.new do |xml|
-      xml.send(root, 'xmlns:ds' => 'http://www.w3.org/2000/09/xmldsig#', 'xmlns' => 'urn:org:ebics:H004', 'Version' => 'H004', 'Revision' => '1') {
-        xml.header(authenticate: true) {
-          xml.static {
-            xml.HostID host_id
-            xml.TransactionID(transaction_id)
-          }
-          xml.mutable {
-            xml.TransactionPhase 'Receipt'
-          }
-        }
-        xml.parent.add_child(auth_signature)
-        xml.body {
-          xml.TransferReceipt(authenticate: true) {
-            xml.ReceiptCode 0
-          }
-        }
-      }
-    end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML, encoding: 'utf-8')
+    builder = request_factory.create_transfer_receipt(transaction_id, 0)
+    builder.to_xml
   end
 
   def to_xml
-    Nokogiri::XML::Builder.new do |xml|
-      xml.send(root, 'xmlns:ds' => 'http://www.w3.org/2000/09/xmldsig#', 'xmlns' => 'urn:org:ebics:H004', 'Version' => 'H004', 'Revision'=> '1') {
-        xml.parent.add_child(header)
-        xml.parent.add_child(auth_signature)
-        xml.parent.add_child(body)
-      }
-    end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML, encoding: 'utf-8')
-  end
-  
-  private
-  
-  def x509_data_xml(xml, x_509_certificate)
-    return unless x_509_certificate
-    
-    xml.send('ds:X509Data') do
-      xml.send('ds:X509IssuerSerial') do
-        xml.send('ds:X509IssuerName', x_509_certificate.issuer)
-        xml.send('ds:X509SerialNumber', x_509_certificate.version)
-      end
-      xml.send('ds:X509Certificate', x_509_certificate.data)
-    end
+    raise NotImplementedError
   end
 end

data/lib/epics/generic_upload_request.rb

@@ -1,80 +1,27 @@
 class Epics::GenericUploadRequest < Epics::GenericRequest
-  attr_accessor :key
-  attr_accessor :iv
-  attr_accessor :document
+  attr_reader :document, :transaction_key
 
   def initialize(client, document, **options)
     super(client, **options)
     self.document = document
-    self.key = cipher.random_key
-    self.iv = 0.chr * cipher.iv_len
+    aes_factory = Epics::Factories::Crypt::AesFactory.new
+    aes = aes_factory.create
+    @transaction_key = aes.key
+    @crypt_service = Epics::Services::CryptService.new
   end
 
-  def cipher
-    @cipher ||= OpenSSL::Cipher.new("aes-128-cbc").tap { |cipher| cipher.encrypt }
+  # Normalized on the way in so the bytes hashed for the electronic signature are the
+  # bytes transmitted.
+  def document=(value)
+    @document = value.gsub(/\n|\r/, '')
   end
 
-  def digester
-    @digester ||= OpenSSL::Digest::SHA256.new
+  def document_digest
+    @crypt_service.hash(document)
   end
 
-  def body
-    Nokogiri::XML::Builder.new do |xml|
-      xml.body {
-        xml.DataTransfer {
-          xml.DataEncryptionInfo(authenticate: true) {
-            xml.EncryptionPubKeyDigest(client.bank_e.public_digest, Version: 'E002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256")
-            xml.TransactionKey Base64.encode64(client.bank_e.key.public_encrypt(self.key)).gsub(/\n/,'')
-          }
-          xml.SignatureData(encrypted_order_signature, authenticate: true)
-        }
-      }
-    end.doc.root
+  def to_transfer_xml
+    builder = request_factory.create_transfer_upload(transaction_id, transaction_key, document, 1, true)
+    builder.to_xml
   end
-
-  def order_signature
-    Nokogiri::XML::Builder.new do |xml|
-      xml.UserSignatureData('xmlns' => 'http://www.ebics.org/S001', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation' => 'http://www.ebics.org/S001 http://www.ebics.org/S001/ebics_signature.xsd') {
-        xml.OrderSignatureData {
-          xml.SignatureVersion "A006"
-          xml.SignatureValue signature_value
-          xml.PartnerID partner_id
-          xml.UserID user_id
-        }
-      }
-    end.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML, encoding: 'utf-8')
-  end
-
-  def signature_value
-    client.a.sign( digester.digest(document.gsub(/\n|\r/, "")) )
-  end
-
-  def encrypt(d)
-    cipher.reset
-    cipher.padding = 0
-    cipher.key = self.key
-    cipher.iv = self.iv
-    (cipher.update(pad(d)) + cipher.final)
-  end
-
-  def encrypted_order_data
-    dst = Zlib::Deflate.deflate(document)
-
-    Base64.encode64(encrypt(dst)).gsub(/\n/,'')
-  end
-
-  def encrypted_order_signature
-    dst = Zlib::Deflate.deflate(order_signature)
-
-    Base64.encode64(encrypt(dst)).gsub(/\n/,'')
-  end
-
-  def pad(d)
-    len = cipher.block_size*((d.size / cipher.block_size)+1)
-
-    d.ljust(len, [0].pack("C*")).tap do |padded|
-      padded[-1] = [len - d.size].pack("C*")
-    end
-  end
-
 end

data/lib/epics/haa.rb

@@ -1,12 +1,6 @@
 class Epics::HAA < Epics::GenericRequest
-  def header
-    client.header_request.build(
-      nonce: nonce,
-      timestamp: timestamp,
-      order_type: 'HAA',
-      order_attribute: 'DZHNN',
-      order_params: {},
-      mutable: { TransactionPhase: 'Initialisation' }
-    )
+  def to_xml
+    builder = request_factory.create_haa
+    builder.to_xml
   end
 end

data/lib/epics/hac.rb

@@ -2,19 +2,8 @@ class Epics::HAC < Epics::GenericRequest
   # By default HAC only returns data for transactions which have not yet been fetched. Therefore,
   # most applications not not have to specify a date range, but can simply fetch the status and
   # be done
-  def header
-    client.header_request.build(
-      nonce: nonce,
-      timestamp: timestamp,
-      order_type: 'HAC',
-      order_attribute: 'DZHNN',
-      order_params: !!options[:from] && !!options[:to] ? {
-        DateRange: {
-          Start: options[:from],
-          End: options[:to]
-        }
-      } : {},
-      mutable: { TransactionPhase: 'Initialisation' }
-    )
+  def to_xml
+    builder = request_factory.create_hac(options[:from], options[:to])
+    builder.to_xml
   end
 end