ibanity 2.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48dd4b01d72e61f94d0f750657abe36e7598ae92cbc4112b1be54bc5385900a6
-  data.tar.gz: e2958c684d2b6e9b41474c372407cd78d2f4cc9d54ce9cb0128c68babc5eb9ce
+  metadata.gz: 0e092383f84fc0b8c6df811fe2d1af6bc87de9e344eb1ee799b55c15ab67f54d
+  data.tar.gz: ec5240d8803bae7ce90f13fc013855a66ecc20ff9e6178e22782888d5b24bd2b
 SHA512:
-  metadata.gz: 36edf303e46ef38ccbd09c2f45b5537f534035d39715163599dbe35c9f74e113e920146bb98fe64fb9fac1ee73ee41e448a60a35a608ed54ea7a6844a444eb9f
-  data.tar.gz: 94fb8e370e15e770fbb2791496ed7fac35ef1e4936ee38f020ce8c0556dedd9e02d572014ac490bb08ff1da0984f439e912bcd4f1a75405b5d74b8c48693ee38
+  metadata.gz: 6f006d8c7a773864e6430883439aa6c522b40a758464614e7f543ee1c02637b5df3256f5dc88058c4d6ac518829f9113e607c42c99e46baa066479889427a29e
+  data.tar.gz: c533b786a60213eaf6d3735f18bf1beb3a1831fb2053c7e01f434741703b4a6ed6b577063f1cc4bc736056ab08ea7edf400b7601c9db8b27fc27918659415768

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 2.5
+
+* [Ponto Connect] Add payment requests
+* [Ponto Connect] Add PendingTransaction
+* [Ponto Connect] Add additional webhooks event
+
+  * `Ibanity::Webhooks::PontoConnect::Account::PendingTransactionsCreated`
+  * `Ibanity::Webhooks::PontoConnect::Account::PendingTransactionsUpdated`
+
+## 2.4
+
+* New TransactionDeleteRequest service
+* New Webhooks for Bulk Payment Initiation Request, Payment Initiation Request, and Periodic Payment Initiation Request
+* Refactor library structure
+* Move module Ibanty::Sandbox (FinancialInstitutionAccount, FinancialInstitutionHolding, FinancialInstitutionTransaction, FinancialInstitutionUser) to Ibanty::Xs2a::Sandbox
+
+## 2.3.1
+
+* Migrate from Jose to JWT gem following incompatibly with OpenSSL 3. Only used in webhooks signature validation.
+
 ## 2.3
 
 * [Ponto Connect] Add IntegrationAccount
@@ -12,13 +32,13 @@
 ## 2.2
 
 * [Ponto Connect] Add additional webhook events
-  * `Ibanity::Webhooks::Account::Reauthorized`
-  * `Ibanity::Webhooks::Integration::AccountAdded`
-  * `Ibanity::Webhooks::Integration::AccountRevoked`
-  * `Ibanity::Webhooks::Integration::Created`
-  * `Ibanity::Webhooks::Integration::Revoked`
-  * `Ibanity::Webhooks::Organization::Blocked`
-  * `Ibanity::Webhooks::Organization::Unblocked`
+  * `Ibanity::Webhooks::PontoConnect::Account::Reauthorized`
+  * `Ibanity::Webhooks::PontoConnect::Integration::AccountAdded`
+  * `Ibanity::Webhooks::PontoConnect::Integration::AccountRevoked`
+  * `Ibanity::Webhooks::PontoConnect::Integration::Created`
+  * `Ibanity::Webhooks::PontoConnect::Integration::Revoked`
+  * `Ibanity::Webhooks::PontoConnect::Organization::Blocked`
+  * `Ibanity::Webhooks::PontoConnect::Organization::Unblocked`
 
 ## 2.1
 

data/ibanity.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rest-client", ">= 1.8.0"
-  spec.add_dependency "jose", ">= 1.1.3"
+  spec.add_dependency "jwt", ">= 2.0.0"
   spec.add_development_dependency "rspec", "3.9.0"
 end

data/lib/ibanity/api/consent.rb

@@ -0,0 +1,2 @@
+require_relative "consent/consent"
+require_relative "consent/processing_operation"

data/lib/ibanity/api/isabel_connect.rb

@@ -0,0 +1,9 @@
+require_relative "isabel_connect/account"
+require_relative "isabel_connect/balance"
+require_relative "isabel_connect/transaction"
+require_relative "isabel_connect/intraday_transaction"
+require_relative "isabel_connect/account_report"
+require_relative "isabel_connect/access_token"
+require_relative "isabel_connect/refresh_token"
+require_relative "isabel_connect/token"
+require_relative "isabel_connect/bulk_payment_initiation_request"

data/lib/ibanity/api/ponto_connect/payment_request.rb

@@ -0,0 +1,20 @@
+module Ibanity
+  module PontoConnect
+    class PaymentRequest < Ibanity::BaseResource
+      def self.find(access_token:, account_id:, id:)
+        uri = Ibanity.ponto_connect_api_schema["account"]["paymentRequests"].sub("{accountId}", account_id).sub("{paymentRequestId}", id)
+        find_by_uri(uri: uri, customer_access_token: access_token)
+      end
+
+      def self.create(account_id:, access_token: nil, **attributes)
+        uri = Ibanity.ponto_connect_api_schema["account"]["paymentRequests"].gsub("{accountId}", account_id).gsub("{paymentRequestId}", "")
+        create_by_uri(uri: uri, resource_type: "payment", attributes: attributes, customer_access_token: access_token)
+      end
+
+      def self.delete(id:, account_id:, access_token:)
+        uri = Ibanity.ponto_connect_api_schema["account"]["paymentRequests"].gsub("{accountId}", account_id).gsub("{paymentRequestId}", id)
+        destroy_by_uri(uri: uri, customer_access_token: access_token)
+      end
+    end
+  end
+end

data/lib/ibanity/api/ponto_connect/pending_transaction.rb

@@ -0,0 +1,22 @@
+module Ibanity
+  module PontoConnect
+    class PendingTransaction < Ibanity::BaseResource
+      def self.list(access_token:, account_id: nil, synchronization_id: nil, **query_params)
+        uri = if synchronization_id
+          Ibanity.ponto_connect_api_schema["synchronization"]["updatedPendingTransactions"]
+            .sub("{synchronizationId}", synchronization_id)
+        else
+          Ibanity.ponto_connect_api_schema["account"]["pendingTransactions"]
+            .sub("{accountId}", account_id)
+            .sub("{pendingTransactionId}", "")
+        end
+        list_by_uri(uri: uri, query_params: query_params, customer_access_token: access_token)
+      end
+
+      def self.find(access_token:, account_id:, id:)
+        uri = Ibanity.ponto_connect_api_schema["account"]["pendingTransactions"].sub("{accountId}", account_id).sub("{pendingTransactionId}", id)
+        find_by_uri(uri: uri, customer_access_token: access_token)
+      end
+    end
+  end
+end

data/lib/ibanity/api/ponto_connect.rb

@@ -0,0 +1,18 @@
+require_relative "ponto_connect/token"
+require_relative "ponto_connect/financial_institution"
+require_relative "ponto_connect/account"
+require_relative "ponto_connect/transaction"
+require_relative "ponto_connect/pending_transaction"
+require_relative "ponto_connect/synchronization"
+require_relative "ponto_connect/payment"
+require_relative "ponto_connect/bulk_payment"
+require_relative "ponto_connect/payment_request"
+require_relative "ponto_connect/user_info"
+require_relative "ponto_connect/usage"
+require_relative "ponto_connect/integration"
+require_relative "ponto_connect/sandbox/financial_institution_account"
+require_relative "ponto_connect/sandbox/financial_institution_transaction"
+require_relative "ponto_connect/onboarding_details"
+require_relative "ponto_connect/reauthorization_request"
+require_relative "ponto_connect/payment_activation_request"
+require_relative "ponto_connect/integration_account"

data/lib/ibanity/api/sandbox/financial_institution_account.rb

@@ -1,40 +1,25 @@
 module Ibanity
   module Sandbox
+    # <b>DEPRECATED:</b> Please use <tt>Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount</tt> instead.
     class FinancialInstitutionAccount < Ibanity::BaseResource
       def self.create(financial_institution_user_id:, financial_institution_id:, idempotency_key: nil, **attributes)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccounts"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", "")
-        uri = Ibanity.client.build_uri(path)
-        create_by_uri(uri: uri, resource_type: "financialInstitutionAccount", attributes: attributes, idempotency_key: idempotency_key)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionAccount.create` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount.create instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount.create(financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, idempotency_key: idempotency_key, attributes)
       end
 
       def self.list(financial_institution_id:, financial_institution_user_id:, **query_params)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccounts"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", "")
-        uri = Ibanity.client.build_uri(path)
-        list_by_uri(uri: uri, query_params: query_params)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionAccount.list` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount.list instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount.list(financial_institution_id: financial_institution_id, financial_institution_user_id: financial_institution_user_id, query_params)
       end
 
       def self.find(id:, financial_institution_user_id:, financial_institution_id:)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccounts"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", id)
-        uri = Ibanity.client.build_uri(path)
-        find_by_uri(uri: uri)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionAccount.find` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount.find instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount.find(id: id, financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id)
       end
 
       def self.delete(id:, financial_institution_user_id:, financial_institution_id:)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccounts"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", id)
-        uri = Ibanity.client.build_uri(path)
-        destroy_by_uri(uri: uri)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionAccount.delete` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount.delete instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionAccount.delete(id: id, financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id)
       end
     end
   end

data/lib/ibanity/api/sandbox/financial_institution_holding.rb

@@ -1,44 +1,25 @@
 module Ibanity
   module Sandbox
+    # <b>DEPRECATED:</b> Please use <tt>Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding</tt> instead.
     class FinancialInstitutionHolding < Ibanity::BaseResource
       def self.create(financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, idempotency_key: nil, **attributes)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionHoldings"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionHoldingId}", "")
-        uri = Ibanity.client.build_uri(path)
-        create_by_uri(uri: uri, resource_type: "financialInstitutionHolding", attributes: attributes, idempotency_key: idempotency_key)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionHolding.create` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding.create instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding.create(financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id, idempotency_key: idempotency_key, attributes)
       end
 
       def self.list(financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, **query_params)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionHoldings"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionHoldingId}", "")
-        uri = Ibanity.client.build_uri(path)
-        list_by_uri(uri: uri, query_params: query_params)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionHolding.list` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding.list instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding.list(financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id, query_params)
       end
 
       def self.find(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionHoldings"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionHoldingId}", id)
-        uri = Ibanity.client.build_uri(path)
-        find_by_uri(uri: uri)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionHolding.find` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding.find instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding.find(id: id, financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id)
       end
 
       def self.delete(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionHoldings"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionHoldingId}", id)
-        uri = Ibanity.client.build_uri(path)
-        destroy_by_uri(uri: uri)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionHolding.delete` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding.delete instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionHolding.find(id: id, financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id)
       end
     end
   end

data/lib/ibanity/api/sandbox/financial_institution_transaction.rb

@@ -1,54 +1,30 @@
 module Ibanity
   module Sandbox
+    # <b>DEPRECATED:</b> Please use <tt>Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction</tt> instead.
     class FinancialInstitutionTransaction < Ibanity::BaseResource
       def self.create(financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, idempotency_key: nil, **attributes)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionTransactionId}", "")
-        uri = Ibanity.client.build_uri(path)
-        create_by_uri(uri: uri, resource_type: "financialInstitutionTransaction", attributes: attributes, idempotency_key: idempotency_key)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionTransaction.create` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.create instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.create(financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id, idempotency_key: idempotency_key, attributes)
       end
 
       def self.list(financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, **query_params)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionTransactionId}", "")
-        uri = Ibanity.client.build_uri(path)
-        list_by_uri(uri: uri, query_params: query_params)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionTransaction.list` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.list instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.list(financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id, query_params)
       end
 
       def self.find(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionTransactionId}", id)
-        uri = Ibanity.client.build_uri(path)
-        find_by_uri(uri: uri)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionTransaction.find` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.find instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.find(id: id, financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id)
       end
 
       def self.update(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, idempotency_key: nil, **attributes)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionTransactionId}", id)
-        uri = Ibanity.client.build_uri(path)
-        update_by_uri(uri: uri, resource_type: "financialInstitutionTransaction", attributes: attributes, idempotency_key: idempotency_key)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionTransaction.create` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.create instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.create(id: id, financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id, idempotency_key: idempotency_key, attributes)
       end
 
       def self.delete(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:)
-        path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
-          .gsub("{financialInstitutionId}", financial_institution_id)
-          .gsub("{financialInstitutionUserId}", financial_institution_user_id)
-          .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
-          .gsub("{financialInstitutionTransactionId}", id)
-        uri = Ibanity.client.build_uri(path)
-        destroy_by_uri(uri: uri)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionTransaction.delete` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.delete instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionTransaction.find(id: id, financial_institution_user_id: financial_institution_user_id, financial_institution_id: financial_institution_id, financial_institution_account_id: financial_institution_account_id)
       end
     end
   end

data/lib/ibanity/api/sandbox/financial_institution_user.rb

@@ -1,31 +1,30 @@
 module Ibanity
   module Sandbox
+    # <b>DEPRECATED:</b> Please use <tt>Ibanity::Xs2a::Sandbox::FinancialInstitutionUser</tt> instead.
     class FinancialInstitutionUser < Ibanity::BaseResource
       def self.create(idempotency_key: nil, **attributes)
-        path     = Ibanity.sandbox_api_schema["financialInstitutionUsers"].gsub("{financialInstitutionUserId}", "")
-        uri      = Ibanity.client.build_uri(path)
-        create_by_uri(uri: uri, resource_type: "financialInstitutionUser", attributes: attributes, idempotency_key: idempotency_key)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionUser.create` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.create instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.create(idempotency_key: idempotency_key, attributes)
       end
 
       def self.list(**query_params)
-        uri = Ibanity.sandbox_api_schema["financialInstitutionUsers"].sub("{financialInstitutionUserId}", "")
-        list_by_uri(uri: uri, query_params: query_params)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionUser.list` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.list instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.list(query_params)
       end
 
       def self.find(id:)
-        uri = Ibanity.sandbox_api_schema["financialInstitutionUsers"].sub("{financialInstitutionUserId}", id)
-        find_by_uri(uri: uri)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionUser.find` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.find instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.find(id: id)
       end
 
       def self.update(id:, idempotency_key: nil, **attributes)
-        path = Ibanity.sandbox_api_schema["financialInstitutionUsers"].sub("{financialInstitutionUserId}", id)
-        uri = Ibanity.client.build_uri(path)
-        update_by_uri(uri: uri, resource_type: "financialInstitutionUser", attributes: attributes, idempotency_key: idempotency_key)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionUser.update` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.update instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.find(id: id, idempotency_key: idempotency_key, attributes)
       end
 
       def self.delete(id:)
-        uri = Ibanity.sandbox_api_schema["financialInstitutionUsers"].sub("{financialInstitutionUserId}", id)
-        destroy_by_uri(uri: uri)
+        warn "[DEPRECATION] `Ibanity::Sandbox::FinancialInstitutionUser.delete` is deprecated. Please use Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.delete instead"
+        Ibanity::Xs2a::Sandbox::FinancialInstitutionUser.delete(id: id)
       end
     end
   end

data/lib/ibanity/api/webhooks/ponto_connect.rb

@@ -19,6 +19,12 @@ module Ibanity
         class TransactionsUpdated < Ibanity::BaseResource
         end
 
+        class PendingTransactionsCreated < Ibanity::BaseResource
+        end
+
+        class PendingTransactionsUpdated < Ibanity::BaseResource
+        end
+
         class Reauthorized < Ibanity::BaseResource
         end
       end
@@ -44,6 +50,11 @@ module Ibanity
         class Unblocked < Ibanity::BaseResource
         end
       end
+
+      module PaymentRequest
+        class Closed < Ibanity::BaseResource
+        end
+      end
     end
   end
 end

data/lib/ibanity/api/webhooks/xs2a.rb

@@ -16,6 +16,9 @@ module Ibanity
         class TransactionsCreated < Ibanity::BaseResource
         end
 
+        class TransactionsDeleted < Ibanity::BaseResource
+        end
+
         class TransactionsUpdated < Ibanity::BaseResource
         end
 
@@ -25,6 +28,30 @@ module Ibanity
         class PendingTransactionsUpdated < Ibanity::BaseResource
         end
       end
+
+      module BulkPaymentInitiationRequest
+        class AuthorizationCompleted < Ibanity::BaseResource
+        end
+
+        class StatusUpdated < Ibanity::BaseResource
+        end
+      end
+
+      module PaymentInitiationRequest
+        class AuthorizationCompleted < Ibanity::BaseResource
+        end
+
+        class StatusUpdated < Ibanity::BaseResource
+        end
+      end
+
+      module PeriodicPaymentInitiationRequest
+        class AuthorizationCompleted < Ibanity::BaseResource
+        end
+
+        class StatusUpdated < Ibanity::BaseResource
+        end
+      end
     end
   end
 end

data/lib/ibanity/api/webhooks.rb

@@ -0,0 +1,3 @@
+require_relative "webhooks/key"
+require_relative "webhooks/xs2a"
+require_relative "webhooks/ponto_connect"

data/lib/ibanity/api/xs2a/holding.rb

@@ -2,7 +2,7 @@ module Ibanity
   module Xs2a
     class Holding < Ibanity::BaseResource
       def self.list(financial_institution_id:, account_id:, customer_access_token:, headers: nil,  **query_params)
-        uri = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["holdings"]
+        uri = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["account"]["holdings"]
           .sub("{financialInstitutionId}", financial_institution_id)
           .sub("{accountId}", account_id)
           .sub("{holdingId}", "")
@@ -10,7 +10,7 @@ module Ibanity
       end
 
       def self.find(id:, financial_institution_id:, account_id:, customer_access_token:)
-        uri = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["holdings"]
+        uri = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["account"]["holdings"]
           .sub("{financialInstitutionId}", financial_institution_id)
           .sub("{accountId}", account_id)
           .sub("{holdingId}", id)

data/lib/ibanity/api/xs2a/pending_transaction.rb

@@ -6,7 +6,7 @@ module Ibanity
           Ibanity.xs2a_api_schema["customer"]["synchronization"]["updatedPendingTransactions"]
           .sub("{synchronizationId}", synchronization_id)
         else
-          Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["pendingTransactions"]
+          Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["account"]["pendingTransactions"]
             .sub("{financialInstitutionId}", financial_institution_id)
             .sub("{accountId}", account_id)
             .sub("{pendingTransactionId}", "")
@@ -16,7 +16,7 @@ module Ibanity
       end
 
       def self.find(id:, financial_institution_id:, account_id:, customer_access_token:)
-        uri = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["pendingTransactions"]
+        uri = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["account"]["pendingTransactions"]
           .sub("{financialInstitutionId}", financial_institution_id)
           .sub("{accountId}", account_id)
           .sub("{pendingTransactionId}", id)

data/lib/ibanity/api/xs2a/sandbox/financial_institution_account.rb

@@ -0,0 +1,43 @@
+module Ibanity
+  module Xs2a
+    module Sandbox
+      class FinancialInstitutionAccount < Ibanity::BaseResource
+        def self.create(financial_institution_user_id:, financial_institution_id:, idempotency_key: nil, **attributes)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccounts"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", "")
+          uri = Ibanity.client.build_uri(path)
+          create_by_uri(uri: uri, resource_type: "financialInstitutionAccount", attributes: attributes, idempotency_key: idempotency_key)
+        end
+
+        def self.list(financial_institution_id:, financial_institution_user_id:, **query_params)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccounts"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", "")
+          uri = Ibanity.client.build_uri(path)
+          list_by_uri(uri: uri, query_params: query_params)
+        end
+
+        def self.find(id:, financial_institution_user_id:, financial_institution_id:)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccounts"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", id)
+          uri = Ibanity.client.build_uri(path)
+          find_by_uri(uri: uri)
+        end
+
+        def self.delete(id:, financial_institution_user_id:, financial_institution_id:)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccounts"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", id)
+          uri = Ibanity.client.build_uri(path)
+          destroy_by_uri(uri: uri)
+        end
+      end
+    end
+  end
+end

data/lib/ibanity/api/xs2a/sandbox/financial_institution_holding.rb

@@ -0,0 +1,47 @@
+module Ibanity
+  module Xs2a
+    module Sandbox
+      class FinancialInstitutionHolding < Ibanity::BaseResource
+        def self.create(financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, idempotency_key: nil, **attributes)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionHoldings"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionHoldingId}", "")
+          uri = Ibanity.client.build_uri(path)
+          create_by_uri(uri: uri, resource_type: "financialInstitutionHolding", attributes: attributes, idempotency_key: idempotency_key)
+        end
+
+        def self.list(financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, **query_params)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionHoldings"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionHoldingId}", "")
+          uri = Ibanity.client.build_uri(path)
+          list_by_uri(uri: uri, query_params: query_params)
+        end
+
+        def self.find(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionHoldings"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionHoldingId}", id)
+          uri = Ibanity.client.build_uri(path)
+          find_by_uri(uri: uri)
+        end
+
+        def self.delete(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionHoldings"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionHoldingId}", id)
+          uri = Ibanity.client.build_uri(path)
+          destroy_by_uri(uri: uri)
+        end
+      end
+    end
+  end
+end

data/lib/ibanity/api/xs2a/sandbox/financial_institution_transaction.rb

@@ -0,0 +1,57 @@
+module Ibanity
+  module Xs2a
+    module Sandbox
+      class FinancialInstitutionTransaction < Ibanity::BaseResource
+        def self.create(financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, idempotency_key: nil, **attributes)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionTransactionId}", "")
+          uri = Ibanity.client.build_uri(path)
+          create_by_uri(uri: uri, resource_type: "financialInstitutionTransaction", attributes: attributes, idempotency_key: idempotency_key)
+        end
+
+        def self.list(financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, **query_params)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionTransactionId}", "")
+          uri = Ibanity.client.build_uri(path)
+          list_by_uri(uri: uri, query_params: query_params)
+        end
+
+        def self.find(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionTransactionId}", id)
+          uri = Ibanity.client.build_uri(path)
+          find_by_uri(uri: uri)
+        end
+
+        def self.update(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:, idempotency_key: nil, **attributes)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionTransactionId}", id)
+          uri = Ibanity.client.build_uri(path)
+          update_by_uri(uri: uri, resource_type: "financialInstitutionTransaction", attributes: attributes, idempotency_key: idempotency_key)
+        end
+
+        def self.delete(id:, financial_institution_user_id:, financial_institution_id:, financial_institution_account_id:)
+          path = Ibanity.sandbox_api_schema["financialInstitution"]["financialInstitutionAccount"]["financialInstitutionTransactions"]
+            .gsub("{financialInstitutionId}", financial_institution_id)
+            .gsub("{financialInstitutionUserId}", financial_institution_user_id)
+            .gsub("{financialInstitutionAccountId}", financial_institution_account_id)
+            .gsub("{financialInstitutionTransactionId}", id)
+          uri = Ibanity.client.build_uri(path)
+          destroy_by_uri(uri: uri)
+        end
+      end
+    end
+  end
+end

data/lib/ibanity/api/xs2a/sandbox/financial_institution_user.rb

@@ -0,0 +1,34 @@
+module Ibanity
+  module Xs2a
+    module Sandbox
+      class FinancialInstitutionUser < Ibanity::BaseResource
+        def self.create(idempotency_key: nil, **attributes)
+          path     = Ibanity.sandbox_api_schema["financialInstitutionUsers"].gsub("{financialInstitutionUserId}", "")
+          uri      = Ibanity.client.build_uri(path)
+          create_by_uri(uri: uri, resource_type: "financialInstitutionUser", attributes: attributes, idempotency_key: idempotency_key)
+        end
+
+        def self.list(**query_params)
+          uri = Ibanity.sandbox_api_schema["financialInstitutionUsers"].sub("{financialInstitutionUserId}", "")
+          list_by_uri(uri: uri, query_params: query_params)
+        end
+
+        def self.find(id:)
+          uri = Ibanity.sandbox_api_schema["financialInstitutionUsers"].sub("{financialInstitutionUserId}", id)
+          find_by_uri(uri: uri)
+        end
+
+        def self.update(id:, idempotency_key: nil, **attributes)
+          path = Ibanity.sandbox_api_schema["financialInstitutionUsers"].sub("{financialInstitutionUserId}", id)
+          uri = Ibanity.client.build_uri(path)
+          update_by_uri(uri: uri, resource_type: "financialInstitutionUser", attributes: attributes, idempotency_key: idempotency_key)
+        end
+
+        def self.delete(id:)
+          uri = Ibanity.sandbox_api_schema["financialInstitutionUsers"].sub("{financialInstitutionUserId}", id)
+          destroy_by_uri(uri: uri)
+        end
+      end
+    end
+  end
+end

data/lib/ibanity/api/xs2a/transaction.rb

@@ -6,7 +6,7 @@ module Ibanity
           Ibanity.xs2a_api_schema["customer"]["synchronization"]["updatedTransactions"]
           .sub("{synchronizationId}", synchronization_id)
         else
-          Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["transactions"]
+          Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["account"]["transactions"]
             .sub("{financialInstitutionId}", financial_institution_id)
             .sub("{accountId}", account_id)
             .sub("{transactionId}", "")
@@ -15,7 +15,7 @@ module Ibanity
       end
 
       def self.find(id:, financial_institution_id:, account_id:, customer_access_token:)
-        uri = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["transactions"]
+        uri = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["account"]["transactions"]
           .sub("{financialInstitutionId}", financial_institution_id)
           .sub("{accountId}", account_id)
           .sub("{transactionId}", id)

data/lib/ibanity/api/xs2a/transaction_delete_request.rb

@@ -0,0 +1,25 @@
+module Ibanity
+  module Xs2a
+    class TransactionDeleteRequest < Ibanity::BaseResource
+      def self.create_for_application(idempotency_key: nil, **attributes)
+        path = Ibanity.xs2a_api_schema["transactionDeleteRequests"]
+        uri = Ibanity.client.build_uri(path)
+        create_by_uri(uri: uri, resource_type: "transactionDeleteRequest", attributes: attributes, idempotency_key: idempotency_key)
+      end
+
+      def self.create_for_customer(idempotency_key: nil, customer_access_token:, **attributes)
+        path = Ibanity.xs2a_api_schema["customer"]["transactionDeleteRequests"]
+        uri = Ibanity.client.build_uri(path)
+        create_by_uri(uri: uri, resource_type: "transactionDeleteRequest", attributes: attributes, idempotency_key: idempotency_key, customer_access_token: customer_access_token)
+      end
+
+      def self.create_for_financial_institution_and_account(idempotency_key: nil, financial_institution_id:, account_id:, customer_access_token:, **attributes)
+        path = Ibanity.xs2a_api_schema["customer"]["financialInstitution"]["account"]["transactionDeleteRequests"]
+                    .sub("{financialInstitutionId}", financial_institution_id)
+                    .sub("{accountId}", account_id)
+        uri = Ibanity.client.build_uri(path)
+        create_by_uri(uri: uri, resource_type: "transactionDeleteRequest", attributes: attributes, idempotency_key: idempotency_key, customer_access_token: customer_access_token)
+      end
+    end
+  end
+end

data/lib/ibanity/api/xs2a.rb

@@ -0,0 +1,23 @@
+require_relative "xs2a/account"
+require_relative "xs2a/pending_transaction"
+require_relative "xs2a/transaction"
+require_relative "xs2a/holding"
+require_relative "xs2a/batch_synchronization"
+require_relative "xs2a/financial_institution"
+require_relative "xs2a/financial_institution_country"
+require_relative "xs2a/account_information_access_request"
+require_relative "xs2a/account_information_access_request_authorization"
+require_relative "xs2a/payment_initiation_request_authorization"
+require_relative "xs2a/customer_access_token"
+require_relative "xs2a/customer"
+require_relative "xs2a/payment_initiation_request"
+require_relative "xs2a/transaction_delete_request"
+require_relative "xs2a/bulk_payment_initiation_request"
+require_relative "xs2a/bulk_payment_initiation_request_authorization"
+require_relative "xs2a/periodic_payment_initiation_request"
+require_relative "xs2a/periodic_payment_initiation_request_authorization"
+require_relative "xs2a/synchronization"
+require_relative "xs2a/sandbox/financial_institution_account"
+require_relative "xs2a/sandbox/financial_institution_transaction"
+require_relative "xs2a/sandbox/financial_institution_holding"
+require_relative "xs2a/sandbox/financial_institution_user"

data/lib/ibanity/version.rb

@@ -1,3 +1,3 @@
 module Ibanity
-  VERSION = "2.3"
+  VERSION = "2.5.0"
 end

data/lib/ibanity/webhook.rb

@@ -26,66 +26,56 @@ module Ibanity
       #
       # Returns true otherwise
       def self.verify!(payload, signature_header, tolerance)
-        begin
-          key_details = JOSE::JWT.peek_protected(signature_header).to_hash
-          raise unless key_details["alg"] == SIGNING_ALGORITHM && key_details["kid"]
-        rescue
-          raise Ibanity::Error.new("Key details could not be parsed from the header", nil)
-        end
-
-        key = Ibanity.webhook_keys.find { |key| key.kid == key_details["kid"] }
+        jwks_loader = ->(options) do
+          raise Ibanity::Error.new("The key id from the header didn't match an available signing key", nil) if options[:kid_not_found]
 
-        if key.nil?
-          raise Ibanity::Error.new("The key id from the header didn't match an available signing key", nil)
+          keys = Ibanity.webhook_keys.select { |key| key.use == "sig" }
+                                     .map { |key| JWT::JWK.new(key.to_h {|key, value| [key.to_s, value] }) }
+          JWT::JWK::Set.new(keys)
         end
-        signer = JOSE::JWK.from(key.to_h {|key, value| [key.to_s, value] })
-        verified, claims_string, _jws = JOSE::JWT.verify_strict(signer, [SIGNING_ALGORITHM], signature_header)
-
-        raise Ibanity::Error.new("The signature verification failed", nil) unless verified
 
-        jwt = JOSE::JWT.from(claims_string)
+        options = {
+          aud: Ibanity.client.application_id,
+          algorithm: SIGNING_ALGORITHM,
+          exp_leeway: tolerance,
+          iss: Ibanity.client.base_uri,
+          jwks: jwks_loader,
+          verify_aud: true,
+          verify_iss: true
+        }
+        jwts = JWT.decode(signature_header, nil, true, options)
+        jwt = jwts.first
 
         validate_digest!(jwt, payload)
         validate_issued_at!(jwt, tolerance)
-        validate_expiration!(jwt, tolerance)
-        validate_issuer!(jwt)
-        validate_audience!(jwt)
 
         true
+      rescue JWT::ExpiredSignature
+        raise_invalid_signature_error!("exp")
+      rescue JWT::IncorrectAlgorithm
+        raise Ibanity::Error.new("Incorrect algorithm for signature", nil)
+      rescue JWT::InvalidAudError
+        raise_invalid_signature_error!("aud")
+      rescue JWT::InvalidIssuerError
+        raise_invalid_signature_error!("iss")
+      rescue JWT::DecodeError
+        raise Ibanity::Error.new("The signature verification failed", nil)
       end
 
       private
 
       def self.validate_digest!(jwt, payload)
-        unless Digest::SHA512.base64digest(payload) == jwt.fields["digest"]
+        unless Digest::SHA512.base64digest(payload) == jwt["digest"]
           raise_invalid_signature_error!("digest")
         end
       end
 
       def self.validate_issued_at!(jwt, tolerance)
-        unless jwt.fields["iat"] <= Time.now.to_i + tolerance
+        unless jwt["iat"] <= Time.now.to_i + tolerance
           raise_invalid_signature_error!("iat")
         end
       end
 
-      def self.validate_expiration!(jwt, tolerance)
-        unless jwt.fields["exp"] >= Time.now.to_i - tolerance
-          raise_invalid_signature_error!("exp")
-        end
-      end
-
-      def self.validate_issuer!(jwt)
-        unless jwt.fields["iss"] == Ibanity.client.base_uri
-          raise_invalid_signature_error!("iss")
-        end
-      end
-
-      def self.validate_audience!(jwt)
-        unless jwt.fields["aud"] == Ibanity.client.application_id
-          raise_invalid_signature_error!("aud")
-        end
-      end
-
       def self.raise_invalid_signature_error!(field)
         raise Ibanity::Error.new("The signature #{field} is invalid", nil)
       end

data/lib/ibanity.rb

@@ -4,69 +4,25 @@ require "uri"
 require "rest_client"
 require "json"
 require "securerandom"
-require "jose"
+require "jwt"
 
 require_relative "ibanity/util"
 require_relative "ibanity/error"
 require_relative "ibanity/collection"
 require_relative "ibanity/client"
 require_relative "ibanity/http_signature"
+require_relative "ibanity/webhook"
+
 require_relative "ibanity/api/base_resource"
 require_relative "ibanity/api/flat_resource"
-require_relative "ibanity/webhook"
-require_relative "ibanity/api/xs2a/account"
-require_relative "ibanity/api/xs2a/pending_transaction"
-require_relative "ibanity/api/xs2a/transaction"
-require_relative "ibanity/api/xs2a/holding"
-require_relative "ibanity/api/xs2a/batch_synchronization"
-require_relative "ibanity/api/xs2a/financial_institution"
-require_relative "ibanity/api/xs2a/financial_institution_country"
-require_relative "ibanity/api/xs2a/account_information_access_request"
-require_relative "ibanity/api/xs2a/account_information_access_request_authorization"
-require_relative "ibanity/api/xs2a/payment_initiation_request_authorization"
-require_relative "ibanity/api/xs2a/customer_access_token"
-require_relative "ibanity/api/xs2a/customer"
-require_relative "ibanity/api/xs2a/payment_initiation_request"
-require_relative "ibanity/api/xs2a/bulk_payment_initiation_request"
-require_relative "ibanity/api/xs2a/bulk_payment_initiation_request_authorization"
-require_relative "ibanity/api/xs2a/periodic_payment_initiation_request"
-require_relative "ibanity/api/xs2a/periodic_payment_initiation_request_authorization"
-require_relative "ibanity/api/xs2a/synchronization"
+
 require_relative "ibanity/api/o_auth_resource"
-require_relative "ibanity/api/isabel_connect/account"
-require_relative "ibanity/api/isabel_connect/balance"
-require_relative "ibanity/api/isabel_connect/transaction"
-require_relative "ibanity/api/isabel_connect/intraday_transaction"
-require_relative "ibanity/api/isabel_connect/account_report"
-require_relative "ibanity/api/isabel_connect/access_token"
-require_relative "ibanity/api/isabel_connect/refresh_token"
-require_relative "ibanity/api/isabel_connect/token"
-require_relative "ibanity/api/isabel_connect/bulk_payment_initiation_request"
-require_relative "ibanity/api/sandbox/financial_institution_account"
-require_relative "ibanity/api/sandbox/financial_institution_transaction"
-require_relative "ibanity/api/sandbox/financial_institution_holding"
-require_relative "ibanity/api/sandbox/financial_institution_user"
-require_relative "ibanity/api/ponto_connect/token"
-require_relative "ibanity/api/ponto_connect/financial_institution"
-require_relative "ibanity/api/ponto_connect/account"
-require_relative "ibanity/api/ponto_connect/transaction"
-require_relative "ibanity/api/ponto_connect/synchronization"
-require_relative "ibanity/api/consent/consent"
-require_relative "ibanity/api/consent/processing_operation"
-require_relative "ibanity/api/ponto_connect/payment"
-require_relative "ibanity/api/ponto_connect/bulk_payment"
-require_relative "ibanity/api/ponto_connect/user_info"
-require_relative "ibanity/api/ponto_connect/usage"
-require_relative "ibanity/api/ponto_connect/integration"
-require_relative "ibanity/api/ponto_connect/sandbox/financial_institution_account"
-require_relative "ibanity/api/ponto_connect/sandbox/financial_institution_transaction"
-require_relative "ibanity/api/ponto_connect/onboarding_details"
-require_relative "ibanity/api/ponto_connect/reauthorization_request"
-require_relative "ibanity/api/ponto_connect/payment_activation_request"
-require_relative "ibanity/api/ponto_connect/integration_account"
-require_relative "ibanity/api/webhooks/key"
-require_relative "ibanity/api/webhooks/xs2a"
-require_relative "ibanity/api/webhooks/ponto_connect"
+
+require_relative "ibanity/api/consent"
+require_relative "ibanity/api/ponto_connect"
+require_relative "ibanity/api/isabel_connect"
+require_relative "ibanity/api/webhooks"
+require_relative "ibanity/api/xs2a"
 
 module Ibanity
   class << self

data/spec/lib/ibanity/webhook_signature_spec.rb

@@ -0,0 +1,75 @@
+require 'ibanity'
+
+RSpec.describe Ibanity::Webhook::Signature do
+  subject(:signature_module) { described_class }
+
+  let(:client) { instance_double("Ibanity::Client") }
+
+  before do
+    allow(Ibanity).to receive(:client).and_return(client)
+    allow(Ibanity).to receive(:webhook_keys).and_return(
+      [
+        Ibanity::Webhooks::Key.new(
+          alg: "RS512",
+          e: "AQAB",
+          kid: "sandbox_events_signature_1",
+          kty: "RSA",
+          n: "v9qVZmotpil47Pw2NOmP11bpE5B_GtG6ICfqtm13Uusa4asf4FWedclr-kQTV2Ly5rSItq2f3RGRNyove_4TiTIbx21rwM5HP0iFhlVaqHjkr1iSmKzCFojOnTM4UwKQNROhDVDC6TWIzSafZkBacUrCX5l0PLSh2aEK8aiopu5ajYpOr8Ipjw_mbKXxBfcxtjgskbXPyEcf6xlB_Dygl9-btAvRTKiuie4qAWANTdVAgSnddjZMJxFnndZMCH1h-z4ISwphBYbwG2aZrZ7RfHnoIROxsdmKeostYtHy3gMR4_poufzFRR8lpvODd3m7lzdXKBTCvzlQYBNpmf6gmG9p08laE-h67F1GoqvuqspcvRlVpGZEzEwRIbPMAaS4_omCSj4HFZyo58PLUsAp--AD8GGFfVMyBdFhTEkr2235O5AP4UMdHuvyP-NPFCsqibqKK1GIl_Hy0UXnqg7-MCGqs4jX1k4IZZ3wDwza30f1O6tUtaOT8YXzZ2ZWnVWyMLcNx6gep8t3A7gTzEXcselrJgO6SLFRhYA0QmtIRtTwnl-8OmjEi5AJVzO0e-yiRj7g_JLEmgG3pDwmvbiXzEqkY5mPqJMB9G5qcd0SWgvvZs02_1tRRhvw0D5BTKfcEcLW9PKm8Nts1_BGSXKOhTSeQgxuw4iC63ST3dtpl-0=",
+          status: "ACTIVE",
+          use: "sig"
+        )
+      ]
+    )
+    allow(client).to receive(:application_id).and_return("e643b5be-ccb1-4a38-b7b6-36689853bef5")
+    allow(client).to receive(:base_uri).and_return("https://api.ibanity.com")
+  end
+
+  describe ".verify!" do
+    let(:payload) { Fixture.load_unparsed_json("webhooks/example_payload.json") }
+    let(:signature) { Fixture.load_signature("webhooks/example_signature.sig") }
+    let(:tolerance) { Time.now.to_i + 10 - 1691670985 }
+
+    it "returns true for a correct signature" do
+      expect(signature_module.verify!(payload, signature, tolerance)).to be_truthy
+    end
+
+    it "raises an error if the contents are altered" do
+      expect do
+        signature_module.verify!(payload + "altered", signature, tolerance)
+      end.to raise_error(Ibanity::Error, /The signature digest is invalid/)
+    end
+
+    it "raises an error if the signature is expired" do
+      expect do
+        signature_module.verify!(payload, signature, 0)
+      end.to raise_error(Ibanity::Error, /The signature exp is invalid/)
+    end
+
+    it "raises an error if the audience is invalid" do
+      allow(client).to receive(:application_id).and_return("invalid")
+      expect do
+        signature_module.verify!(payload, signature, tolerance)
+      end.to raise_error(Ibanity::Error, /The signature aud is invalid/)
+    end
+
+    it "raises an error if the issuer is invalid" do
+      allow(client).to receive(:base_uri).and_return("invalid")
+      expect do
+        signature_module.verify!(payload, signature, tolerance)
+      end.to raise_error(Ibanity::Error, /The signature iss is invalid/)
+    end
+
+    it "raises an error if the signing key is unavailable" do
+      allow(Ibanity).to receive(:webhook_keys).and_return([])
+      expect do
+        signature_module.verify!(payload, signature, tolerance)
+      end.to raise_error(Ibanity::Error, /The key id from the header didn't match an available signing key/)
+    end
+
+    it "raises an error if the signature is altered" do
+      expect do
+        signature_module.verify!(payload, signature + "altered", tolerance)
+      end.to raise_error(Ibanity::Error, /The signature verification failed/)
+    end
+  end
+end

data/spec/support/fixture.rb

@@ -5,4 +5,14 @@ module Fixture
     path = Pathname([File.dirname(__FILE__ ), "fixtures", "json", filename].join("/"))
     JSON.parse(File.read(path))
   end
+
+  def self.load_unparsed_json(filename)
+    path = Pathname([File.dirname(__FILE__ ), "fixtures", "json", filename].join("/"))
+    File.read(path)
+  end
+
+  def self.load_signature(filename)
+    path = Pathname([File.dirname(__FILE__ ), "fixtures", "signature", filename].join("/"))
+    File.read(path)
+  end
 end

data/spec/support/fixtures/json/webhooks/example_payload.json

@@ -0,0 +1 @@
+{"data":{"attributes":{"createdAt":"2023-08-10T12:24:42.224Z","synchronizationSubtype":"accountTransactions"},"id":"3465fd2f-6c9a-484e-971e-56bf44c9181a","relationships":{"account":{"data":{"id":"1d89d411-e310-4802-bbb7-aad7d98371e7","type":"account"}},"organization":{"data":{"id":"9315d6b3-129a-481a-9604-e2a95e0f967d","type":"organization"}},"synchronization":{"data":{"id":"178b59a6-679f-43d4-b5ad-28caea0bc08b","type":"synchronization"}}},"type":"pontoConnect.synchronization.succeededWithoutChange"}}

data/spec/support/fixtures/signature/webhooks/example_signature.sig

@@ -0,0 +1 @@
+eyJhbGciOiJSUzUxMiIsImtpZCI6InNhbmRib3hfZXZlbnRzX3NpZ25hdHVyZV8xIn0.eyJhdWQiOiJlNjQzYjViZS1jY2IxLTRhMzgtYjdiNi0zNjY4OTg1M2JlZjUiLCJkaWdlc3QiOiJDZEJPWGwzMGsyM0lsVVdkM2JPL1FtazhXek5lN1NERjVCV3FUQnIyVzQ0VjlqRnhjZW4wSEFHVGsra0Nka0NjWVZsRW9PYmtZM0JCc2lPRnNFV0hIUT09IiwiZXhwIjoxNjkxNjcwOTg1LCJpYXQiOjE2OTE2NzA5MjUsImlzcyI6Imh0dHBzOi8vYXBpLmliYW5pdHkuY29tIiwianRpIjoiMWMyOTNkNTYtOTk1Yi00NDg5LTlhODMtMDEzZTg2ZTk4NjQ2In0.ooEZQDTfGmfYr5DmD7wVxdIN_0YXDBiwwL1_fFwSlTiIcr8vehAbDtcsyf3XrycySkUbWvtZYbhYXJw1BH4eDKdhCd2MnrxNX8BzxEjbAKzsGTT4l1YnrbBEIfcL_Z3qCzxJOzWErkSAgIi1XbiNFbw1YTU0c_Y0bBwxY6EEZgQVpG0-OXbzxhT7GRnsdSmYCAEkbLUzhRDj37fOz0oTfuimn04ANqVNJbTrOnQ2md_lOIS1XWl_WaDrk8pExUQ5JQii7dIxnzaHLB5J6U8zAOUchNLYJW1tcJmpVE_3baO_W6MvsWfEG9wY5Jud55WsnSHOOA4ak0KQJx3owqXt3uzlKH0MjPe6UeuJagZo1nXPW8IV6QCyvqtJ6TMwXqN67GHzh2YTS-Ct7qFxgHKFutlSfBfV4PaTTRd0ywqgTIVXY9P_hQmTSL_J0WiTg_2Di0ty10ehCau9rF1Bmpf2ZnSMK2Rr4JRPIMnFQsU-W5jZbZNF_tDaECzzkDoZgMDRrQT1TsdfSWU-XWG2f0ytiHKVcFJE9mMd25b2SJ6rx2e-TZaQwb5jO61uL1Q8zjvPWqofWZ5emiby9FWNFS-0fqF0UUJdlb7XU1fo_cQi0q4pYGgN2_2sgNETXr99zcTT2vpCf9x9RZGUzXne_WhZP_gp49m0kTX1W0s8O_2g2Do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibanity
 version: !ruby/object:Gem::Version
-  version: '2.3'
+  version: 2.5.0
 platform: ruby
 authors:
 - Ibanity
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2024-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: jose
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,9 +72,11 @@ files:
 - ibanity.gemspec
 - lib/ibanity.rb
 - lib/ibanity/api/base_resource.rb
+- lib/ibanity/api/consent.rb
 - lib/ibanity/api/consent/consent.rb
 - lib/ibanity/api/consent/processing_operation.rb
 - lib/ibanity/api/flat_resource.rb
+- lib/ibanity/api/isabel_connect.rb
 - lib/ibanity/api/isabel_connect/access_token.rb
 - lib/ibanity/api/isabel_connect/account.rb
 - lib/ibanity/api/isabel_connect/account_report.rb
@@ -85,6 +87,7 @@ files:
 - lib/ibanity/api/isabel_connect/token.rb
 - lib/ibanity/api/isabel_connect/transaction.rb
 - lib/ibanity/api/o_auth_resource.rb
+- lib/ibanity/api/ponto_connect.rb
 - lib/ibanity/api/ponto_connect/account.rb
 - lib/ibanity/api/ponto_connect/bulk_payment.rb
 - lib/ibanity/api/ponto_connect/financial_institution.rb
@@ -93,6 +96,8 @@ files:
 - lib/ibanity/api/ponto_connect/onboarding_details.rb
 - lib/ibanity/api/ponto_connect/payment.rb
 - lib/ibanity/api/ponto_connect/payment_activation_request.rb
+- lib/ibanity/api/ponto_connect/payment_request.rb
+- lib/ibanity/api/ponto_connect/pending_transaction.rb
 - lib/ibanity/api/ponto_connect/reauthorization_request.rb
 - lib/ibanity/api/ponto_connect/sandbox/financial_institution_account.rb
 - lib/ibanity/api/ponto_connect/sandbox/financial_institution_transaction.rb
@@ -105,9 +110,11 @@ files:
 - lib/ibanity/api/sandbox/financial_institution_holding.rb
 - lib/ibanity/api/sandbox/financial_institution_transaction.rb
 - lib/ibanity/api/sandbox/financial_institution_user.rb
+- lib/ibanity/api/webhooks.rb
 - lib/ibanity/api/webhooks/key.rb
 - lib/ibanity/api/webhooks/ponto_connect.rb
 - lib/ibanity/api/webhooks/xs2a.rb
+- lib/ibanity/api/xs2a.rb
 - lib/ibanity/api/xs2a/account.rb
 - lib/ibanity/api/xs2a/account_information_access_request.rb
 - lib/ibanity/api/xs2a/account_information_access_request_authorization.rb
@@ -124,8 +131,13 @@ files:
 - lib/ibanity/api/xs2a/pending_transaction.rb
 - lib/ibanity/api/xs2a/periodic_payment_initiation_request.rb
 - lib/ibanity/api/xs2a/periodic_payment_initiation_request_authorization.rb
+- lib/ibanity/api/xs2a/sandbox/financial_institution_account.rb
+- lib/ibanity/api/xs2a/sandbox/financial_institution_holding.rb
+- lib/ibanity/api/xs2a/sandbox/financial_institution_transaction.rb
+- lib/ibanity/api/xs2a/sandbox/financial_institution_user.rb
 - lib/ibanity/api/xs2a/synchronization.rb
 - lib/ibanity/api/xs2a/transaction.rb
+- lib/ibanity/api/xs2a/transaction_delete_request.rb
 - lib/ibanity/client.rb
 - lib/ibanity/collection.rb
 - lib/ibanity/error.rb
@@ -136,6 +148,7 @@ files:
 - spec/lib/ibanity/base_resource_spec.rb
 - spec/lib/ibanity/http_signature_spec.rb
 - spec/lib/ibanity/util_spec.rb
+- spec/lib/ibanity/webhook_signature_spec.rb
 - spec/spec_helper.rb
 - spec/support/crypto_helper.rb
 - spec/support/fixture.rb
@@ -143,9 +156,11 @@ files:
 - spec/support/fixtures/json/relationships/data_without_type.json
 - spec/support/fixtures/json/relationships/meta_with_type.json
 - spec/support/fixtures/json/relationships/no_links_related.json
+- spec/support/fixtures/json/webhooks/example_payload.json
 - spec/support/fixtures/signature/test-certificate.pem
 - spec/support/fixtures/signature/test-private_key.pem
 - spec/support/fixtures/signature/test-public_key.pem
+- spec/support/fixtures/signature/webhooks/example_signature.sig
 homepage: https://documentation.ibanity.com/api/ruby
 licenses:
 - MIT
@@ -173,6 +188,7 @@ test_files:
 - spec/lib/ibanity/base_resource_spec.rb
 - spec/lib/ibanity/http_signature_spec.rb
 - spec/lib/ibanity/util_spec.rb
+- spec/lib/ibanity/webhook_signature_spec.rb
 - spec/spec_helper.rb
 - spec/support/crypto_helper.rb
 - spec/support/fixture.rb
@@ -180,6 +196,8 @@ test_files:
 - spec/support/fixtures/json/relationships/data_without_type.json
 - spec/support/fixtures/json/relationships/meta_with_type.json
 - spec/support/fixtures/json/relationships/no_links_related.json
+- spec/support/fixtures/json/webhooks/example_payload.json
 - spec/support/fixtures/signature/test-certificate.pem
 - spec/support/fixtures/signature/test-private_key.pem
 - spec/support/fixtures/signature/test-public_key.pem
+- spec/support/fixtures/signature/webhooks/example_signature.sig