fintecture 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc9643b34054d33aaaa2b769e3de4912a08b0e374b4b5af249f9b35161737ab5
-  data.tar.gz: 8fb3bf8e3eeaa845c6487d68d094da0bcbc7359140546dc304c475aa7e099ef6
+  metadata.gz: 14560f3b1fead85e89c9aa9503c6e86697ce2acb5eaa8852245863bffbec25cc
+  data.tar.gz: 12089429aad012effb216c04c972ffd01fa9df5172c0716d33f076bbf1926407
 SHA512:
-  metadata.gz: b6617e344b2e77edfa6957a99498570cb60a515a08a1e38cbc0412600354c32ba1326db8ed606c76a3f19492fe2c47812e70dc4bb4dfeae9a1c3e622380ee398
-  data.tar.gz: 3041e94a9f644133415dee5144d6531fa0cb3dc4ad4b04456d55ff7c4fc05da374434fd07ed142045ee276ac970a5f20253c0b30f94b78ac6d4fb551918ba583
+  metadata.gz: c6f2558e1492658b14135c7d9e449744697517602a7c54c952718e60e0c042f1e36dca47fb27d564df550c18d4d727d7f75efb3e3f7dce0f100b26e5ccd0a733
+  data.tar.gz: dd5a65d0104a6a2fdce72bb92493f841a0664cc6aac78be219b151cea66b775acda59c351f6e6196ebfc01ec3d6e1a80ab8b83d700ee10a347bb1b90103fd21a

data/README.md

@@ -65,11 +65,21 @@ payment_attrs = {
     customer_full_name: 'John Doe',
     customer_email: 'john.doe@email.com',
     customer_ip: '127.0.0.1',
+    customer_phone: '666777888',
+    customer_address: {
+        street: 'Main St.',
+        number: '123',
+        complement: '2nd floor',
+        zip: '75000',
+        city: 'Paris',
+        country: 'fr',
+    },
     redirect_uri: 'http://example.com/callback',
     origin_uri: 'http://example.com/checkout?session=123',
     state: 'somestate',
     psu_type: 'retail',
-    country: 'fr'
+    country: 'fr',
+
 }
 tokens = Fintecture::Pis.get_access_token
 connect_response = Fintecture::Connect.get_pis_connect tokens['access_token'], payment_attrs
@@ -84,11 +94,32 @@ Explanation of each field:
 * customer_full_name: **[mandatory]** The full name of the payer
 * customer_email: **[mandatory]** The email of the payer
 * customer_ip: **[mandatory]** The ip address of the payer
+* customer_phone: **[optional]** The phone of the payer
+* customer_address: **[optional]** The address of the payer. It has the following structure:
+  * street: **[optional]** The address street name
+  * number: **[optional]** The address number
+  * complement: **[optional]** Complement information to the address
+  * zip: **[optional]** The address zip code
+  * city: **[optional]** The address city
+  * country: **[optional]** The country code (2 letters)
 * redirect_uri: **[mandatory]** The callback URL to which the customer is redirected after authentication with his bank
 * origin_uri: **[optional]** A URL to which the customer will be redirected if he wants to exit Fintecture Connect
+* execution_date: **[optional]** A future date to execute the payment. If the execution_date field is omitted, the payment is to be sent immediately.
 * state: **[optional]** A state parameter which is sent back on callback
-* retail: **[optional]** Possible values are **retail** and **corporate** (retail by default)
+* psu_type: **[optional]** Possible values are **retail**, **corporate** and **all** (retail by default)
 * country: **[optional]** Loads a specific collection of providers filter by country
+* provider: **[optional]** Limits the webview to the provided provider
+* beneficiary: **[optional]** The beneficiary of the payment. It has the following structure:
+  * name: **[optional]** The beneficiary name
+  * street: **[optional]** The beneficiary address street name
+  * number: **[optional]** The beneficiary address number
+  * complement: **[optional]** Complement information to the beneficiary address
+  * zip: **[optional]** The beneficiary address zip code
+  * city: **[optional]** The beneficiary address city
+  * country: **[optional]** The beneficiary country code (2 letters)
+  * iban: **[optional]** The beneficiary iban
+  * swift_bic: **[optional]** The beneficiary swift or bic code
+  * bank: **[optional]** The beneficiary bank name
     
 #### Verify payment
 

data/lib/fintecture/connect.rb

@@ -66,16 +66,39 @@ module Fintecture
         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].each do |param|
+        %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
@@ -91,13 +114,32 @@ module Fintecture
             amount: @payment_attrs['amount'],
             currency: @payment_attrs['currency'],
             communication: @payment_attrs['communication'],
-            end_to_end_id: @payment_attrs['end_to_end_id']
+            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_ip: @payment_attrs['customer_ip'],
+            psu_phone: @payment_attrs['customer_phone'],
+            psu_address: @payment_attrs['customer_address']
         }
 
         data = {
@@ -110,9 +152,12 @@ module Fintecture
                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: {amount: @payment_attrs['amount'], currency: @payment_attrs['currency']}}
+            data: { attributes: data_attributes}
         }
       end
 
@@ -127,7 +172,7 @@ module Fintecture
       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,
@@ -139,6 +184,8 @@ module Fintecture
             state: @payment_attrs['state'],
             payload: payload
         }
+        config[:provider] = @payment_attrs['provider'] if @payment_attrs['provider']
+        config
       end
 
       def build_local_digest(parameters)

data/lib/fintecture/utils/constants.rb

@@ -6,7 +6,7 @@ module Fintecture
     module Constants
 
       SIGNEDHEADERPARAMETERLIST = %w[(request-target) Date Digest X-Request-ID];
-      PSU_TYPES = %w[retail corporate]
+      PSU_TYPES = %w[retail corporate all]
       SCOPES = %w[pis ais]
 
     end

data/lib/fintecture/utils/validation.rb

@@ -11,6 +11,15 @@ module Fintecture
           raise Fintecture::ValidationException.new("invalid #{param_name ? param_name : 'parameter'} format, the parameter should be a #{klass} instead a #{target.class.name}")
         end
 
+        def raise_if_invalid_date_format(date)
+          return unless date
+          valid_format = date.match(/\d{4}-\d{2}-\d{2}/)
+          valid_date = ::Date.strptime(date, '%Y-%m-%d') rescue false
+          return if valid_format && valid_date
+
+          raise Fintecture::ValidationException.new("invalidss #{date} date, the format should be YYYY-MM-DD")
+        end
+
       end
     end
   end

data/lib/fintecture/version.rb

@@ -1,3 +1,3 @@
 module Fintecture
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fintecture
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Fintecture
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Short summary