fintecture 0.1.9 → 0.2.1

data/lib/fintecture/api/endpoints/pis.rb

@@ -1,13 +1,14 @@
-module Fintecture
-  module Api
-    module Endpoints
-      module Pis
-        PIS = 'pis/v1'
-        PISPROVIDER = "#{PIS}/provider"
-        PISCUSTOMER = "#{PIS}/customer"
-        PREPARE = "#{PIS}/prepare"
-        PAYMENTS = "#{PIS}/payments"
-      end
-    end
-  end
+module Fintecture
+  module Api
+    module Endpoints
+      module Pis
+        PIS = 'pis/v2'
+        PISPROVIDER = "#{PIS}/provider"
+        PISCUSTOMER = "#{PIS}/customer"
+        REQUEST_TO_PAY = "#{PIS}/request-to-pay"
+        PAYMENTS = "#{PIS}/payments"
+        CONNECT = "#{PIS}/connect"
+      end
+    end
+  end
 end

data/lib/fintecture/authentication.rb

@@ -1,76 +1,76 @@
-require 'json'
-require 'faraday'
-
-module Fintecture
-  class Authentication
-    class << self
-
-      def authorize(redirect_uri, state = nil)
-        query_string = "?#{{
-            response_type: 'code',
-            app_id: Fintecture.app_id,
-            redirect_uri: redirect_uri,
-            state: state
-        }.map{|key, value| "#{key}=#{value}"}.join('&')}"
-
-        ::Faraday.get "#{token_authorize_endpoint}#{query_string}"
-      end
-
-      def get_access_token(auth_code =  nil)
-        body = access_token_data auth_code
-
-        Fintecture::Faraday::Authentication::Connection.post url: access_token_url, req_body: body
-      end
-
-      def refresh_token(refresh_token)
-        body = refresh_token_data refresh_token
-
-        Fintecture::Faraday::Authentication::Connection.post url: refresh_token_url, req_body: body
-      end
-
-      private
-
-      def base_url
-        Fintecture::Api::BaseUrl::FINTECTURE_OAUTH_URL[Fintecture.environment.to_sym]
-      end
-
-      def token_authorize_endpoint
-        "#{base_url}#{Fintecture::Api::Endpoints::Authentication::OAUTH_TOKEN_AUTHORIZE}"
-      end
-
-      def access_token_url
-        "#{base_url}#{Fintecture::Api::Endpoints::Authentication::OAUTH_ACCESS_TOKEN}"
-      end
-
-      def refresh_token_url
-        "#{base_url}#{Fintecture::Api::Endpoints::Authentication::OAUTH_REFRESH_TOKEN}"
-      end
-
-      def access_token_data(auth_code)
-        data =  {
-            scope: 'PIS',
-            app_id: Fintecture.app_id,
-            grant_type: 'client_credentials'
-        }
-
-        if auth_code
-          data = {
-              scope: 'AIS',
-              code: auth_code,
-              grant_type: 'authorization_code'
-          }
-        end
-
-        data
-      end
-
-      def refresh_token_data(refresh_token)
-        {
-            grant_type: 'refresh_token',
-            refresh_token: refresh_token
-        }
-      end
-
-    end
-  end
+require 'json'
+require 'faraday'
+
+module Fintecture
+  class Authentication
+    class << self
+
+      def authorize(redirect_uri, state = nil)
+        query_string = "?#{{
+            response_type: 'code',
+            app_id: Fintecture.app_id,
+            redirect_uri: redirect_uri,
+            state: state
+        }.map{|key, value| "#{key}=#{value}"}.join('&')}"
+
+        ::Faraday.get "#{token_authorize_endpoint}#{query_string}"
+      end
+
+      def get_access_token(auth_code =  nil)
+        body = access_token_data auth_code
+        
+        Fintecture::Faraday::Authentication::Connection.post url: access_token_url, req_body: body
+      end
+
+      def refresh_token(refresh_token)
+        body = refresh_token_data refresh_token
+
+        Fintecture::Faraday::Authentication::Connection.post url: refresh_token_url, req_body: body
+      end
+
+      private
+
+      def base_url
+        Fintecture::Api::BaseUrl::FINTECTURE_OAUTH_URL[Fintecture.environment.to_sym]
+      end
+
+      def token_authorize_endpoint
+        "#{base_url}#{Fintecture::Api::Endpoints::Authentication::OAUTH_TOKEN_AUTHORIZE}"
+      end
+
+      def access_token_url
+        "#{base_url}#{Fintecture::Api::Endpoints::Authentication::OAUTH_ACCESS_TOKEN}"
+      end
+
+      def refresh_token_url
+        "#{base_url}#{Fintecture::Api::Endpoints::Authentication::OAUTH_REFRESH_TOKEN}"
+      end
+
+      def access_token_data(auth_code)
+        data =  {
+            scope: 'PIS',
+            app_id: Fintecture.app_id,
+            grant_type: 'client_credentials'
+        }
+
+        if auth_code
+          data = {
+              scope: 'AIS',
+              code: auth_code,
+              grant_type: 'authorization_code'
+          }
+        end
+
+        data
+      end
+
+      def refresh_token_data(refresh_token)
+        {
+            grant_type: 'refresh_token',
+            refresh_token: refresh_token
+        }
+      end
+
+    end
+  end
 end

data/lib/fintecture/connect.rb

@@ -1,220 +1,38 @@
-require 'base64'
-require 'json'
-require 'faraday'
-require 'fintecture/pis'
-require 'fintecture/utils/validation'
-require 'fintecture/exceptions'
-require 'fintecture/utils/date'
-require 'fintecture/utils/constants'
-
-module Fintecture
-  class Connect
-    class << self
-      SIGNATURE_TYPE = 'rsa-sha256'.freeze
-
-      def get_pis_connect(access_token = nil, payment_attrs = nil)
-        connect_url(access_token, payment_attrs, type: 'pis')
-      end
-
-      def connect_url(access_token = nil, payment_attrs = nil, type: nil)
-        @access_token = access_token
-        @payment_attrs = as_json payment_attrs
-        @type = type
-
-        validate_payment_integrity
-
-        @payment_attrs['end_to_end_id'] ||= Fintecture::Utils::Crypto.generate_uuid_only_chars
-        @payment_attrs['amount'] = @payment_attrs['amount'].to_s
-
-        payload = build_payload
-        config = build_config(payload).to_json.to_s
-
-        {
-            url: build_url(config),
-            session_id: payload[:meta][:session_id]
-        }
-      end
-
-      def verify_url_parameters(parameters = nil)
-        @post_payment_attrs = as_json parameters
-
-        validate_post_payment_integrity
-
-        decrypted =  Fintecture::Utils::Crypto.decrypt_private @post_payment_attrs['s']
-        local_digest = build_local_digest @post_payment_attrs
-
-        decrypted == local_digest
-      end
-
-      private
-
-      def build_url(config)
-        "#{base_url}/#{@type}/#{@payment_attrs['psu_type']}/#{@payment_attrs['country']}?config=#{Base64.strict_encode64(config)}"
-      end
-
-      def validate_payment_integrity
-        Fintecture::Utils::Validation.raise_if_klass_mismatch @payment_attrs, Hash, 'payment_attrs'
-
-        raise Fintecture::ValidationException.new("access_token is a mandatory field") if @access_token.nil?
-
-        @payment_attrs['psu_type'] = 'retail' unless @payment_attrs['psu_type']
-        @payment_attrs['country'] = 'all' unless @payment_attrs['country']
-
-        error_msg = 'invalid payment payload parameter'
-
-        raise Fintecture::ValidationException.new("#{error_msg} type") unless Fintecture::Utils::Constants::SCOPES.include? @type
-        raise Fintecture::ValidationException.new("#{@payment_attrs['psu_type']} PSU type not allowed") unless Fintecture::Utils::Constants::PSU_TYPES.include? @payment_attrs['psu_type']
-
-        raise Fintecture::ValidationException.new('end_to_end_id must be an alphanumeric string') if(@payment_attrs['end_to_end_id'] && !@payment_attrs['end_to_end_id'].match(/^[0-9a-zA-Z]*$/))
-        Fintecture::Utils::Validation.raise_if_invalid_date_format(@payment_attrs['execution_date']) if(@payment_attrs['execution_date'])
-
-        %w[amount currency customer_full_name customer_email customer_ip redirect_uri].each do |param|
-          raise Fintecture::ValidationException.new("#{param} is a mandatory field") if @payment_attrs[param].nil?
-        end
-
-        # Check if string
-        %w[communication redirect_uri provider customer_phone].each do |param|
-          Fintecture::Utils::Validation.raise_if_klass_mismatch(@payment_attrs[param], String, param) if(@payment_attrs[param])
-        end
-
-        # Check customer_address structure
-        Fintecture::Utils::Validation.raise_if_klass_mismatch(@payment_attrs['customer_address'], Hash) if(@payment_attrs['customer_address'])
-
-        raise Fintecture::ValidationException.new('customer_address country must be a 2 letters string') if(@payment_attrs['customer_address'] && @payment_attrs['customer_address']['country'] && !@payment_attrs['customer_address']['country'].match(/^[a-zA-Z]{2}$/))
-
-        %w[street number complement zip city country].each do |param|
-          Fintecture::Utils::Validation.raise_if_klass_mismatch(@payment_attrs['customer_address'][param], String, param) if(@payment_attrs['customer_address'] && @payment_attrs['customer_address'][param])
-        end
-
-        # Check beneficiary structure
-
-        Fintecture::Utils::Validation.raise_if_klass_mismatch(@payment_attrs['beneficiary'], Hash) if(@payment_attrs['beneficiary'])
-
-        %w[name street city iban swift_bic].each do |param|
-          raise Fintecture::ValidationException.new("beneficiary #{param} is a mandatory field") if @payment_attrs['beneficiary'] && @payment_attrs['beneficiary'][param].nil?
-        end
-
-        raise Fintecture::ValidationException.new('beneficiary country must be a 2 letters string') if(@payment_attrs['beneficiary'] && @payment_attrs['beneficiary']['country'] && !@payment_attrs['beneficiary']['country'].match(/^[a-zA-Z]{2}$/))
-
-        %w[name street number complement zip city country iban swift_bic bank_name].each do |param|
-          Fintecture::Utils::Validation.raise_if_klass_mismatch(@payment_attrs['beneficiary'][param], String, param) if(@payment_attrs['beneficiary'] && @payment_attrs['beneficiary'][param])
-        end
-      end
-
-      def validate_post_payment_integrity
-        Fintecture::Utils::Validation.raise_if_klass_mismatch @post_payment_attrs, Hash, 'post_payment_attrs'
-
-        %w[s state status session_id customer_id provider].each do |param|
-          raise Fintecture::ValidationException.new("invalid post payment parameter #{param}") if @post_payment_attrs[param].nil?
-        end
-      end
-
-      def build_payload
-        attributes = {
-            amount: @payment_attrs['amount'],
-            currency: @payment_attrs['currency'],
-            communication: @payment_attrs['communication'],
-            end_to_end_id: @payment_attrs['end_to_end_id'],
-            execution_date: @payment_attrs['execution_date'],
-            provider: @payment_attrs['provider']
-        }
-
-        if @payment_attrs['beneficiary']
-          attributes['beneficiary'] = {
-            name: @payment_attrs['beneficiary']['name'],
-            street: @payment_attrs['beneficiary']['street'],
-            number: @payment_attrs['beneficiary']['number'],
-            complement: @payment_attrs['beneficiary']['complement'],
-            zip: @payment_attrs['beneficiary']['zip'],
-            city: @payment_attrs['beneficiary']['city'],
-            country: @payment_attrs['beneficiary']['country'],
-            iban: @payment_attrs['beneficiary']['iban'],
-            swift_bic: @payment_attrs['beneficiary']['swift_bic'],
-            bank_name: @payment_attrs['beneficiary']['bank_name']
-          }
-        end
-
-        meta = {
-            psu_name: @payment_attrs['customer_full_name'],
-            psu_email: @payment_attrs['customer_email'],
-            psu_ip: @payment_attrs['customer_ip'],
-            psu_phone: @payment_attrs['customer_phone'],
-            psu_address: @payment_attrs['customer_address']
-        }
-
-        data = {
-            type: 'PAYMENT',
-            attributes: attributes,
-        }
-
-        prepare_payment_response = Fintecture::Pis.prepare_payment( @access_token, {
-               data: data,
-               meta: meta
-          })
-        prepare_payment_response_body = JSON.parse(prepare_payment_response.body)
-        data_attributes = {amount: @payment_attrs['amount'], currency: @payment_attrs['currency']}
-        data_attributes[:execution_date] = @payment_attrs['execution_date'] if @payment_attrs['execution_date']
-        data_attributes[:beneficiary] = { name: @payment_attrs['beneficiary']['name'] } if @payment_attrs['beneficiary'] && @payment_attrs['beneficiary']['name']
-        {
-            meta: {session_id: prepare_payment_response_body['meta']['session_id']},
-            data: { attributes: data_attributes}
-        }
-      end
-
-      def build_signature(payload, date, x_request_id)
-        date_string = "x-date: #{date}"
-        digest_string = "digest: SHA-256=#{Fintecture::Utils::Crypto.hash_base64(payload.to_json)}"
-        x_request_id_string = "x-request-id: #{x_request_id}"
-
-        Fintecture::Utils::Crypto.sign_payload "#{digest_string}\n#{date_string}\n#{x_request_id_string}"
-      end
-
-      def build_config(payload)
-        header_time = Fintecture::Utils::Date.header_time
-        x_request_id = Fintecture::Utils::Crypto.generate_uuid
-        config = {
-            app_id: Fintecture.app_id,
-            access_token: @access_token,
-            date: header_time,
-            request_id: x_request_id,
-            signature_type: SIGNATURE_TYPE,
-            signature: build_signature(payload, header_time, x_request_id),
-            redirect_uri: @payment_attrs['redirect_uri'] || '',
-            origin_uri: @payment_attrs['origin_uri'] || '',
-            state: @payment_attrs['state'],
-            payload: payload
-        }
-        config[:provider] = @payment_attrs['provider'] if @payment_attrs['provider']
-        config
-      end
-
-      def build_local_digest(parameters)
-        test_string = {
-            app_id: Fintecture.app_id,
-            app_secret: Fintecture.app_secret,
-            session_id: parameters['session_id'],
-            status: parameters['status'],
-            customer_id: parameters['customer_id'],
-            provider: parameters['provider'],
-            state: parameters['state']
-        }.map{|key, value| "#{key}=#{value}"}.join('&')
-
-        Fintecture::Utils::Crypto.hash_base64 test_string
-      end
-
-      def base_url
-        Fintecture::Api::BaseUrl::FINTECTURE_CONNECT_URL[Fintecture.environment.to_sym]
-      end
-
-      def as_json(element)
-          return JSON(element.to_json) if element.is_a? Hash
-
-          begin
-            element.as_json
-          rescue NoMethodError
-            raise Fintecture::ValidationException.new("invalid parameter format, the parameter should be a Hash or an Object Model instead a #{element.class.name}")
-          end
-      end
-    end
-  end
+require 'base64'
+require 'json'
+require 'faraday'
+require 'fintecture/pis'
+require 'fintecture/utils/validation'
+require 'fintecture/exceptions'
+require 'fintecture/utils/date'
+require 'fintecture/utils/constants'
+
+module Fintecture
+  class Connect
+    class << self
+
+
+
+      # Build the base of url
+      def api_base_url
+        Fintecture::Api::BaseUrl::FINTECTURE_API_URL[Fintecture.environment.to_sym]
+      end
+
+
+      private
+
+
+
+
+      def as_json(element)
+          return JSON(element.to_json) if element.is_a? Hash
+
+          begin
+            element.as_json
+          rescue NoMethodError
+            raise Fintecture::ValidationException.new("invalid parameter format, the parameter should be a Hash or an Object Model instead a #{element.class.name}")
+          end
+      end
+    end
+  end
 end

data/lib/fintecture/exceptions.rb

@@ -1,4 +1,33 @@
-module Fintecture
-  class ValidationException < Exception; end
-  class CryptoException < Exception; end
+module Fintecture
+  class ValidationException < Exception; end
+  class CryptoException < Exception; end
+  class ApiException
+    class << self
+
+      def error(res)
+        body = JSON.parse res.body
+        
+        code = body['code']
+        log_id = body['log_id']
+        errors = body['errors']
+
+        raise Exception.new(_construct_message(res.status, code, log_id, errors))
+      end
+
+
+      private 
+      def _construct_message(status, code, log_id, errors_array)
+        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"
+        error_string
+      end
+    end
+  end
 end

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

@@ -1,74 +1,120 @@
-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, custom_content_type: nil, bearer: nil, secure_headers: false)
-            conn = connection(url)
-
-            conn.post do |req|
-              req.headers = req_headers(custom_content_type, bearer, secure_headers, method: 'post', body: req_body, url: url)
-              req.body = req_body
-            end
-          end
-
-          def get(url:, req_body: nil, custom_content_type: nil, bearer: nil, secure_headers: false)
-            conn = connection(url)
-
-            conn.get do |req|
-              req.headers = req_headers(custom_content_type, bearer, secure_headers, method: 'get', url: url)
-              req.body = req_body
-            end
-          end
-
-          def req_headers(custom_content_type, bearer, secure_headers, method: '', body: {}, url:)
-            client_token = Base64.strict_encode64("#{Fintecture.app_id}:#{Fintecture.app_secret}")
-
-            {
-                'Accept' => 'application/json',
-                'User-Agent' => "Fintecture Ruby SDK v #{Fintecture::VERSION}",
-                'Authorization' => bearer ? bearer : "Basic #{client_token}",
-                'Content-Type' => custom_content_type ? custom_content_type : 'application/x-www-form-urlencoded',
-            }.merge(secure_headers ? req_secure_headers(body: body, url: url, method: method) : {})
-
-          end
-
-          def req_secure_headers(body: {}, url: '', method: '')
-            payload = ( body.class.name == 'String' ? body : body.to_s )
-            path_name = URI(url).path
-            search_params = URI(url).query
-
-            headers = {
-                'Date' => Fintecture::Utils::Date.header_time.to_s,
-                'X-Request-ID' => Fintecture::Utils::Crypto.generate_uuid
-            }.merge(payload ? load_digest(payload) : {})
-
-            request_target = search_params ? "#{method.downcase} #{path_name}?#{search_params}" : "#{method.downcase} #{path_name}"
-
-            headers['Signature'] = Fintecture::Utils::Crypto.create_signature_header({'(request-target)' => request_target}.merge(headers))
-            headers
-          end
-
-          def load_digest(payload)
-            {'Digest' => "SHA-256=#{Fintecture::Utils::Crypto.hash_base64(payload)}"}
-          end
-
-        end
-      end
-    end
-  end
-end
+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, custom_content_type: nil, bearer: nil, secure_headers: false, additional_headers: nil)
+            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, 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, custom_content_type: nil, bearer: nil, secure_headers: false, additional_headers: nil)
+            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, method: 'get', 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, method: '', body: {}, url:)
+
+            client_token = Base64.strict_encode64("#{Fintecture.app_id}:#{Fintecture.app_secret}")
+
+            {
+                'Accept' => 'application/json',
+                'User-Agent' => "Fintecture Ruby SDK v #{Fintecture::VERSION}",
+                'Authorization' => bearer ? bearer : "Basic #{client_token}",
+                'Content-Type' => custom_content_type ? custom_content_type : 'application/x-www-form-urlencoded',
+            }.merge(secure_headers ? req_secure_headers(additional_headers, body: body, url: url, method: method) : {})
+
+          end
+
+          def req_secure_headers(additional_headers, body: {}, url: '', method: '')
+            raise Fintecture::ValidationException.new('additional_headers must be an object') if additional_headers != nil && !additional_headers.is_a?(Hash) 
+          
+            payload = ( body.class.name == '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 : {})
+
+            # Add additional_headers if exists
+            headers = headers.merge(additional_headers) if additional_headers != nil
+
+
+            headers['Signature'] = Fintecture::Utils::Crypto.create_signature_header({'(request-target)' => request_target}.merge(headers))
+            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?
+  
+        query_string = "#{params.map{|key, value| "#{key}=#{value}"}.join('&')}"
+        
+      end
+  
+
+  
+      class << self
+        attr_accessor :sort_params
+      end
+  
+      # Useful default for OAuth and caching.
+      @sort_params = true
+    end
+  end
+end
+
+
+