adyen-ruby-api-library 4.1.0 → 5.1.0

data/lib/adyen/services/bin_lookup.rb

@@ -0,0 +1,18 @@
+require_relative 'service'
+
+module Adyen
+  class BinLookup < Service
+    attr_accessor :version
+    DEFAULT_VERSION = 50
+
+    def initialize(client, version = DEFAULT_VERSION)
+      service = 'BinLookup'
+      method_names = [
+        :get_3ds_availability,
+        :get_cost_estimate
+      ]
+
+      super(client, version, service, method_names)
+    end
+  end
+end

data/lib/adyen/services/checkout.rb

@@ -1,18 +1,21 @@
-require_relative 'service'
+require_relative "service"
 
 module Adyen
   class Checkout < Service
-    DEFAULT_VERSION = 50
+    DEFAULT_VERSION = 67
 
     def initialize(client, version = DEFAULT_VERSION)
-      service = 'Checkout'
+      service = "Checkout"
       method_names = [
-        :payment_methods,
         :payment_session,
-        :payment_links
+        :origin_keys,
       ]
 
-      super(client, version, service, method_names)
+      with_application_info = [
+        :payment_session,
+      ]
+
+      super(client, version, service, method_names, with_application_info)
     end
 
     # This method can't be dynamically defined because
@@ -25,7 +28,40 @@ module Adyen
       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, true)
+      end
+    end
+
+    def payment_links(*args)
+      case args.size
+      when 0
+        Adyen::CheckoutLink.new(@client, @version)
+      else
+        action = "paymentLinks"
+        args[1] ||= {}  # optional headers arg
+        @client.call_adyen_api(@service, action, args[0], args[1], @version, true)
+      end
+    end
+
+    def payment_methods(*args)
+      case args.size
+      when 0
+        Adyen::CheckoutMethod.new(@client, @version)
+      else
+        action = "paymentMethods"
+        args[1] ||= {}  # optional headers arg
+        @client.call_adyen_api(@service, action, args[0], args[1], @version)
+      end
+    end
+
+    def orders(*args)
+      case args.size
+      when 0
+        Adyen::CheckoutOrder.new(@client, @version)
+      else
+        action = "orders"
         args[1] ||= {}  # optional headers arg
         @client.call_adyen_api(@service, action, args[0], args[1], @version)
       end
@@ -34,7 +70,7 @@ module Adyen
 
   class CheckoutDetail < Service
     def initialize(client, version = DEFAULT_VERSION)
-      @service = 'Checkout'
+      @service = "Checkout"
       @client = client
       @version = version
     end
@@ -49,4 +85,48 @@ module Adyen
       @client.call_adyen_api(@service, action, request, headers, @version)
     end
   end
+
+  class CheckoutLink < Service
+    def initialize(client, version = DEFAULT_VERSION)
+      @service = "Checkout"
+      @client = client
+      @version = version
+    end
+
+    def get(linkId, headers = {})
+      action = { method: 'get', url: "paymentLinks/" + linkId }
+      @client.call_adyen_api(@service, action, {}, headers, @version, true)
+    end
+
+    def update(linkId, request, headers = {})
+      action = { method: 'patch', url: "paymentLinks/" + linkId }
+      @client.call_adyen_api(@service, action, request, headers, @version, false)
+    end
+  end
+
+  class CheckoutMethod < Service
+    def initialize(client, version = DEFAULT_VERSION)
+      @service = "Checkout"
+      @client = client
+      @version = version
+    end
+
+    def balance(request, headers = {})
+      action = "paymentMethods/balance"
+      @client.call_adyen_api(@service, action, request, headers, @version, true)
+    end
+  end
+
+  class CheckoutOrder < Service
+    def initialize(client, version = DEFAULT_VERSION)
+      @service = "Checkout"
+      @client = client
+      @version = version
+    end
+
+    def cancel(request, headers = {})
+      action = "orders/cancel"
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+  end
 end

data/lib/adyen/services/{checkout_utility.rb → data_protection.rb}

@@ -1,13 +1,14 @@
 require_relative 'service'
 
 module Adyen
-  class CheckoutUtility < Service
+  class DataProtection < Service
+    attr_accessor :version
     DEFAULT_VERSION = 1
 
     def initialize(client, version = DEFAULT_VERSION)
-      service = 'Checkout'
+      service = 'DataProtectionService'
       method_names = [
-        :origin_keys
+        :request_subject_erasure
       ]
 
       super(client, version, service, method_names)

data/lib/adyen/services/dispute.rb

@@ -0,0 +1,20 @@
+require_relative 'service'
+
+module Adyen
+  class Dispute < Service
+    attr_accessor :version
+    DEFAULT_VERSION = 30
+
+    def initialize(client, version = DEFAULT_VERSION)
+      service = 'DisputeService'
+      method_names = [
+        :retrieve_applicable_defense_reasons,
+        :supply_defense_document,
+        :delete_dispute_defense_document,
+        :defend_dispute,
+      ]
+
+      super(client, version, service, method_names)
+    end
+  end
+end

data/lib/adyen/services/marketpay.rb

@@ -29,7 +29,7 @@ module Adyen
 
     class Account < Service
       attr_accessor :version
-      DEFAULT_VERSION = 4
+      DEFAULT_VERSION = 6
 
       def initialize(client, version = DEFAULT_VERSION)
         service = 'Account'
@@ -44,11 +44,13 @@ module Adyen
           :update_account_holder_state,
           :delete_bank_accounts,
           :delete_shareholders,
+          :delete_signatories,
           :close_account,
           :close_account_holder,
-          :get_tier_configuration,
           :suspend_account_holder,
-          :un_suspend_account_holder
+          :un_suspend_account_holder,
+          :delete_payout_methods,
+          :check_account_holder
         ]
 
         super(client, version, service, method_names)
@@ -57,7 +59,7 @@ module Adyen
 
     class Fund < Service
       attr_accessor :version
-      DEFAULT_VERSION = 3
+      DEFAULT_VERSION = 6
 
       def initialize(client, version = DEFAULT_VERSION)
         service = 'Fund'
@@ -67,7 +69,8 @@ module Adyen
           :account_holder_transaction_list,
           :refund_not_paid_out_transfers,
           :setup_beneficiary,
-          :transfer_funds
+          :transfer_funds,
+          :refund_funds_transfer
         ]
 
         super(client, version, service, method_names)
@@ -76,7 +79,7 @@ module Adyen
 
     class Notification < Service
       attr_accessor :version
-      DEFAULT_VERSION = 5
+      DEFAULT_VERSION = 6
 
       def initialize(client, version = DEFAULT_VERSION)
         service = 'Notification'
@@ -95,7 +98,7 @@ module Adyen
 
     class Hop < Service
       attr_accessor :version
-      DEFAULT_VERSION = 1
+      DEFAULT_VERSION = 6
 
       def initialize(client, version = DEFAULT_VERSION)
         service = 'Hop'

data/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
+    DEFAULT_VERSION = 64
 
     def initialize(client, version = DEFAULT_VERSION)
-      service = 'Payment'
+      service = "Payment"
       method_names = [
         :authorise,
         :authorise3d,
@@ -15,10 +15,20 @@ module Adyen
         :cancel,
         :refund,
         :cancel_or_refund,
-        :adjust_authorisation
+        :adjust_authorisation,
+        :donate,
+        :get_authentication_result,
+        :technical_cancel,
+        :void_pending_refund,
+        :retrieve_3ds2_result
+      ]
+      with_application_info = [
+        :authorise,
+        :authorise3d,
+        :authorise3ds2,
       ]
 
-      super(client, version, service, method_names)
+      super(client, version, service, method_names, with_application_info)
     end
   end
 end

data/lib/adyen/services/payouts.rb

@@ -3,7 +3,7 @@ require_relative 'service'
 module Adyen
   class Payouts < Service
     attr_accessor :version
-    DEFAULT_VERSION = 30
+    DEFAULT_VERSION = 64
 
     def initialize(client, version = DEFAULT_VERSION)
       service = 'Payout'
@@ -12,7 +12,8 @@ module Adyen
         :store_detail_and_submit_third_party,
         :submit_third_party,
         :confirm_third_party,
-        :decline_third_party
+        :decline_third_party,
+        :payout
       ]
 
       super(client, version, service, method_names)

data/lib/adyen/services/recurring.rb

@@ -3,14 +3,15 @@ require_relative 'service'
 module Adyen
   class Recurring < Service
     attr_accessor :version
-    DEFAULT_VERSION = 30
+    DEFAULT_VERSION = 49
 
     def initialize(client, version = DEFAULT_VERSION)
       service = 'Recurring'
       method_names = [
         :list_recurring_details,
         :disable,
-        :store_token
+        :store_token,
+        :schedule_account_updater
       ]
 
       super(client, version, service, method_names)

data/lib/adyen/services/service.rb

@@ -11,7 +11,7 @@ module Adyen
       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 @@ module Adyen
       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

data/lib/adyen/version.rb

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

data/spec/account_spec.rb

@@ -20,7 +20,10 @@ RSpec.describe Adyen::Payments, service: "marketpay account service" do
     ["upload_document", "pspReference", "9914762681460244"],
     ["get_uploaded_documents", "pspReference", "9914694369860322"],
     ["delete_bank_accounts", "pspReference", "9914694372670551"],
-    ["delete_shareholders", "pspReference", "9914694372990637"]
+    ["delete_shareholders", "pspReference", "9914694372990637"],
+    ["delete_signatories", "pspReference", "9914694372990637"],
+    ["delete_payout_methods", "pspReference", "9914694372990637"],
+    ["check_account_holder", "pspReference", "9914694372990637"],
   ]
 
   generate_tests(client, "Account", test_sets, client.marketpay.account)

data/spec/bin_lookup_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+RSpec.describe Adyen::BinLookup, service: "BIN lookup service" do
+  # client instance to be used in dynamically generated tests
+  client = create_client(:basic)
+
+  # methods / values to test for
+  # format is defined in spec_helper
+  test_sets = [
+    ["get_3ds_availability", "threeDS2supported", false],
+    ["get_cost_estimate", "resultCode", "Success"]
+  ]
+
+  generate_tests(client, "BinLookup", test_sets, client.bin_lookup)
+end

data/spec/checkout_spec.rb

@@ -13,9 +13,79 @@ RSpec.describe Adyen::Checkout, service: "checkout" do
 
   # must be created manually because every field in the response is an array
   it "makes a payment_methods call" do
-    parsed_body = create_test(@shared_values[:client], @shared_values[:service], "payment_methods", @shared_values[:client].checkout)
-    expect(parsed_body["paymentMethods"].class).
-      to be Array
+    request_body = JSON.parse(json_from_file("mocks/requests/Checkout/payment_methods.json"))
+
+    response_body = json_from_file("mocks/responses/Checkout/payment_methods.json")
+
+    url = @shared_values[:client].service_url(@shared_values[:service], "paymentMethods", @shared_values[:client].checkout.version)
+    WebMock.stub_request(:post, url).
+      with(
+        body: request_body,
+        headers: {
+          "x-api-key" => @shared_values[:client].api_key
+        }
+      ).
+      to_return(
+        body: response_body
+      )
+
+    result = @shared_values[:client].checkout.payment_methods(request_body)
+    response_hash = result.response
+
+    expect(result.status).
+      to eq(200)
+    expect(response_hash).
+      to eq(JSON.parse(response_body))
+    expect(response_hash).
+      to be_a Adyen::HashWithAccessors
+    expect(response_hash).
+      to be_a_kind_of Hash
+  end
+
+  it "makes a paymentMethods/balance call" do
+    request_body = JSON.parse(json_from_file("mocks/requests/Checkout/payment_methods_balance.json"))
+    request_body[:applicationInfo] = {}
+    request_body[:applicationInfo][:adyenPaymentSource] = {
+      :name => "adyen-test",
+      :version => "1.0.0",
+    }
+
+    @shared_values[:client].add_application_info(request_body)
+
+    response_body = json_from_file("mocks/responses/Checkout/payment_methods_balance.json")
+
+    url = @shared_values[:client].service_url(@shared_values[:service], "paymentMethods/balance", @shared_values[:client].checkout.version)
+    WebMock.stub_request(:post, url).
+      with(
+        body: request_body,
+        headers: {
+          "x-api-key" => @shared_values[:client].api_key
+        }
+      ).
+      to_return(
+        body: response_body
+      )
+
+    result = @shared_values[:client].checkout.payment_methods.balance(request_body)
+    # result.response is already a Ruby hash (rather than an unparsed JSON string)
+    response_hash = result.response
+
+    expect(request_body[:applicationInfo][:adyenLibrary][:name]).
+      to eq(Adyen::NAME)
+    expect(request_body[:applicationInfo][:adyenLibrary][:version]).
+      to eq(Adyen::VERSION)
+    expect(request_body[:applicationInfo][:adyenPaymentSource][:name]).
+      to eq("adyen-test")
+    expect(result.status).
+      to eq(200)
+    expect(response_hash).
+      to eq(JSON.parse(response_body))
+    expect(response_hash).
+      to be_a Adyen::HashWithAccessors
+    expect(response_hash).
+      to be_a_kind_of Hash
+    expect(response_hash["balance"]).
+      to eq("100")
   end
 
   # must be created manually due to payments/details format
@@ -102,6 +172,178 @@ RSpec.describe Adyen::Checkout, service: "checkout" do
     expect(response_hash.resultCode).
       to eq("Authorised")
   end
+  
+  # must be created manually due to paymentsLinks format
+  it "makes a paymentLinks call" do
+    request_body = JSON.parse(json_from_file("mocks/requests/Checkout/payment_links.json"))
+    request_body[:applicationInfo] = {}
+    request_body[:applicationInfo][:adyenPaymentSource] = {
+      :name => "adyen-test",
+      :version => "1.0.0",
+    }
+
+    @shared_values[:client].add_application_info(request_body)
+
+    response_body = json_from_file("mocks/responses/Checkout/payment_links.json")
+
+    url = @shared_values[:client].service_url(@shared_values[:service], "paymentLinks", @shared_values[:client].checkout.version)
+    WebMock.stub_request(:post, url).
+      with(
+        body: request_body,
+        headers: {
+          "x-api-key" => @shared_values[:client].api_key
+        }
+      ).
+      to_return(
+        body: response_body
+      )
+
+    result = @shared_values[:client].checkout.payment_links(request_body)
+    response_hash = result.response
+
+    expect(result.status).
+      to eq(200)
+    expect(response_hash).
+      to eq(JSON.parse(response_body))
+    expect(response_hash).
+      to be_a Adyen::HashWithAccessors
+    expect(response_hash).
+      to be_a_kind_of Hash
+  end
+  
+  # must be created manually due to paymentsLinks/{linkId} format
+  it "makes a get paymentLinks/{linkId} call" do
+    response_body = json_from_file("mocks/responses/Checkout/get-payment-link.json")
+
+    url = @shared_values[:client].service_url(@shared_values[:service], "paymentLinks/1", @shared_values[:client].checkout.version)
+    WebMock.stub_request(:get, url).
+      with(
+        headers: {
+          "x-api-key" => @shared_values[:client].api_key
+        }
+      ).
+      to_return(
+        body: response_body
+      )
+
+    result = @shared_values[:client].checkout.payment_links.get("1")
+    response_hash = result.response
+
+    expect(result.status).
+      to eq(200)
+    expect(response_hash).
+      to eq(JSON.parse(response_body))
+    expect(response_hash).
+      to be_a Adyen::HashWithAccessors
+    expect(response_hash).
+      to be_a_kind_of Hash
+    expect(response_hash["status"]).
+      to eq("active")
+    expect(response_hash.id).
+      to eq("MockId")
+  end
+
+  # must be created manually due to paymentsLinks/{linkId} format
+  it "makes a patch paymentLinks/{linkId} call" do
+    request_body = {
+      :status => "expired",
+    }
+
+    @shared_values[:client].add_application_info(request_body)
+    response_body = json_from_file("mocks/responses/Checkout/update-payment-link.json")
+
+    url = @shared_values[:client].service_url(@shared_values[:service], "paymentLinks/1", @shared_values[:client].checkout.version)
+    WebMock.stub_request(:patch, url).
+      with(
+        body: request_body,
+        headers: {
+          "x-api-key" => @shared_values[:client].api_key
+        }
+      ).
+      to_return(
+        body: response_body
+      )
+
+    result = @shared_values[:client].checkout.payment_links.update("1", request_body)
+    response_hash = result.response
+
+    expect(result.status).
+      to eq(200)
+    expect(response_hash).
+      to eq(JSON.parse(response_body))
+    expect(response_hash).
+      to be_a Adyen::HashWithAccessors
+    expect(response_hash).
+      to be_a_kind_of Hash
+    expect(response_hash["status"]).
+      to eq("expired")
+    expect(response_hash.id).
+      to eq("MockId")
+  end
+
+  it "makes an orders call" do
+    request_body = JSON.parse(json_from_file("mocks/requests/Checkout/orders.json"))
+
+    response_body = json_from_file("mocks/responses/Checkout/orders.json")
+
+    url = @shared_values[:client].service_url(@shared_values[:service], "orders", @shared_values[:client].checkout.version)
+    WebMock.stub_request(:post, url).
+      with(
+        body: request_body,
+        headers: {
+          "x-api-key" => @shared_values[:client].api_key
+        }
+      ).
+      to_return(
+        body: response_body
+      )
+
+    result = @shared_values[:client].checkout.orders(request_body)
+    response_hash = result.response
+
+    expect(result.status).
+      to eq(200)
+    expect(response_hash).
+      to eq(JSON.parse(response_body))
+    expect(response_hash).
+      to be_a Adyen::HashWithAccessors
+    expect(response_hash).
+      to be_a_kind_of Hash
+    expect(response_hash["remainingAmount"]["value"]).
+      to eq(100)
+  end
+
+  it "makes an orders/cancel call" do
+    request_body = JSON.parse(json_from_file("mocks/requests/Checkout/orders_cancel.json"))
+
+    response_body = json_from_file("mocks/responses/Checkout/orders_cancel.json")
+
+    url = @shared_values[:client].service_url(@shared_values[:service], "orders/cancel", @shared_values[:client].checkout.version)
+    WebMock.stub_request(:post, url).
+      with(
+        body: request_body,
+        headers: {
+          "x-api-key" => @shared_values[:client].api_key
+        }
+      ).
+      to_return(
+        body: response_body
+      )
+
+    result = @shared_values[:client].checkout.orders.cancel(request_body)
+    response_hash = result.response
+
+    expect(result.status).
+      to eq(200)
+    expect(response_hash).
+      to eq(JSON.parse(response_body))
+    expect(response_hash).
+      to be_a Adyen::HashWithAccessors
+    expect(response_hash).
+      to be_a_kind_of Hash
+    expect(response_hash["resultCode"]).
+      to eq("cancelled")
+  end
 
   # create client for automated tests
   client = create_client(:api_key)
@@ -110,8 +352,8 @@ RSpec.describe Adyen::Checkout, service: "checkout" do
   # format is defined in spec_helper
   test_sets = [
     ["payment_session", "publicKeyToken", "8115054323780109"],
-    ["payment_links", "url", "https://checkoutshopper-test.adyen.com"],
-    ["payments", "resultCode", "Authorised"]
+    ["payments", "resultCode", "Authorised"],
+    ["origin_keys", "originKeys", { "https://adyen.com" => "mocked_origin_key" }]
   ]
 
   generate_tests(client, "Checkout", test_sets, client.checkout)