zaala 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23d2b71b2a1a767732f1e981ec456ee03d30dfa9aae6da0b331d7f19aee61050
-  data.tar.gz: 060b17d5d44dda277f3c463358f94083dc03e8f55ae75715ea13322b37298208
+  metadata.gz: 3e7ce8d64c7b4f13fb5c03dfc38a431595842dd4d4d34d7c3444014ca458976a
+  data.tar.gz: 8d1bcb796c6b71649bfe92fb8a46fc8c42657ad24fbbe1ceea457301c6977dc9
 SHA512:
-  metadata.gz: 91778343fc0ee1a12d34e217e72b6486330a4533d28fd0654a0a9ad900b12769731bcd88e453d49a48c17d7686201c148d1cb473abf46498ffb0d82186f1fa86
-  data.tar.gz: '085382d92b9b1e165d10e071fa1fe0fa5486c3024b8a8848b6074507ee5b775ed95e88437fda5b07e8dd34cc89a90bf58ff7aaf5f80e0b4de6c6b35cf1d02a4c'
+  metadata.gz: df99053a8a416b55b7fb4967ae021ce1315257d7123b3a72b8547c1e4cfd72e668c40983701ed014c17d0377b7428ea5237e9d0eb71512d51a3088e21afdefe1
+  data.tar.gz: db5b6b6d59c76d4fdfcec8e0ecd995db275fa70c243e3424bb0c07eb9093c54699af2cf464643e3307d6a974b96f5fc21e6193a053ac220c35ad036c08315c43

data/lib/zaala/api/client.rb

@@ -13,8 +13,8 @@ module Zaala::API
       symbolize_keys = lambda { |key| key.to_sym }
       params = {
         wsdl: wsdl,
-        open_timeout: 30, # in seconds
-        read_timeout: 30, # in seconds
+        open_timeout: 30, # seconds
+        read_timeout: 30, # seconds
         convert_response_tags_to: symbolize_keys,
         log: log,
         proxy: proxy
@@ -43,14 +43,15 @@ module Zaala::API
       ensure_operation_exists(:pre_authorize)
       raise BadRequestError.new("pre_authorize operation requires an AuthorizationRequest parameter") unless req.is_a?(AuthorizationRequest)
 
-      @kar.call(:pre_authorize) do
+      res = @kar.call(:pre_authorize) do
         message(authorizationRequest: req.to_message)
       end
+      AuthorizationResponse.from_message(res.body[:preAuthorizeResponse][:return])
     rescue Savon::SOAPFault => e
-      # IS0003
-      # TODO: Extract error code from response body
-      # e.g. (The content of at least one field is invalid and did not pass the validation)
-      raise BadRequestError.new(e)
+      # Extract bad request errors
+      maybe_raise_invalid_fields(e.to_hash[:Fault])
+      # Fallback to standard errro
+      raise StandardError, e.to_hash.dig(:Fault, :faultstring)
     end
 
     # Authorizes a purchase transaction.
@@ -63,8 +64,10 @@ module Zaala::API
       end
       AuthorizationResponse.from_message(res.body[:authorizeResponse][:return])
     rescue Savon::SOAPFault => e
-      # e.g. (The content of at least one field is invalid and did not pass the validation)
-      raise BadRequestError.new(e)
+      # Extract bad request errors
+      maybe_raise_invalid_fields(e.to_hash[:Fault])
+      # Fallback to standard errro
+      raise StandardError, e.to_hash.dig(:Fault, :faultstring)
     end
 
     # Cancel a previous reservation of funds.
@@ -72,12 +75,15 @@ module Zaala::API
       ensure_operation_exists(:cancel_authorization)
       raise BadRequestError.new("cancel_authorization operation requires a CancellationRequest parameter") unless req.is_a?(CancellationRequest)
 
-      @kar.call(:cancel_authorization) do
+      res = @kar.call(:cancel_authorization) do
         message(cancellationRequest: req.to_message)
       end
+      CancellationResponse.from_message(res.body[:cancelAuthorizationResponse][:return])
     rescue Savon::SOAPFault => e
-      # e.g. (The content of at least one field is invalid and did not pass the validation)
-      raise BadRequestError.new(e)
+      # Extract bad request errors
+      maybe_raise_invalid_fields(e.to_hash[:Fault])
+      # Fallback to standard errro
+      raise StandardError, e.to_hash.dig(:Fault, :faultstring)
     end
 
     # Perform a solvency check.
@@ -85,12 +91,15 @@ module Zaala::API
       ensure_operation_exists(:check)
       raise BadRequestError.new("check operation requires a CheckRequest parameter") unless req.is_a?(CheckRequest)
 
-      @kar.call(:check) do
+      res = @kar.call(:check) do
         message(checkRequest: req.to_message)
       end
+      CheckResponse.from_message(res.body[:checkResponse][:return])
     rescue Savon::SOAPFault => e
-      # e.g. (The content of at least one field is invalid and did not pass the validation)
-      raise BadRequestError.new(e)
+      # Extract bad request errors
+      maybe_raise_invalid_fields(e.to_hash[:Fault])
+      # Fallback to standard errro
+      raise StandardError, e.to_hash.dig(:Fault, :faultstring)
     end
 
     # Returns available information about an authorization-ID.
@@ -98,13 +107,15 @@ module Zaala::API
       ensure_operation_exists(:info)
       raise BadRequestError.new("info operation requires an InfoRequest parameter") unless req.is_a?(InfoRequest)
 
-      @kar.call(:info) do
+      res = @kar.call(:info) do
         message(infoRequest: req.to_message)
       end
+      InfoResponse.from_message(res.body[:infoResponse][:return])
     rescue Savon::SOAPFault => e
-      # TODO: Extract error code from response body
-      # e.g. (The content of at least one field is invalid and did not pass the validation)
-      raise BadRequestError.new(e)
+      # Extract bad request errors
+      maybe_raise_invalid_fields(e.to_hash[:Fault])
+      # Fallback to standard errro
+      raise StandardError, e.to_hash.dig(:Fault, :faultstring)
     end
 
     # Verifies the given MTAN.
@@ -112,13 +123,15 @@ module Zaala::API
       ensure_operation_exists(:verify)
       raise BadRequestError.new("info operation requires a VerifyRequest parameter") unless req.is_a?(VerifyRequest)
 
-      @kar.call(:verify) do
+      res = @kar.call(:verify) do
         message(verifyRequest: req.to_message)
       end
+      VerifyResponse.from_message(res.body[:verifyResponse][:return])
     rescue Savon::SOAPFault => e
-      # TODO: Extract error code from response body
-      # e.g. (The content of at least one field is invalid and did not pass the validation)
-      raise BadRequestError.new(e)
+      # Extract bad request errors
+      maybe_raise_invalid_fields(e.to_hash[:Fault])
+      # Fallback to standard errro
+      raise StandardError, e.to_hash.dig(:Fault, :faultstring)
     end
 
     # Submits a purchase transaction with a previous authorization of funds.
@@ -131,9 +144,10 @@ module Zaala::API
       end
       SubmissionResponse.from_message(res.body[:submitAuthorizationResponse][:return])
     rescue Savon::SOAPFault => e
-      # TODO: Extract error code from response body
-      # e.g. (The content of at least one field is invalid and did not pass the validation)
-      raise BadRequestError.new(e)
+      # Extract bad request errors
+      maybe_raise_invalid_fields(e.to_hash[:Fault])
+      # Fallback to standard errro
+      raise StandardError, e.to_hash.dig(:Fault, :faultstring)
     end
 
     # Authorizes a credit transaction.
@@ -144,6 +158,15 @@ module Zaala::API
 
     private
 
+    def maybe_raise_invalid_fields(fault)
+      fields = fault.dig(:detail, :invalidFieldsFaultMessage, :invalidFields)
+      fields = [fields] if fields.kind_of?(Hash)
+      return [] unless fields.kind_of?(Array)
+
+      fields = fields.map { |f| FieldViolation.new(f[:code], f[:message]) }
+      raise BadRequestError.new(fault[:faultstring], fields) unless fields.empty?
+    end
+
     def ensure_operation_exists(op)
       raise(UnsupportedServiceEndpoint, op) unless @kar.operations.include?(op)
     end

data/lib/zaala/api/error.rb

@@ -1,7 +1,21 @@
 module Zaala::API
   class MissingError < StandardError
   end
+  class FieldViolation
+    attr_reader :field, :description
+
+    def initialize(field, description)
+      @field = field
+      @description = description
+    end
+  end
   class BadRequestError < StandardError
+    attr_reader :fields
+
+    def initialize(msg, fields = [])
+      super(msg)
+      @fields = fields
+    end
   end
   class PermissionError < StandardError
   end

data/lib/zaala/api/types.rb

@@ -804,7 +804,7 @@ module Zaala::API
       {
         identifier: identifier.to_message,
         additionalData: additional_data.to_message,
-        verificationCode: verification_code,
+        verificationCode: verification_code
       }
     end
   end
@@ -830,4 +830,51 @@ module Zaala::API
       })
     end
   end
+
+  class CheckRequest < Dry::Struct
+    # Environment parameters and information to identify the caller.
+    attribute :identifier, Zaala::API::RequestIdentifier
+    # Personal data of the customer.
+    attribute :personal_data, Zaala::API::PersonalData
+    # Invoice address of the purchase.
+    attribute :invoice_address, Zaala::API::InvoiceAddress
+    # Key-value pairs holding information of the service's client (e.g. IPv4 address).
+    # attribute :client_info, Zaala::API::ClientInfo
+    # Requested amount of the preauthorization/authorization.
+    # It corresponds to the total amount, which has to be authorized.
+    # Mandatory if no Basket is provided in the request.
+    # (IF0001) If a Basket is provided in the request, this value is ignored.
+    attribute :requested_amount, Types::Strict::Float
+    # Additional purchase related information.
+    attribute :additional_data, Zaala::API::AdditionalData
+
+    def to_message
+      {
+        identifier: identifier.to_message,
+        personal_data: personal_data.to_message,
+        invoice_address: invoice_address.to_message,
+        client_info: client_info.to_message,
+        requested_amount: requested_amount,
+        additional_data: additional_data.to_message
+      }
+    end
+  end
+
+  class CheckResponse < Dry::Struct
+    # Contains information to identify the authorization in a future request.
+    attribute :identifier, Zaala::API::ResponseIdentifier
+    # Contains additional information concerning the authorization.
+    attribute :decision, Zaala::API::Decision
+
+    # Contains additional information concerning the authorization.
+    attribute :info, Zaala::API::Info.optional.default(nil)
+
+    def self.from_message(h)
+      VerifyResponse.new({
+        identifier: Zaala::API::ResponseIdentifier.from_message(h[:identifier]),
+        decision: Zaala::API::Decision.from_message(h[:decision]),
+        info: h[:info] ? Zaala::API::Info.from_message(h[:info]) : nil,
+      })
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaala
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Denteo AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-types