adyen-ruby-api-library 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7629975d9074cd7d0d82d7dded2a501e0710f03cd87c07626debfe41c371af4c
-  data.tar.gz: e99a011f237d33a9ff8cea696cce57939dd51ab4ac4934e941aafcca09991478
+  metadata.gz: b38d6b5e903949dd5f611270b52d7d232b7446053e4af782809ec0ee80c2072c
+  data.tar.gz: ddb1fa60f2b6dd3d1b177c651ae59372d8065a13193f7b2ef1cbe5c3744b0312
 SHA512:
-  metadata.gz: f1975246c7db5330a5a1159ff7992a731cccfb31eac58a1dae7314528b90bb290802180a1ae3b4ca05d425682abc8ef10def9a5ccb1523b36c80213b3e3dabae
-  data.tar.gz: 63cec76ed9eb1126281fa4a43b74c1dbbf832fda0d9a02848b2a0bb6e004caec3c10bfca4818b4b67af42089b68fb171874a76de2814714694e928450e02176d
+  metadata.gz: be7130f49c9247fd8f8edb0c0ff8f11d6ed95ac19e1ffc3b15db0d9e758c092ed1850d22c64b1ec17c9b4f63fa22a0149fd3ba9dca4d5b6b7a56baca5c6b98f4
+  data.tar.gz: 9bb005f7548edea11ba546ee08ed045a7ecd743c1691a25aaa9c38b5940a29fbd9d8454cc894553920f20f0f4cf2174dc7e3c4fbe53c2bdf2bc606d1c5a720af

data/lib/adyen/client.rb

@@ -40,17 +40,21 @@ module Adyen
         case service
         when "Checkout"
           url = "https://checkout-#{@env}.adyen.com/checkout"
+          supports_live_url_prefix = true
         when "CheckoutUtility"
-          url = "https://checkout-#{@env}.adyen.com"
+          url = "https://checkout-#{@env}.adyen.com/checkout"
+          supports_live_url_prefix = true
         when "Account", "Fund", "Notification"
           url = "https://cal-#{@env}.adyen.com/cal/services"
+          supports_live_url_prefix = false
         when "Recurring", "Payment", "Payout"
           url = "https://pal-#{@env}.adyen.com/pal/servlet"
+          supports_live_url_prefix = true
         else
           raise ArgumentError, "Invalid service specified"
         end
 
-        if @env == :live
+        if @env == :live && supports_live_url_prefix
           url.insert(8, "#{@live_url_prefix}-")
           url["adyen.com"] = "adyenpayments.com"
         end
@@ -61,7 +65,7 @@ module Adyen
 
     # construct full URL from service and endpoint
     def service_url(service, action, version)
-      if service == "Checkout"
+      if service == "Checkout" || service == "CheckoutUtility"
         "#{service_url_base(service)}/v#{version}/#{action}"
       else
         "#{service_url_base(service)}/#{service}/v#{version}/#{action}"
@@ -69,7 +73,7 @@ module Adyen
     end
 
     # send request to adyen API
-    def call_adyen_api(service, action, request_data, version)
+    def call_adyen_api(service, action, request_data, headers, version)
       # get URL for requested endpoint
       url = service_url(service, action, version)
 
@@ -100,8 +104,15 @@ module Adyen
         when "api-key"
           faraday.headers["x-api-key"] = @api_key
         end
+
+        # add optional headers if specified in request
+        # will overwrite default headers if overlapping
+        headers.map do |key, value|
+          faraday.headers[key] = value
+        end
       end
 
+
       # if json string convert to hash
       # needed to add applicationInfo
       if request_data.is_a?(String)

data/lib/adyen/services/checkout.rb

@@ -23,9 +23,10 @@ module Adyen
       case args.size
       when 0
         Adyen::CheckoutDetail.new(@client, @version)
-      when 1
+      else
         action = 'payments'
-        @client.call_adyen_api(@service, action, args[0], @version)
+        args[1] ||= {}  # optional headers arg
+        @client.call_adyen_api(@service, action, args[0], args[1], @version)
       end
     end
   end
@@ -37,14 +38,14 @@ module Adyen
       @version = version
     end
 
-    def details(request)
+    def details(request, headers = {})
       action = "payments/details"
-      @client.call_adyen_api(@service, action, request, @version)
+      @client.call_adyen_api(@service, action, request, headers, @version)
     end
 
-    def result(request)
+    def result(request, headers = {})
       action = "payments/result"
-      @client.call_adyen_api(@service, action, request, @version)
+      @client.call_adyen_api(@service, action, request, headers, @version)
     end
   end
 end

data/lib/adyen/services/checkout_utility.rb

@@ -5,7 +5,7 @@ module Adyen
     DEFAULT_VERSION = 1
 
     def initialize(client, version = DEFAULT_VERSION)
-      service = 'CheckoutUtility'
+      service = 'Checkout'
       method_names = [
         :origin_keys
       ]

data/lib/adyen/services/service.rb

@@ -9,9 +9,9 @@ module Adyen
 
       # dynamically create API methods
       method_names.each do |method_name|
-        define_singleton_method method_name do |request|
+        define_singleton_method method_name do |request, headers = {}|
           action = method_name.to_s.to_camel_case
-          @client.call_adyen_api(@service, action, request, @version)
+          @client.call_adyen_api(@service, action, request, headers, @version)
         end
       end
     end

data/lib/adyen/version.rb

@@ -1,4 +1,4 @@
 module Adyen
   NAME = "adyen-ruby-api-library"
-  VERSION = "3.0.1".freeze
+  VERSION = "3.0.2".freeze
 end

data/spec/checkout_utility_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe Adyen::CheckoutUtility, service: "checkout utility" do
 
   it "sets the correct service URL base" do
     client = Adyen::Client.new(env: :test)
-    expect(client.service_url_base(@shared_values[:service])).to eq("https://checkout-test.adyen.com")
+    expect(client.service_url_base(@shared_values[:service])).to eq("https://checkout-test.adyen.com/checkout")
   end
 
   # must be created manually because every field in the response is an array

data/spec/client_spec.rb

@@ -37,4 +37,32 @@ RSpec.describe Adyen do
       to raise_error(Adyen::AuthenticationError)
     @shared_values[:client].api_key = "api_key"
   end
+
+  it "generates the correct service URL base for CAL TEST" do
+    client = Adyen::Client.new(env: :test)
+    client.live_url_prefix = "abcdef1234567890-TestCompany"
+    expect(client.service_url_base("Account")).
+      to eq("https://cal-test.adyen.com/cal/services")
+  end
+
+  it "generates the correct service URL base for CAL LIVE" do
+    client = Adyen::Client.new(env: :live)
+    client.live_url_prefix = "abcdef1234567890-TestCompany"
+    expect(client.service_url_base("Account")).
+      to eq("https://cal-live.adyen.com/cal/services")
+  end
+
+  it "generates the correct service URL base for PAL TEST" do
+    client = Adyen::Client.new(env: :test)
+    client.live_url_prefix = "abcdef1234567890-TestCompany"
+    expect(client.service_url_base("Payment")).
+      to eq("https://pal-test.adyen.com/pal/servlet")
+  end
+
+  it "generates the correct service URL base for PAL LIVE" do
+    client = Adyen::Client.new(env: :live)
+    client.live_url_prefix = "abcdef1234567890-TestCompany"
+    expect(client.service_url_base("Payment")).
+      to eq("https://abcdef1234567890-TestCompany-pal-live.adyenpayments.com/pal/servlet")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adyen-ruby-api-library
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Adyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday