epics 1.6.0 → 1.8.1

data/lib/epics.rb

@@ -36,8 +36,10 @@ require "epics/ccs"
 require "epics/cdb"
 require "epics/cdd"
 require "epics/b2b"
+require "epics/xds"
 require "epics/cds"
 require "epics/cdz"
+require "epics/xct"
 require "epics/hia"
 require "epics/ini"
 require "epics/signer"

data/lib/epics/ccs.rb

@@ -1,6 +1,6 @@
 class Epics::CCS < Epics::CCT
   def order_attribute
-    "DZHNN"
+    'DZHNN'
   end
 
   def order_type

data/lib/epics/cct.rb

@@ -1,4 +1,12 @@
 class Epics::CCT < Epics::GenericUploadRequest
+  def order_attribute
+    'OZHNN'
+  end
+
+  def order_type
+    'CCT'
+  end
+
   def header
     Nokogiri::XML::Builder.new do |xml|
       xml.header(authenticate: true) {
@@ -10,8 +18,8 @@ class Epics::CCT < Epics::GenericUploadRequest
           xml.UserID user_id
           xml.Product("EPICS - a ruby ebics kernel", 'Language' => 'de')
           xml.OrderDetails {
-            xml.OrderType 'CCT'
-            xml.OrderAttribute 'OZHNN'
+            xml.OrderType order_type
+            xml.OrderAttribute order_attribute
             xml.StandardOrderParams
           }
           xml.BankPubKeyDigests {

data/lib/epics/client.rb

@@ -127,6 +127,10 @@ class Epics::Client
     upload(Epics::CD1, document)
   end
 
+  def CDB(document)
+    upload(Epics::CDB, document)
+  end
+
   def CDD(document)
     upload(Epics::CDD, document)
   end
@@ -135,6 +139,14 @@ class Epics::Client
     upload(Epics::CDS, document)
   end
 
+  def XDS(document)
+    upload(Epics::XDS, document)
+  end
+
+  def CDZ(document)
+    upload(Epics::CDZ, document)
+  end
+
   def CCT(document)
     upload(Epics::CCT, document)
   end
@@ -143,6 +155,10 @@ class Epics::Client
     upload(Epics::CCS, document)
   end
 
+  def XCT(document)
+    upload(Epics::XCT, document)
+  end
+
   def STA(from = nil, to = nil)
     download(Epics::STA, from, to)
   end
@@ -169,9 +185,9 @@ class Epics::Client
 
   def HTD
     Nokogiri::XML(download(Epics::HTD)).tap do |htd|
-      @iban        ||= htd.at_xpath("//xmlns:AccountNumber[@international='true']", xmlns: "urn:org:ebics:H004").text
-      @bic         ||= htd.at_xpath("//xmlns:BankCode[@international='true']", xmlns: "urn:org:ebics:H004").text
-      @name        ||= htd.at_xpath("//xmlns:Name", xmlns: "urn:org:ebics:H004").text
+      @iban        ||= htd.at_xpath("//xmlns:AccountNumber[@international='true']", xmlns: "urn:org:ebics:H004").text rescue nil
+      @bic         ||= htd.at_xpath("//xmlns:BankCode[@international='true']", xmlns: "urn:org:ebics:H004").text rescue nil
+      @name        ||= htd.at_xpath("//xmlns:Name", xmlns: "urn:org:ebics:H004").text rescue nil
       @order_types ||= htd.search("//xmlns:OrderTypes", xmlns: "urn:org:ebics:H004").map{|o| o.content.split(/\s/) }.delete_if{|o| o == ""}.flatten
     end.to_xml
   end
@@ -231,11 +247,11 @@ class Epics::Client
   end
 
   def connection
-    @connection ||= Faraday.new(headers: {user_agent: "EPICS v#{Epics::VERSION}"}, ssl: { verify: verify_ssl? }) do |faraday|
+    @connection ||= Faraday.new(headers: { 'Content-Type' => 'text/xml', user_agent: "EPICS v#{Epics::VERSION}"}, ssl: { verify: verify_ssl? }) do |faraday|
       faraday.use Epics::XMLSIG, { client: self }
       faraday.use Epics::ParseEbics, { client: self}
+      # faraday.use MyAdapter
       # faraday.response :logger                  # log requests to STDOUT
-      faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
     end
   end
 

data/lib/epics/error.rb

@@ -333,4 +333,4 @@ class Epics::Error < StandardError
     }
   end
 
-end
+end

data/lib/epics/middleware/parse_ebics.rb

@@ -1,15 +1,16 @@
-class Epics::ParseEbics < Faraday::Middleware
+# frozen_string_literal: true
 
+class Epics::ParseEbics < Faraday::Middleware
   def initialize(app = nil, options = {})
     super(app)
     @client = options[:client]
   end
 
   def call(env)
-    @app.call(env).on_complete do |env|
-      env[:body] = ::Epics::Response.new(@client, env[:body])
-      raise Epics::Error::TechnicalError.new(env[:body].technical_code) if env[:body].technical_error?
-      raise Epics::Error::BusinessError.new(env[:body].business_code)  if env[:body].business_error?
+    @app.call(env).on_complete do |response|
+      response.body = ::Epics::Response.new(@client, response.body)
+      raise(Epics::Error::TechnicalError, response.body.technical_code) if response.body.technical_error?
+      raise(Epics::Error::BusinessError, response.body.business_code)   if response.body.business_error?
     end
   end
 end

data/lib/epics/middleware/xmlsig.rb

@@ -6,13 +6,11 @@ class Epics::XMLSIG < Faraday::Middleware
   end
 
   def call(env)
-    @signer = Epics::Signer.new(@client, env["body"])
+    @signer = Epics::Signer.new(@client, env.request_body)
     @signer.digest!
     @signer.sign!
 
-    env["body"] = @signer.doc.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
-
+    env.request_body = @signer.doc.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
     @app.call(env)
   end
-
 end

data/lib/epics/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Epics
-  VERSION = "1.6.0"
+  VERSION = '1.8.1'
 end

data/lib/epics/xct.rb

@@ -0,0 +1,30 @@
+class Epics::XCT < Epics::GenericUploadRequest
+  def header
+    Nokogiri::XML::Builder.new do |xml|
+      xml.header(authenticate: true) {
+        xml.static {
+          xml.HostID host_id
+          xml.Nonce nonce
+          xml.Timestamp timestamp
+          xml.PartnerID partner_id
+          xml.UserID user_id
+          xml.Product("EPICS - a ruby ebics kernel", 'Language' => 'de')
+          xml.OrderDetails {
+            xml.OrderType 'XCT'
+            xml.OrderAttribute 'OZHNN'
+            xml.StandardOrderParams
+          }
+          xml.BankPubKeyDigests {
+            xml.Authentication(client.bank_x.public_digest, Version: 'X002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256")
+            xml.Encryption(client.bank_e.public_digest, Version: 'E002', Algorithm: "http://www.w3.org/2001/04/xmlenc#sha256" )
+          }
+          xml.SecurityMedium '0000'
+          xml.NumSegments 1
+        }
+        xml.mutable {
+          xml.TransactionPhase 'Initialisation'
+        }
+      }
+    end.doc.root
+  end
+end

data/lib/epics/xds.rb

@@ -0,0 +1,5 @@
+class Epics::XDS < Epics::CDD
+  def order_type
+    'XDS'
+  end
+end

data/spec/client_spec.rb

@@ -88,7 +88,7 @@ RSpec.describe Epics::Client do
     end
 
     it 'extracts the accessible order types of a subscriber' do
-      expect(subject.order_types).to match_array(%w(PTK HPD HTD STA HVD HPB HAA HVT HVU HVZ INI SPR PUB HIA HCA HSA HVE HVS CCS CCT CD1 CDD))
+      expect(subject.order_types).to match_array(%w(PTK HPD HTD STA HVD HPB HAA HVT HVU HVZ INI SPR PUB HIA HCA HSA HVE HVS CCS CCT CD1 CDB CDD))
     end
   end
 
@@ -130,6 +130,21 @@ RSpec.describe Epics::Client do
     end
   end
 
+
+  describe '#CDB' do
+    let(:cdb_document) { File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cdb.xml')) }
+    before do
+      stub_request(:post, "https://194.180.18.30/ebicsweb/ebicsweb")
+        .with(:body => %r[<TransactionPhase>Initialisation</TransactionPhase>])
+        .to_return(status: 200, body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cdb_init_response.xml')))
+      stub_request(:post, "https://194.180.18.30/ebicsweb/ebicsweb")
+        .with(:body => %r[<TransactionPhase>Transfer</TransactionPhase>])
+        .to_return(status: 200, body: File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cdb_transfer_response.xml')))
+    end
+
+    it { expect(subject.CDB(cdb_document)).to eq(["387B7BE88FE33B0F4B60AC64A63F18E2","N00L"]) }
+  end
+
   describe '#CD1' do
     let(:cd1_document) { File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'cd1.xml')) }
     describe 'normal behaviour' do
@@ -182,6 +197,16 @@ RSpec.describe Epics::Client do
     it 'sets @order_types' do
       expect { subject.HTD }.to change { subject.instance_variable_get("@order_types") }
     end
+
+    describe 'without iban' do
+      before do
+        allow(subject).to receive(:download).and_return( File.read(File.join(File.dirname(__FILE__), 'fixtures', 'xml', 'htd_order_data_without_names.xml')))
+      end
+
+      it 'sets @iban' do
+        expect(subject.iban).to be_nil
+      end
+    end
   end
 
   describe '#C53/C52/C54 types with zipped data' do

data/spec/fixtures/xml/cdb.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:pain.008.003.02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:pain.008.003.02 pain.008.003.02.xsd">
+  <CstmrDrctDbtInitn>
+    <GrpHdr>
+      <MsgId>1434018161</MsgId>
+      <CreDtTm>2015-06-11T12:22:41+02:00</CreDtTm>
+      <NbOfTxs>1</NbOfTxs>
+      <CtrlSum>1.12</CtrlSum>
+      <InitgPty>
+        <Nm>Max Musterman</Nm>
+      </InitgPty>
+    </GrpHdr>
+    <PmtInf>
+      <PmtInfId>1434018161/1</PmtInfId>
+      <PmtMtd>DD</PmtMtd>
+      <BtchBookg>true</BtchBookg>
+      <NbOfTxs>1</NbOfTxs>
+      <CtrlSum>1.12</CtrlSum>
+      <PmtTpInf>
+        <SvcLvl>
+          <Cd>SEPA</Cd>
+        </SvcLvl>
+        <LclInstrm>
+          <Cd>B2B</Cd>
+        </LclInstrm>
+        <SeqTp>RCUR</SeqTp>
+      </PmtTpInf>
+      <ReqdColltnDt>2015-06-15</ReqdColltnDt>
+      <Cdtr>
+        <Nm>Max Mustermann</Nm>
+      </Cdtr>
+      <CdtrAcct>
+        <Id>
+          <IBAN>DE89370400440532013000</IBAN>
+        </Id>
+      </CdtrAcct>
+      <CdtrAgt>
+        <FinInstnId>
+          <BIC>COBADEFFXXX</BIC>
+        </FinInstnId>
+      </CdtrAgt>
+      <ChrgBr>SLEV</ChrgBr>
+      <CdtrSchmeId>
+        <Id>
+          <PrvtId>
+            <Othr>
+              <Id>DE98ZZZ09999999999</Id>
+              <SchmeNm>
+                <Prtry>SEPA</Prtry>
+              </SchmeNm>
+            </Othr>
+          </PrvtId>
+        </Id>
+      </CdtrSchmeId>
+      <DrctDbtTxInf>
+        <PmtId>
+          <EndToEndId>86</EndToEndId>
+        </PmtId>
+        <InstdAmt Ccy="EUR">1.12</InstdAmt>
+        <DrctDbtTx>
+          <MndtRltdInf>
+            <MndtId>M123123</MndtId>
+            <DtOfSgntr>2015-06-01</DtOfSgntr>
+          </MndtRltdInf>
+        </DrctDbtTx>
+        <DbtrAgt>
+          <FinInstnId>
+            <BIC>BKAUATWW</BIC>
+          </FinInstnId>
+        </DbtrAgt>
+        <Dbtr>
+          <Nm>Maria Musterfrau</Nm>
+        </Dbtr>
+        <DbtrAcct>
+          <Id>
+            <IBAN>AT611904300234573201</IBAN>
+          </Id>
+        </DbtrAcct>
+        <RmtInf>
+          <Ustrd>Purpose</Ustrd>
+        </RmtInf>
+      </DrctDbtTxInf>
+    </PmtInf>
+  </CstmrDrctDbtInitn>
+</Document>

data/spec/fixtures/xml/cdb_init_response.xml

@@ -0,0 +1,31 @@
+<ebicsResponse Revision="1" Version="H004" xsi:schemaLocation="urn:org:ebics:H004 ebics_response_H004.xsd" xmlns="urn:org:ebics:H004" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+  <header authenticate="true">
+    <static>
+      <TransactionID>387B7BE88FE33B0F4B60AC64A63F18E2</TransactionID>
+    </static>
+    <mutable>
+      <TransactionPhase>Initialisation</TransactionPhase>
+      <OrderID>N00L</OrderID>
+      <ReturnCode>000000</ReturnCode>
+      <ReportText>[EBICS_OK] OK</ReportText>
+    </mutable>
+  </header>
+  <AuthSignature>
+    <ds:SignedInfo>
+      <ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
+      <ds:Reference URI="#xpointer(//*[@authenticate='true'])">
+        <ds:Transforms>
+          <ds:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+        </ds:Transforms>
+        <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+        <ds:DigestValue>hSf/fZURBW6ihKUUZDMRpqc3kloVZZRjw+DTBxjS7AM=</ds:DigestValue>
+      </ds:Reference>
+    </ds:SignedInfo>
+    <ds:SignatureValue>IFHzo6jch33gA0Ovxh4VWtAwJOJRdxffMy7Yi+a+UUWPM/ekNqcewCWxgjbcWgD/LiH6eQc58iKcZdNKpaKfplQ09CJi1VBry5sd97i4tlCAhoM95JTrJjp2O6PhswAo+a6dpuXmA11u57BK0/nHENMIh4+Qw3aGszn21Ft8qwo=</ds:SignatureValue>
+  </AuthSignature>
+  <body>
+    <ReturnCode authenticate="true">000000</ReturnCode>
+    <TimestampBankParameter authenticate="true">2007-10-19T14:58:39.467Z</TimestampBankParameter>
+  </body>
+</ebicsResponse>

data/spec/fixtures/xml/cdb_transfer_response.xml

@@ -0,0 +1,32 @@
+<ebicsResponse Revision="1" Version="H004" xsi:schemaLocation="urn:org:ebics:H004 ebics_response_H004.xsd" xmlns="urn:org:ebics:H004" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+  <header authenticate="true">
+    <static>
+      <TransactionID>387B7BE88FE33B0F4B60AC64A63F18E2</TransactionID>
+    </static>
+    <mutable>
+      <TransactionPhase>Transfer</TransactionPhase>
+      <SegmentNumber lastSegment="true">1</SegmentNumber>
+      <OrderID>N00L</OrderID>
+      <ReturnCode>000000</ReturnCode>
+      <ReportText>[EBICS_OK] OK</ReportText>
+    </mutable>
+  </header>
+  <AuthSignature>
+    <ds:SignedInfo>
+      <ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
+      <ds:Reference URI="#xpointer(//*[@authenticate='true'])">
+        <ds:Transforms>
+          <ds:Transform Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+        </ds:Transforms>
+        <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+        <ds:DigestValue></ds:DigestValue>
+      </ds:Reference>
+    </ds:SignedInfo>
+    <ds:SignatureValue></ds:SignatureValue>
+  </AuthSignature>
+  <body>
+    <ReturnCode authenticate="true">000000</ReturnCode>
+    <TimestampBankParameter authenticate="true">2007-10-19T14:58:39.467Z</TimestampBankParameter>
+  </body>
+</ebicsResponse>

data/spec/fixtures/xml/htd_order_data.xml

@@ -133,6 +133,12 @@
       <Description>CD1</Description>
       <NumSigRequired>1</NumSigRequired>
     </OrderInfo>
+    <OrderInfo>
+      <OrderType>CDB</OrderType>
+      <TransferType>Upload</TransferType>
+      <Description>CDB</Description>
+      <NumSigRequired>1</NumSigRequired>
+    </OrderInfo>
     <OrderInfo>
       <OrderType>CDD</OrderType>
       <TransferType>Upload</TransferType>
@@ -147,7 +153,7 @@
       <OrderTypes>PTK HPD HTD STA HVD HPB HAA HVT HVU HVZ</OrderTypes>
     </Permission>
     <Permission AuthorisationLevel="E">
-      <OrderTypes>INI SPR PUB HIA HCA HSA HVE HVS CCS CCT CD1 CDD</OrderTypes>
+      <OrderTypes>INI SPR PUB HIA HCA HSA HVE HVS CCS CCT CD1 CDB CDD</OrderTypes>
     </Permission>
   </UserInfo>
-</HTDResponseOrderData>
+</HTDResponseOrderData>

data/spec/fixtures/xml/htd_order_data_without_names.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<HTDResponseOrderData xmlns="urn:org:ebics:H004" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:org:ebics:H004 http://www.ebics.org/H004/ebics_orders_H004.xsd">
+  <PartnerInfo>
+    <AddressInfo>
+      <Name>Railslove GmbH</Name>
+      <Country>Deutschland</Country>
+    </AddressInfo>
+    <BankInfo>
+      <HostID>SIZBN001</HostID>
+    </BankInfo>
+    <OrderInfo>
+      <OrderType>HTD</OrderType>
+      <TransferType>Download</TransferType>
+      <Description>Kunden- und Teilnehmerdaten abholen</Description>
+    </OrderInfo>
+      </PartnerInfo>
+  <UserInfo>
+    <UserID Status="1">EBIX</UserID>
+    <Name>Ebi, Epics</Name>
+    <Permission>
+      <OrderTypes>HTD</OrderTypes>
+    </Permission>
+    <Permission AuthorisationLevel="E">
+      <OrderTypes></OrderTypes>
+    </Permission>
+  </UserInfo>
+</HTDResponseOrderData>