Merge pull request #165 from Adyen/automation/release

Release v7.0.3

Author: AdyenAutomationBot

Makefile

@@ -5,8 +5,8 @@ openapi-generator-jar:=build/openapi-generator-cli.jar
 openapi-generator-cli:=java -jar build/openapi-generator-cli.jar
 output:=build/out
 
-services:=balancePlatform checkout legalEntityManagement management payment payout transfers
-singleFileServices:=balanceControlService binLookup dataProtection recurring storedValue posTerminalManagement 
+services:=balancePlatform checkout legalEntityManagement management payout transfers
+singleFileServices:=balanceControlService binLookup dataProtection recurring storedValue payment posTerminalManagement
 
 binLookup: spec=BinLookupService-v54
 checkout: spec=CheckoutService-v70
@@ -43,6 +43,8 @@ $(services): build/spec $(openapi-generator-jar)
 
 $(singleFileServices): build/spec
 	wget $(openapi-generator-url) -O build/openapi-generator-cli.jar
+	jq -e 'del(.paths[][].tags)' build/spec/json/$(spec).json > build/spec/json/$(spec).tmp
+	mv build/spec/json/$(spec).tmp build/spec/json/$(spec).json
 	rm -rf $(output)
 	$(openapi-generator-cli) generate \
 		-i build/spec/json/$(spec).json \

lib/adyen/services/payment.rb

@@ -1,23 +1,128 @@
-require_relative 'payment/general_api'
-require_relative 'payment/modifications_api'
-
+require_relative './service'
 module Adyen
-  class Payment
+  class Payment < Service
     attr_accessor :service, :version
 
     DEFAULT_VERSION = 68
     def initialize(client, version = DEFAULT_VERSION)
-      @service = 'Payment'
-      @client = client
-      @version = version
+      super(client, version, 'Payment')
+    end
+
+    def adjust_authorisation(request, headers: {})
+      endpoint = '/adjustAuthorisation'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def authorise(request, headers: {})
+      endpoint = '/authorise'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def authorise3d(request, headers: {})
+      endpoint = '/authorise3d'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def authorise3ds2(request, headers: {})
+      endpoint = '/authorise3ds2'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def cancel(request, headers: {})
+      endpoint = '/cancel'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def cancel_or_refund(request, headers: {})
+      endpoint = '/cancelOrRefund'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def capture(request, headers: {})
+      endpoint = '/capture'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def donate(request, headers: {})
+      endpoint = '/donate'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def get_authentication_result(request, headers: {})
+      endpoint = '/getAuthenticationResult'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def refund(request, headers: {})
+      endpoint = '/refund'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+    def retrieve3ds2_result(request, headers: {})
+      endpoint = '/retrieve3ds2Result'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
-    def general_api
-      @general_api ||= Adyen::GeneralApi.new(@client, @version)
+    def technical_cancel(request, headers: {})
+      endpoint = '/technicalCancel'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
-    def modifications_api
-      @modifications_api ||= Adyen::ModificationsApi.new(@client, @version)
+    def void_pending_refund(request, headers: {})
+      endpoint = '/voidPendingRefund'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint)
+      
+      action = { method: 'post', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
   end

lib/adyen/services/payment/general_api.rb

@@ -8,13 +8,24 @@ class HmacValidator
         amount.value amount.currency eventCode success
       ].freeze
 
+      # <b>DEPRECATED:</b> Please use valid_webhook_hmac?() instead.
+      def valid_notification_hmac?(notification_request_item, hmac_key)
+        valid_webhook_hmac?(notification_request_item, hmac_key)
+      end
+
       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')
 
         expected_sign == merchant_sign
       end
 
+      # <b>DEPRECATED:</b> Please use calculate_webhook_hmac() instead.
+      def calculate_notification_hmac(notification_request_item, hmac_key)
+        calculate_webhook_hmac(notification_request_item, hmac_key)
+      end
+
+    
       def calculate_webhook_hmac(webhook_request_item, hmac_key)
         data = data_to_sign(webhook_request_item)
 

lib/adyen/services/payment/modifications_api.rb

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

lib/adyen/utils/hmac_validator.rb

@@ -25,10 +25,10 @@
   end
 
   it 'fails payments call without WS user and password' do
-    expect { @shared_values[:client].payment.general_api.authorise('{}') }
+    expect { @shared_values[:client].payment.authorise('{}') }
       .to raise_error(Adyen::AuthenticationError)
     @shared_values[:client].ws_user = @shared_values[:ws_user]
-    expect { @shared_values[:client].payment.general_api.authorise('{}') }
+    expect { @shared_values[:client].payment.authorise('{}') }
       .to raise_error(Adyen::AuthenticationError)
   end
 

lib/adyen/version.rb

@@ -28,7 +28,7 @@
              body: response_body
            )
 
-    result = @shared_values[:client].payment.modifications_api.adjust_authorisation(request_body)
+    result = @shared_values[:client].payment.adjust_authorisation(request_body)
     response_hash = result.response
 
     expect(result.status)