fintecture 0.4.0 → 0.4.1

data/lib/fintecture/exceptions.rb

@@ -1,72 +1,75 @@
-# frozen_string_literal: true
-
-require 'json'
-
-module Fintecture
-  class ValidationException < RuntimeError; end
-
-  class CryptoException < RuntimeError; end
-
-  class ApiException
-    class << self
-      def error(res)
-        body = JSON.parse res.body
-
-        # Errors array
-        if body['code'] && body['log_id'] && body['errors']
-          raise _construct_message_errors(res, body)
-        # Single error
-        else
-          raise _construct_message_error(res, body)
-        end
-      end
-
-      private
-
-      def _construct_message_errors(res, body)
-        status = res.status
-        code = body['code']
-        log_id = body['log_id']
-        errors_array = body['errors']
-
-        error_string = "\nFintecture server errors : "
-        error_string += "\n status: #{status} "
-        error_string += "\n code: #{code}"
-        error_string += "\n id : #{log_id}"
-
-        errors_array.each do |error|
-          formated_error = error.map { |key, value| "   #{key}: #{value}" }.join("\n")
-          error_string += "\n\n#{formated_error}"
-        end
-        error_string += "\n\n"
-
-        {
-          type: 'Fintecture api',
-          status: status,
-          errors: errors_array,
-          error_string: error_string
-        }.to_json
-      end
-
-      def _construct_message_error(res, body)
-        status = res.status
-        error = body['meta']
-
-        error_string = "\nFintecture server errors : "
-        error_string += "\n status: #{status} "
-
-        formated_error = error.map { |key, value| "   #{key}: #{value}" }.join("\n")
-        error_string += "\n\n#{formated_error}"
-
-        error_string += "\n\n"
-
-        {
-          type: 'Fintecture api',
-          status: status,
-          errors: [error],
-          error_string: error_string
-        }.to_json
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'json'
+
+module Fintecture
+  class ValidationException < RuntimeError; end
+
+  class CryptoException < RuntimeError; end
+
+  class ApiException
+    class << self
+      def error(res)
+        body = JSON.parse res.body
+
+        # Errors array
+        if body['code'] && body['log_id'] && body['errors']
+          raise _construct_message_errors(res, body)
+        # Single error
+        else
+          raise _construct_message_error(res, body)
+        end
+      end
+
+      private
+
+      def _construct_message_errors(res, body)
+        status = res.status
+        code = body['code']
+        log_id = body['log_id']
+        errors_array = body['errors']
+
+        error_string = "\nFintecture server errors : "
+        error_string += "\n status: #{status} "
+        error_string += "\n code: #{code}"
+        error_string += "\n id : #{log_id}"
+
+        errors_array.compact.each do |error|
+          formated_error = error
+          formated_error = error.map { |key, value| "   #{key}: #{value}" }.join("\n") if error.is_a?(Hash)
+          error_string += "\n\n#{formated_error}"
+        end
+        error_string += "\n\n"
+
+        {
+          type: 'Fintecture api',
+          status: status,
+          errors: errors_array,
+          error_string: error_string
+        }.to_json
+      end
+
+      def _construct_message_error(res, body)
+        status = res.status
+        error = body['meta']
+
+        error_string = "\nFintecture server errors : "
+        error_string += "\n status: #{status} "
+
+        formated_error = error
+        formated_error = error.map { |key, value| "   #{key}: #{value}" }.join("\n") if error.is_a?(Hash)
+
+        error_string += "\n\n#{formated_error}"
+
+        error_string += "\n\n"
+
+        {
+          type: 'Fintecture api',
+          status: status,
+          errors: [error],
+          error_string: error_string
+        }.to_json
+      end
+    end
+  end
+end

data/lib/fintecture/faraday/authentication/connection.rb

@@ -1,140 +1,140 @@
-# frozen_string_literal: true
-
-require 'base64'
-require 'faraday'
-require 'uri'
-require 'fintecture/utils/crypto'
-require 'fintecture/utils/date'
-
-module Fintecture
-  module Faraday
-    module Authentication
-      class Connection
-        class << self
-          def connection(url)
-            ::Faraday.new(url: url) do |faraday|
-              faraday.request :url_encoded
-              faraday.adapter ::Faraday.default_adapter
-            end
-          end
-
-          def post(url:, req_body: nil, client: nil, custom_content_type: nil, bearer: nil, secure_headers: false, additional_headers: nil, disableAuthorization: nil)
-            @client = client
-            conn = connection(url)
-            res = conn.post do |req|
-              req.options.params_encoder = Faraday::DisabledEncoder
-              req.headers = req_headers(custom_content_type, bearer, secure_headers, additional_headers, disableAuthorization,
-                                        method: 'post', body: req_body, url: url)
-              req.body = req_body
-            end
-
-            !res.success? ? Fintecture::ApiException.error(res) : res
-          end
-
-          def get(url:, req_body: nil, client: nil, custom_content_type: nil, bearer: nil, secure_headers: false, additional_headers: nil, disableAuthorization: nil)
-            @client = client
-            conn = connection(url)
-
-            res = conn.get do |req|
-              req.options.params_encoder = Faraday::DisabledEncoder
-              req.headers = req_headers(custom_content_type, bearer, secure_headers, additional_headers, disableAuthorization,
-                                        method: 'get', url: url)
-              req.body = req_body
-            end
-
-            !res.success? ? Fintecture::ApiException.error(res) : res
-          end
-
-          def delete(url:, req_body: nil, client: nil, custom_content_type: nil, bearer: nil, secure_headers: false, additional_headers: nil, disableAuthorization: nil)
-            @client = client
-            conn = connection(url)
-
-            res = conn.delete do |req|
-              req.options.params_encoder = Faraday::DisabledEncoder
-              req.headers = req_headers(custom_content_type, bearer, secure_headers, additional_headers, disableAuthorization,
-                                        method: 'delete', body: req_body, url: url)
-              req.body = req_body
-            end
-
-            !res.success? ? Fintecture::ApiException.error(res) : res
-          end
-
-          def req_headers(custom_content_type, bearer, secure_headers, additional_headers, disableAuthorization, url:, method: '', body: {})
-            if !additional_headers.nil? && !additional_headers.is_a?(Hash)
-              raise Fintecture::ValidationException, 'additional_headers must be an object'
-            end
-
-            client_token = Base64.strict_encode64("#{@client.app_id}:#{@client.app_secret}")
-
-            headers = {
-              'Accept' => 'application/json',
-              'User-Agent' => "Fintecture Ruby SDK v #{Fintecture::VERSION}",
-              'Content-Type' => custom_content_type || 'application/x-www-form-urlencoded'
-            }
-            headers['Authorization'] = bearer || "Basic #{client_token}" unless disableAuthorization
-            headers = headers.merge(additional_headers) unless additional_headers.nil?
-            headers.merge(secure_headers ? req_secure_headers(body: body, url: url, method: method) : {})
-          end
-
-          def req_secure_headers(body: {}, url: '', method: '')
-            payload = (body.instance_of?(String) ? body : body.to_s)
-            path_name = URI(url).path
-            search_params = URI(url).query
-
-            request_target = search_params ? "#{method.downcase} #{path_name}?#{search_params}" : "#{method.downcase} #{path_name}"
-            date = Fintecture::Utils::Date.header_time.to_s
-            digest = load_digest(payload)
-            x_request_id = Fintecture::Utils::Crypto.generate_uuid
-
-            headers = {
-              'Date' => date,
-              'X-Request-ID' => x_request_id
-            }.merge(payload ? digest : {})
-
-            headers['Signature'] =
-              Fintecture::Utils::Crypto.create_signature_header(
-                { '(request-target)' => request_target }.merge(headers), @client
-              )
-            headers
-          end
-
-          def load_digest(payload)
-            { 'Digest' => "SHA-256=#{Fintecture::Utils::Crypto.hash_base64(payload)}" }
-          end
-
-        end
-      end
-    end
-
-    module DisabledEncoder
-      class << self
-        extend Forwardable
-        def_delegators :'Faraday::Utils', :escape, :unescape
-      end
-
-      def self.encode(params)
-        return nil if params.nil?
-
-        newParams = {}
-        params.each do |key, value|
-          if value.instance_of?(Hash)
-            value.each do |subkey, subvalue|
-              newParams["#{key}[#{subkey}]"] = subvalue
-            end
-          else
-            newParams[key] = value
-          end
-        end
-
-        newParams.map { |key, value| "#{key}=#{value}" }.join('&').to_s
-      end
-
-      class << self
-        attr_accessor :sort_params
-      end
-
-      # Useful default for OAuth and caching.
-      @sort_params = true
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'base64'
+require 'faraday'
+require 'uri'
+require 'fintecture/utils/crypto'
+require 'fintecture/utils/date'
+
+module Fintecture
+  module Faraday
+    module Authentication
+      class Connection
+        class << self
+          def connection(url)
+            ::Faraday.new(url: url) do |faraday|
+              faraday.request :url_encoded
+              faraday.adapter ::Faraday.default_adapter
+            end
+          end
+
+          def post(url:, req_body: nil, client: nil, custom_content_type: nil, bearer: nil, secure_headers: false, additional_headers: nil, disableAuthorization: nil)
+            @client = client
+            conn = connection(url)
+            res = conn.post do |req|
+              req.options.params_encoder = Faraday::DisabledEncoder
+              req.headers = req_headers(custom_content_type, bearer, secure_headers, additional_headers, disableAuthorization,
+                                        method: 'post', body: req_body, url: url)
+              req.body = req_body
+            end
+
+            !res.success? ? Fintecture::ApiException.error(res) : res
+          end
+
+          def get(url:, req_body: nil, client: nil, custom_content_type: nil, bearer: nil, secure_headers: false, additional_headers: nil, disableAuthorization: nil)
+            @client = client
+            conn = connection(url)
+
+            res = conn.get do |req|
+              req.options.params_encoder = Faraday::DisabledEncoder
+              req.headers = req_headers(custom_content_type, bearer, secure_headers, additional_headers, disableAuthorization,
+                                        method: 'get', url: url)
+              req.body = req_body
+            end
+
+            !res.success? ? Fintecture::ApiException.error(res) : res
+          end
+
+          def delete(url:, req_body: nil, client: nil, custom_content_type: nil, bearer: nil, secure_headers: false, additional_headers: nil, disableAuthorization: nil)
+            @client = client
+            conn = connection(url)
+
+            res = conn.delete do |req|
+              req.options.params_encoder = Faraday::DisabledEncoder
+              req.headers = req_headers(custom_content_type, bearer, secure_headers, additional_headers, disableAuthorization,
+                                        method: 'delete', body: req_body, url: url)
+              req.body = req_body
+            end
+
+            !res.success? ? Fintecture::ApiException.error(res) : res
+          end
+
+          def req_headers(custom_content_type, bearer, secure_headers, additional_headers, disableAuthorization, url:, method: '', body: {})
+            if !additional_headers.nil? && !additional_headers.is_a?(Hash)
+              raise Fintecture::ValidationException, 'additional_headers must be an object'
+            end
+
+            client_token = Base64.strict_encode64("#{@client.app_id}:#{@client.app_secret}")
+
+            headers = {
+              'Accept' => 'application/json',
+              'User-Agent' => "Fintecture Ruby SDK v #{Fintecture::VERSION}",
+              'Content-Type' => custom_content_type || 'application/x-www-form-urlencoded'
+            }
+            headers['Authorization'] = bearer || "Basic #{client_token}" unless disableAuthorization
+            headers = headers.merge(additional_headers) unless additional_headers.nil?
+            headers.merge(secure_headers ? req_secure_headers(body: body, url: url, method: method) : {})
+          end
+
+          def req_secure_headers(body: {}, url: '', method: '')
+            payload = (body.instance_of?(String) ? body : body.to_s)
+            path_name = URI(url).path
+            search_params = URI(url).query
+
+            request_target = search_params ? "#{method.downcase} #{path_name}?#{search_params}" : "#{method.downcase} #{path_name}"
+            date = Fintecture::Utils::Date.header_time.to_s
+            digest = load_digest(payload)
+            x_request_id = Fintecture::Utils::Crypto.generate_uuid
+
+            headers = {
+              'Date' => date,
+              'X-Request-ID' => x_request_id
+            }.merge(payload ? digest : {})
+
+            headers['Signature'] =
+              Fintecture::Utils::Crypto.create_signature_header(
+                { '(request-target)' => request_target }.merge(headers), @client
+              )
+            headers
+          end
+
+          def load_digest(payload)
+            { 'Digest' => "SHA-256=#{Fintecture::Utils::Crypto.hash_base64(payload)}" }
+          end
+
+        end
+      end
+    end
+
+    module DisabledEncoder
+      class << self
+        extend Forwardable
+        def_delegators :'Faraday::Utils', :escape, :unescape
+      end
+
+      def self.encode(params)
+        return nil if params.nil?
+
+        newParams = {}
+        params.each do |key, value|
+          if value.instance_of?(Hash)
+            value.each do |subkey, subvalue|
+              newParams["#{key}[#{subkey}]"] = subvalue
+            end
+          else
+            newParams[key] = value
+          end
+        end
+
+        newParams.map { |key, value| "#{key}=#{value}" }.join('&').to_s
+      end
+
+      class << self
+        attr_accessor :sort_params
+      end
+
+      # Useful default for OAuth and caching.
+      @sort_params = true
+    end
+  end
+end

data/lib/fintecture/pis_client.rb

@@ -1,100 +1,100 @@
-# frozen_string_literal: true
-
-require 'fintecture/api/pis/connect'
-require 'fintecture/api/pis/request_to_pay'
-require 'fintecture/api/pis/payments'
-require 'fintecture/api/pis/initiate'
-require 'fintecture/api/pis/refund'
-require 'fintecture/api/pis/settlements'
-
-require 'fintecture/api/ressources/providers'
-require 'fintecture/api/ressources/applications'
-require 'fintecture/api/ressources/test_accounts'
-
-module Fintecture
-  class PisClient
-    @environment = %w[local test sandbox production].freeze
-
-    def initialize(config)
-      @app_id = config[:app_id]
-      @app_secret = config[:app_secret]
-      @private_key = config[:private_key]
-
-      environment = config[:environment].downcase
-      unless environment.include?(environment)
-        raise "#{environment} not a valid environment, options are [#{environment.join(', ')}]"
-      end
-
-      @environment = config[:environment]
-    end
-
-    # Getters
-    attr_reader :app_id, :app_secret, :private_key, :environment, :token, :token_expires_in
-
-    #  Methodes
-    def generate_token
-      res = Fintecture::Authentication.get_access_token self
-      body = JSON.parse res.body
-
-      @token = body['access_token']
-      @token_expires_in = body['expires_in']
-
-      body
-    end
-
-    def connect(payload, state, redirect_uri = nil, origin_uri = nil)
-      res = Fintecture::Pis::Connect.generate self, Marshal.load(Marshal.dump(payload)), state, redirect_uri, origin_uri
-
-      JSON.parse res.body
-    end
-
-    def request_to_pay(payload, x_language, redirect_uri = nil)
-      res = Fintecture::Pis::RequestToPay.generate self, Marshal.load(Marshal.dump(payload)), x_language, redirect_uri
-
-      JSON.parse res.body
-    end
-
-    def initiate(payload, provider_id, redirect_uri, state = nil)
-      res = Fintecture::Pis::Initiate.generate self, Marshal.load(Marshal.dump(payload)), provider_id, redirect_uri,
-                                               state
-
-      JSON.parse res.body
-    end
-
-    def payments(session_id = nil)
-      res = Fintecture::Pis::Payments.get self, session_id
-
-      JSON.parse res.body
-    end
-
-    def refund(session_id, amount = nil)
-      res = Fintecture::Pis::Refund.generate self, session_id, amount
-
-      JSON.parse res.body
-    end
-
-    def settlements(settlement_id = nil, include_payments = false)
-      res = Fintecture::Pis::Settlements.get self, settlement_id, include_payments
-
-      JSON.parse res.body
-    end
-
-    def providers(provider_id: nil, paramsProviders: nil)
-      res = Fintecture::Ressources::Providers.get self, provider_id, paramsProviders
-
-      JSON.parse res.body
-    end
-
-    def applications
-      res = Fintecture::Ressources::Applications.get self
-
-      JSON.parse res.body
-    end
-
-    def test_accounts(provider_id = nil)
-      res = Fintecture::Ressources::TestAccounts.get self, provider_id
-
-      JSON.parse res.body
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'fintecture/api/pis/connect'
+require 'fintecture/api/pis/request_to_pay'
+require 'fintecture/api/pis/payments'
+require 'fintecture/api/pis/initiate'
+require 'fintecture/api/pis/refund'
+require 'fintecture/api/pis/settlements'
+
+require 'fintecture/api/ressources/providers'
+require 'fintecture/api/ressources/applications'
+require 'fintecture/api/ressources/test_accounts'
+
+module Fintecture
+  class PisClient
+    @environment = %w[local test sandbox production].freeze
+
+    def initialize(config)
+      @app_id = config[:app_id]
+      @app_secret = config[:app_secret]
+      @private_key = config[:private_key]
+
+      environment = config[:environment].downcase
+      unless environment.include?(environment)
+        raise "#{environment} not a valid environment, options are [#{environment.join(', ')}]"
+      end
+
+      @environment = config[:environment]
+    end
+
+    # Getters
+    attr_reader :app_id, :app_secret, :private_key, :environment, :token, :token_expires_in
+
+    #  Methodes
+    def generate_token
+      res = Fintecture::Authentication.get_access_token self
+      body = JSON.parse res.body
+
+      @token = body['access_token']
+      @token_expires_in = body['expires_in']
+
+      body
+    end
+
+    def connect(payload, state, redirect_uri = nil, origin_uri = nil)
+      res = Fintecture::Pis::Connect.generate self, Marshal.load(Marshal.dump(payload)), state, redirect_uri, origin_uri
+
+      JSON.parse res.body
+    end
+
+    def request_to_pay(payload, x_language, redirect_uri = nil)
+      res = Fintecture::Pis::RequestToPay.generate self, Marshal.load(Marshal.dump(payload)), x_language, redirect_uri
+
+      JSON.parse res.body
+    end
+
+    def initiate(payload, provider_id, redirect_uri, state = nil)
+      res = Fintecture::Pis::Initiate.generate self, Marshal.load(Marshal.dump(payload)), provider_id, redirect_uri,
+                                               state
+
+      JSON.parse res.body
+    end
+
+    def payments(session_id = nil)
+      res = Fintecture::Pis::Payments.get self, session_id
+
+      JSON.parse res.body
+    end
+
+    def refund(session_id, amount = nil)
+      res = Fintecture::Pis::Refund.generate self, session_id, amount
+
+      JSON.parse res.body
+    end
+
+    def settlements(settlement_id = nil, include_payments = false)
+      res = Fintecture::Pis::Settlements.get self, settlement_id, include_payments
+
+      JSON.parse res.body
+    end
+
+    def providers(provider_id: nil, paramsProviders: nil)
+      res = Fintecture::Ressources::Providers.get self, provider_id, paramsProviders
+
+      JSON.parse res.body
+    end
+
+    def applications
+      res = Fintecture::Ressources::Applications.get self
+
+      JSON.parse res.body
+    end
+
+    def test_accounts(provider_id = nil)
+      res = Fintecture::Ressources::TestAccounts.get self, provider_id
+
+      JSON.parse res.body
+    end
+  end
+end

data/lib/fintecture/utils/constants.rb

@@ -1,11 +1,11 @@
-# frozen_string_literal: true
-
-module Fintecture
-  module Utils
-    module Constants
-      SIGNEDHEADERPARAMETERLIST = %w[(request-target) Date Digest X-Request-ID].freeze
-      PSU_TYPES = %w[retail corporate all].freeze
-      SCOPES = %w[pis ais].freeze
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Fintecture
+  module Utils
+    module Constants
+      SIGNEDHEADERPARAMETERLIST = %w[(request-target) Date Digest X-Request-ID].freeze
+      PSU_TYPES = %w[retail corporate all].freeze
+      SCOPES = %w[pis ais].freeze
+    end
+  end
+end