Add applicationInfo only for requests which supports it (#78)

Author: KadoBOT

lib/adyen/client.rb

@@ -80,7 +80,7 @@ def service_url(service, action, version)
     end
 
     # send request to adyen API
-    def call_adyen_api(service, action, request_data, headers, version)
+    def call_adyen_api(service, action, request_data, headers, version, with_application_info = false)
       # get URL for requested endpoint
       url = service_url(service, action, version)
 
@@ -125,7 +125,7 @@ def call_adyen_api(service, action, request_data, headers, version)
       end
 
       # add application only on checkout service
-      if service == 'Checkout' || service == 'CheckoutUtility'
+      if with_application_info
         add_application_info(request_data)
       end
 
@@ -157,16 +157,15 @@ def call_adyen_api(service, action, request_data, headers, version)
     # add application_info for analytics
     def add_application_info(request_data)
       adyenLibrary = {
-          :name => Adyen::NAME,
-          :version => Adyen::VERSION.to_s
+        :name => Adyen::NAME,
+        :version => Adyen::VERSION.to_s,
       }
 
       if request_data[:applicationInfo].nil?
-        request_data[:applicationInfo] = {};
+        request_data[:applicationInfo] = {}
       end
 
       request_data[:applicationInfo][:adyenLibrary] = adyenLibrary
-      request_data[:applicationInfo][:adyenLibraryTest] = adyenLibrary
     end
 
     # services

lib/adyen/services/checkout.rb

@@ -1,18 +1,22 @@
-require_relative 'service'
+require_relative "service"
 
 module Adyen
   class Checkout < Service
     DEFAULT_VERSION = 50
 
     def initialize(client, version = DEFAULT_VERSION)
-      service = 'Checkout'
+      service = "Checkout"
       method_names = [
         :payment_methods,
         :payment_session,
-        :payment_links
+        :payment_links,
+      ]
+      with_application_info = [
+        :payment_session,
+        :payment_links,
       ]
 
-      super(client, version, service, method_names)
+      super(client, version, service, method_names, with_application_info)
     end
 
     # This method can't be dynamically defined because
@@ -25,16 +29,16 @@ def payments(*args)
       when 0
         Adyen::CheckoutDetail.new(@client, @version)
       else
-        action = 'payments'
+        action = "payments"
         args[1] ||= {}  # optional headers arg
-        @client.call_adyen_api(@service, action, args[0], args[1], @version)
+        @client.call_adyen_api(@service, action, args[0], args[1], @version, true)
       end
     end
   end
 
   class CheckoutDetail < Service
     def initialize(client, version = DEFAULT_VERSION)
-      @service = 'Checkout'
+      @service = "Checkout"
       @client = client
       @version = version
     end

lib/adyen/services/payments.rb

@@ -1,12 +1,12 @@
-require_relative 'service'
+require_relative "service"
 
 module Adyen
   class Payments < Service
     attr_accessor :version
     DEFAULT_VERSION = 50
 
     def initialize(client, version = DEFAULT_VERSION)
-      service = 'Payment'
+      service = "Payment"
       method_names = [
         :authorise,
         :authorise3d,
@@ -16,10 +16,15 @@ def initialize(client, version = DEFAULT_VERSION)
         :refund,
         :cancel_or_refund,
         :adjust_authorisation,
-        :donate
+        :donate,
+      ]
+      with_application_info = [
+        :authorise,
+        :authorise3d,
+        :authorise3ds2,
       ]
 
-      super(client, version, service, method_names)
+      super(client, version, service, method_names, with_application_info)
     end
   end
 end

lib/adyen/services/service.rb

@@ -11,7 +11,7 @@ def self.action_for_method_name(method_name)
       method_name.to_s.gsub(/_./) { |x| x[1].upcase }
     end
 
-    def initialize(client, version, service, method_names)
+    def initialize(client, version, service, method_names, with_application_info = [])
       @client = client
       @version = version
       @service = service
@@ -20,7 +20,7 @@ def initialize(client, version, service, method_names)
       method_names.each do |method_name|
         define_singleton_method method_name do |request, headers = {}|
           action = self.class.action_for_method_name(method_name)
-          @client.call_adyen_api(@service, action, request, headers, @version)
+          @client.call_adyen_api(@service, action, request, headers, @version, with_application_info.include?(method_name))
         end
       end
     end

spec/spec_helper.rb

@@ -18,20 +18,27 @@ def create_test(client, service, method_name, parent_object)
   request_body = JSON.parse(json_from_file("mocks/requests/#{service}/#{method_name}.json"))
   response_body = json_from_file("mocks/responses/#{service}/#{method_name}.json")
 
-
-  if service == 'Checkout' || service == 'CheckoutUtility'
+  with_application_info = [
+    "authorise",
+    "authorise3d",
+    "authorise3ds2",
+    "payments",
+    "payment_session",
+    "payment_links",
+  ]
+  if with_application_info.include?(method_name)
     client.add_application_info(request_body)
   end
 
   # client-generated headers
   headers = {
-    'Content-Type'.to_sym => 'application/json'
+    "Content-Type".to_sym => "application/json",
   }
 
   # authentication headers
-  if not client.api_key.nil? then
+  if not client.api_key.nil?
     headers["x-api-key"] = client.api_key
-  elsif not client.ws_user.nil? and not client.ws_password.nil? then
+  elsif not client.ws_user.nil? and not client.ws_password.nil?
     auth_header = "Basic " + Base64::encode64("#{client.ws_user}:#{client.ws_password}")
     headers["Authorization"] = auth_header.strip
   else
@@ -43,12 +50,12 @@ def create_test(client, service, method_name, parent_object)
   url = client.service_url(service, action, parent_object.version)
   WebMock.stub_request(:post, url).
     with(
-      body: request_body,
-      headers: headers
-    ).
+    body: request_body,
+    headers: headers,
+  ).
     to_return(
-      body: response_body
-    )
+    body: response_body,
+  )
   result = parent_object.public_send(method_name, request_body)
 
   # result.response is already a Ruby object (Adyen::HashWithAccessors) (rather than an unparsed JSON string)
@@ -86,10 +93,10 @@ def create_client(auth_type)
   client = Adyen::Client.new
   client.env = :mock
 
-  if auth_type == :basic then
+  if auth_type == :basic
     client.ws_user = "user"
     client.ws_password = "password"
-  elsif auth_type == :api_key then
+  elsif auth_type == :api_key
     client.api_key = "api_key"
   else
     raise ArgumentError "Invalid auth type for test client"