adyen-ruby-api-library 8.0.0 → 9.0.0

data/lib/adyen/services/management/webhooks_company_level_api.rb

@@ -7,12 +7,21 @@ module Adyen
       super(client, version, 'Management')
     end
 
-    def remove_webhook(company_id, webhook_id, headers: {})
+    def generate_hmac_key(company_id, webhook_id, headers: {})
+      endpoint = '/companies/{companyId}/webhooks/{webhookId}/generateHmac'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint, company_id, webhook_id)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, {}, headers, @version)
+    end
+
+    def get_webhook(company_id, webhook_id, headers: {})
       endpoint = '/companies/{companyId}/webhooks/{webhookId}'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
       endpoint = format(endpoint, company_id, webhook_id)
       
-      action = { method: 'delete', url: endpoint }
+      action = { method: 'get', url: endpoint }
       @client.call_adyen_api(@service, action, {}, headers, @version)
     end
 
@@ -25,24 +34,15 @@ module Adyen
       @client.call_adyen_api(@service, action, {}, headers, @version)
     end
 
-    def get_webhook(company_id, webhook_id, headers: {})
+    def remove_webhook(company_id, webhook_id, headers: {})
       endpoint = '/companies/{companyId}/webhooks/{webhookId}'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
       endpoint = format(endpoint, company_id, webhook_id)
       
-      action = { method: 'get', url: endpoint }
+      action = { method: 'delete', url: endpoint }
       @client.call_adyen_api(@service, action, {}, headers, @version)
     end
 
-    def update_webhook(request, company_id, webhook_id, headers: {})
-      endpoint = '/companies/{companyId}/webhooks/{webhookId}'.gsub(/{.+?}/, '%s')
-      endpoint = endpoint.gsub(%r{^/}, '')
-      endpoint = format(endpoint, company_id, webhook_id)
-      
-      action = { method: 'patch', url: endpoint }
-      @client.call_adyen_api(@service, action, request, headers, @version)
-    end
-
     def set_up_webhook(request, company_id, headers: {})
       endpoint = '/companies/{companyId}/webhooks'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
@@ -52,21 +52,21 @@ module Adyen
       @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
-    def generate_hmac_key(company_id, webhook_id, headers: {})
-      endpoint = '/companies/{companyId}/webhooks/{webhookId}/generateHmac'.gsub(/{.+?}/, '%s')
+    def test_webhook(request, company_id, webhook_id, headers: {})
+      endpoint = '/companies/{companyId}/webhooks/{webhookId}/test'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
       endpoint = format(endpoint, company_id, webhook_id)
       
       action = { method: 'post', url: endpoint }
-      @client.call_adyen_api(@service, action, {}, headers, @version)
+      @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
-    def test_webhook(request, company_id, webhook_id, headers: {})
-      endpoint = '/companies/{companyId}/webhooks/{webhookId}/test'.gsub(/{.+?}/, '%s')
+    def update_webhook(request, company_id, webhook_id, headers: {})
+      endpoint = '/companies/{companyId}/webhooks/{webhookId}'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
       endpoint = format(endpoint, company_id, webhook_id)
       
-      action = { method: 'post', url: endpoint }
+      action = { method: 'patch', url: endpoint }
       @client.call_adyen_api(@service, action, request, headers, @version)
     end
 

data/lib/adyen/services/management/webhooks_merchant_level_api.rb

@@ -7,12 +7,21 @@ module Adyen
       super(client, version, 'Management')
     end
 
-    def remove_webhook(merchant_id, webhook_id, headers: {})
+    def generate_hmac_key(merchant_id, webhook_id, headers: {})
+      endpoint = '/merchants/{merchantId}/webhooks/{webhookId}/generateHmac'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint, merchant_id, webhook_id)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, {}, headers, @version)
+    end
+
+    def get_webhook(merchant_id, webhook_id, headers: {})
       endpoint = '/merchants/{merchantId}/webhooks/{webhookId}'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
       endpoint = format(endpoint, merchant_id, webhook_id)
       
-      action = { method: 'delete', url: endpoint }
+      action = { method: 'get', url: endpoint }
       @client.call_adyen_api(@service, action, {}, headers, @version)
     end
 
@@ -25,24 +34,15 @@ module Adyen
       @client.call_adyen_api(@service, action, {}, headers, @version)
     end
 
-    def get_webhook(merchant_id, webhook_id, headers: {})
+    def remove_webhook(merchant_id, webhook_id, headers: {})
       endpoint = '/merchants/{merchantId}/webhooks/{webhookId}'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
       endpoint = format(endpoint, merchant_id, webhook_id)
       
-      action = { method: 'get', url: endpoint }
+      action = { method: 'delete', url: endpoint }
       @client.call_adyen_api(@service, action, {}, headers, @version)
     end
 
-    def update_webhook(request, merchant_id, webhook_id, headers: {})
-      endpoint = '/merchants/{merchantId}/webhooks/{webhookId}'.gsub(/{.+?}/, '%s')
-      endpoint = endpoint.gsub(%r{^/}, '')
-      endpoint = format(endpoint, merchant_id, webhook_id)
-      
-      action = { method: 'patch', url: endpoint }
-      @client.call_adyen_api(@service, action, request, headers, @version)
-    end
-
     def set_up_webhook(request, merchant_id, headers: {})
       endpoint = '/merchants/{merchantId}/webhooks'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
@@ -52,21 +52,21 @@ module Adyen
       @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
-    def generate_hmac_key(merchant_id, webhook_id, headers: {})
-      endpoint = '/merchants/{merchantId}/webhooks/{webhookId}/generateHmac'.gsub(/{.+?}/, '%s')
+    def test_webhook(request, merchant_id, webhook_id, headers: {})
+      endpoint = '/merchants/{merchantId}/webhooks/{webhookId}/test'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
       endpoint = format(endpoint, merchant_id, webhook_id)
       
       action = { method: 'post', url: endpoint }
-      @client.call_adyen_api(@service, action, {}, headers, @version)
+      @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
-    def test_webhook(request, merchant_id, webhook_id, headers: {})
-      endpoint = '/merchants/{merchantId}/webhooks/{webhookId}/test'.gsub(/{.+?}/, '%s')
+    def update_webhook(request, merchant_id, webhook_id, headers: {})
+      endpoint = '/merchants/{merchantId}/webhooks/{webhookId}'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
       endpoint = format(endpoint, merchant_id, webhook_id)
       
-      action = { method: 'post', url: endpoint }
+      action = { method: 'patch', url: endpoint }
       @client.call_adyen_api(@service, action, request, headers, @version)
     end
 

data/lib/adyen/services/transfers/transfers_api.rb

@@ -7,19 +7,19 @@ module Adyen
       super(client, version, 'Transfers')
     end
 
-    def transfer_funds(request, headers: {})
-      endpoint = '/transfers'.gsub(/{.+?}/, '%s')
+    def return_transfer(request, transfer_id, headers: {})
+      endpoint = '/transfers/{transferId}/returns'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
-      endpoint = format(endpoint)
+      endpoint = format(endpoint, transfer_id)
       
       action = { method: 'post', url: endpoint }
       @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
-    def return_transfer(request, id, headers: {})
-      endpoint = '/transfers/{id}/returns'.gsub(/{.+?}/, '%s')
+    def transfer_funds(request, headers: {})
+      endpoint = '/transfers'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
-      endpoint = format(endpoint, id)
+      endpoint = format(endpoint)
       
       action = { method: 'post', url: endpoint }
       @client.call_adyen_api(@service, action, request, headers, @version)

data/lib/adyen/utils/hmac_validator.rb

@@ -15,7 +15,8 @@ module Adyen
 
       def valid_webhook_hmac?(webhook_request_item, hmac_key)
         expected_sign = calculate_webhook_hmac(webhook_request_item, hmac_key)
-        merchant_sign = fetch(webhook_request_item, 'additionalData.hmacSignature')
+        merchant_sign =
+          webhook_request_item.dig('additionalData', 'hmacSignature')
 
         expected_sign == merchant_sign
       end
@@ -29,29 +30,20 @@ module Adyen
       def calculate_webhook_hmac(webhook_request_item, hmac_key)
         data = data_to_sign(webhook_request_item)
 
-        Base64.strict_encode64(OpenSSL::HMAC.digest(HMAC_ALGORITHM, [hmac_key].pack('H*'), data))
+        Base64.strict_encode64(
+          OpenSSL::HMAC.digest(HMAC_ALGORITHM, [hmac_key].pack('H*'), data)
+        )
       end
 
+      # TODO: Deprecate instead of aliasing
+      alias valid_notification_hmac? valid_webhook_hmac?
+      alias calculate_notification_hmac calculate_webhook_hmac
 
       def data_to_sign(webhook_request_item)
-        data = WEBHOOK_VALIDATION_KEYS.map { |key| fetch(webhook_request_item, key).to_s }
-                                    .join(DATA_SEPARATOR)
-      end
-
-      private
-
-      def fetch(hash, keys)
-        value = hash
-        keys.to_s.split('.').each do |key|
-          value = if key.to_i.to_s == key
-                    value[key.to_i]
-                  else
-                    value[key].nil? ? value[key.to_sym] : value[key]
-                  end
-          break if value.nil?
-        end
-
-        value
+        WEBHOOK_VALIDATION_KEYS
+          .map { webhook_request_item.dig(*_1.split('.')).to_s }
+          .compact
+          .join(DATA_SEPARATOR)
       end
     end
   end

data/lib/adyen/version.rb

@@ -1,4 +1,4 @@
 module Adyen
   NAME = 'adyen-ruby-api-library'.freeze
-  VERSION = '8.0.0'.freeze
+  VERSION = '9.0.0'.freeze
 end

data/spec/utils/hmac_validator_spec.rb

@@ -6,19 +6,19 @@ RSpec.describe Adyen::Utils::HmacValidator do
   let(:expected_sign) { 'coqCmt/IZ4E3CzPvMY8zTjQVL5hYJUiBRg8UU+iCWo0=' }
   let(:webhook_request_item) do
     {
-      additionalData: {
-        hmacSignature: expected_sign
+      'additionalData' => {
+        'hmacSignature' => expected_sign
       },
-      amount: {
-        value: 1130,
-        currency: 'EUR'
+      'amount' => {
+        'value' => 1130,
+        'currency' => 'EUR'
       },
-      pspReference: '7914073381342284',
-      eventCode: 'AUTHORISATION',
-      merchantAccountCode: 'TestMerchant',
-      merchantReference: 'TestPayment-1407325143704',
-      paymentMethod: 'visa',
-      success: 'true'
+      'pspReference' => '7914073381342284',
+      'eventCode' => 'AUTHORISATION',
+      'merchantAccountCode' => 'TestMerchant',
+      'merchantReference' => 'TestPayment-1407325143704',
+      'paymentMethod' => 'visa',
+      'success' => 'true'
     }
   end
 
@@ -44,22 +44,22 @@ RSpec.describe Adyen::Utils::HmacValidator do
     end
 
     it 'should validate backslashes correctly' do
-      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/backslash_webhook.json"))
+      webhook = JSON.parse(json_from_file('mocks/responses/Webhooks/backslash_webhook.json'))
       expect(validator.valid_webhook_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
     end
 
     it 'should validate colons correctly' do
-      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/colon_webhook.json"))
+      webhook = JSON.parse(json_from_file('mocks/responses/Webhooks/colon_webhook.json'))
       expect(validator.valid_webhook_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
     end
 
     it 'should validate forward slashes correctly' do
-      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/forwardslash_webhook.json"))
+      webhook = JSON.parse(json_from_file('mocks/responses/Webhooks/forwardslash_webhook.json'))
       expect(validator.valid_webhook_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
     end
 
     it 'should validate mix of slashes and colon correctly' do
-      webhook = JSON.parse(json_from_file("mocks/responses/Webhooks/mixed_webhook.json"))
+      webhook = JSON.parse(json_from_file('mocks/responses/Webhooks/mixed_webhook.json'))
       expect(validator.valid_webhook_hmac?(webhook, '74F490DD33F7327BAECC88B2947C011FC02D014A473AAA33A8EC93E4DC069174')).to be true
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adyen-ruby-api-library
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Adyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -136,6 +136,7 @@ files:
 - lib/adyen/services/binLookup.rb
 - lib/adyen/services/checkout.rb
 - lib/adyen/services/checkout/classic_checkout_sdk_api.rb
+- lib/adyen/services/checkout/donations_api.rb
 - lib/adyen/services/checkout/modifications_api.rb
 - lib/adyen/services/checkout/orders_api.rb
 - lib/adyen/services/checkout/payment_links_api.rb
@@ -442,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Official Adyen  Ruby API Library