Merge pull request #167 from Adyen/automation/release

Release v7.1.0

Author: AdyenAutomationBot

README.md

@@ -21,6 +21,7 @@ This library supports the following:
 | [Recurring API](https://docs.adyen.com/api-explorer/Recurring/68/overview) | v68 | Endpoints for managing saved payment details. | [Recurring](lib/adyen/services/recurring.rb) |
 | [Stored Value API](https://docs.adyen.com/payment-methods/gift-cards/stored-value-api) | v46 | Manage both online and point-of-sale gift cards and other stored-value cards. | [StoredValue](lib/adyen/services/storedValue.rb) |
 | [Transfers API](https://docs.adyen.com/api-explorer/transfers/3/overview) | v3 | The Transfers API provides endpoints that can be used to get information about all your transactions, move funds within your balance platform or send funds from your balance platform to a transfer instrument. | [Transfers](lib/adyen/services/transfers.rb) |
+| [Cloud-based Terminal API](https://docs.adyen.com/point-of-sale/design-your-integration/terminal-api/terminal-api-reference/) | - | Our point-of-sale integration. | [TerminalCloudAPI](lib/adyen/services/terminalCloudAPI.rb) |
 
 For more information, refer to our [documentation](https://docs.adyen.com/) or the [API Explorer](https://docs.adyen.com/api-explorer/).
 
@@ -99,6 +100,121 @@ To run the tests use :
 bundle install --with development 
 ~~~~
 
+## Using the Cloud Terminal API Integration
+In order to submit In-Person requests with [Terminal API over Cloud](https://docs.adyen.com/point-of-sale/design-your-integration/choose-your-architecture/cloud/) you need to initialize the client in the same way as explained above for Ecommerce transactions:
+``` ruby
+# Step 1: Require the parts of the module you want to use
+require 'adyen-ruby-api-library'
+
+# Step 2: Initialize the client object
+adyen = Adyen::Client.new(api_key: 'YOUR_API_KEY', env: :test)
+
+# Step 3: Create the request
+serviceID = "123456789"
+saleID = "POS-SystemID12345"
+POIID = "Your Device Name(eg V400m-123456789)"
+
+# Use a unique transaction for every transaction you perform
+transactionID = "TransactionID"
+
+request = 
+{
+  "SaleToPOIRequest": {
+    "MessageHeader": {
+      "MessageClass": "Service",
+      "MessageCategory": "Payment",
+      "MessageType": "Request",
+      "ServiceID": serviceID,
+      "SaleID": saleID,
+      "POIID": POIID,
+      "ProtocolVersion": "3.0"
+    },
+    "PaymentRequest": {
+      "SaleData": {
+        "SaleTransactionID": {
+          "TransactionID": transactionID,
+          "TimeStamp": "2023-08-23T09:48:55"
+        },
+        "SaleToAcquirerData": "eyJhcHBsaWNhdGlvbkluZm8iOnsiYWR5ZW5MaWJyYXJ5Ijp7Im5hbWUiOiJhZ....",
+        "TokenRequestedType": "Transaction"
+      },
+      "PaymentTransaction": {
+        "AmountsReq": {
+          "Currency": "EUR",
+          "RequestedAmount": 10
+        }
+      }
+    }
+  }
+}
+
+# Step 4: Make the request
+response = adyen.terminal_cloud_api.sync(request)
+```
+
+### Optional: perform an abort request
+
+To perform an [abort request](https://docs.adyen.com/point-of-sale/basic-tapi-integration/cancel-a-transaction/) you can use the following example:
+``` ruby
+abortRequest = 
+{
+  "MessageHeader": {
+    "MessageClass": "Service",
+    "MessageCategory": "Abort",
+    "MessageType": "Request",
+    "ServiceID": serviceID,
+    "SaleID": saleID,
+    "POIID": POIID,
+    "ProtocolVersion": "3.0"
+  },
+  "AbortRequest": {
+    "AbortReason": "MerchantAbort",
+    "MessageReference": {
+      "MessageCategory": "Payment",
+      "SaleID": saleID,
+      # Service ID of the payment you're aborting
+      "ServiceID": serviceID,
+      "POIID": POIID
+    }
+  }
+}
+
+response = adyen.terminal_cloud_api.sync(abortRequest)
+```
+
+### Optional: perform a status request
+
+To perform a [status request](https://docs.adyen.com/point-of-sale/basic-tapi-integration/verify-transaction-status/) you can use the following example:
+``` ruby
+statusRequest =
+{
+  "MessageHeader": {
+    "MessageClass": "Service",
+    "MessageCategory": "TransactionStatus",
+    "MessageType": "Request",
+    "ServiceID": serviceID,
+    "SaleID": saleID,
+    "POIID": POIID,
+    "ProtocolVersion": "3.0"
+  },
+  "TransactionStatusRequest": {
+    "ReceiptReprintFlag": true,
+    "DocumentQualifier": [
+      "CashierReceipt",
+      "CustomerReceipt"
+    ],
+    "MessageReference": {
+      "SaleID": saleID,
+      # serviceID of the transaction you want the status update for
+      "ServiceID": serviceID,
+      "MessageCategory": "Payment"
+    }
+  }
+}
+
+response = adyen.terminal_cloud_api.sync(statusRequest)
+```
+
 ## Feedback
 We value your input! Help us enhance our API Libraries and improve the integration experience by providing your feedback. Please take a moment to fill out [our feedback form](https://forms.gle/A4EERrR6CWgKWe5r9) to share your thoughts, suggestions or ideas.
 

lib/adyen-ruby-api-library.rb

@@ -19,3 +19,4 @@
 require_relative 'adyen/services/management'
 require_relative 'adyen/services/storedValue'
 require_relative 'adyen/services/balanceControlService'
+require_relative 'adyen/services/terminalCloudAPI'

lib/adyen/client.rb

@@ -75,6 +75,9 @@ def service_url_base(service)
         when 'Management'
           url = "https://management-#{@env}.adyen.com"
           supports_live_url_prefix = false
+        when 'TerminalCloudAPI'
+          url = "https://terminal-api-#{@env}.adyen.com"
+          supports_live_url_prefix = false
         else
           raise ArgumentError, 'Invalid service specified'
         end
@@ -98,6 +101,8 @@ def service_url_base(service)
     def service_url(service, action, version)
       if service == "Checkout" && @env == :live
         return "#{service_url_base(service)}/checkout/v#{version}/#{action}"
+      elsif version == nil
+        return "#{service_url_base(service)}/#{action}"
       else
         return "#{service_url_base(service)}/v#{version}/#{action}"
       end
@@ -221,6 +226,9 @@ def call_adyen_api(service, action, request_data, headers, version, _with_applic
       # delete has no response.body (unless it throws an error)
       if response.body.nil? || response.body === ''
         AdyenResult.new('{}', response.headers, response.status)
+      # terminal API async call returns always 'ok'
+      elsif response.body === 'ok'
+        AdyenResult.new('{}', response.headers, response.status)
       else
         AdyenResult.new(response.body, response.headers, response.status)
       end
@@ -286,6 +294,10 @@ def stored_value
     def balance_control_service
       @balance_control_service ||= Adyen::BalanceControlService.new(self)
     end
+
+    def terminal_cloud_api
+      @terminal_cloud_api ||= Adyen::TerminalCloudAPI.new(self)
+    end
   end
 end
 # rubocop:enable all

lib/adyen/services/balancePlatform.rb

@@ -3,6 +3,7 @@
 require_relative 'balancePlatform/bank_account_validation_api'
 require_relative 'balancePlatform/grant_accounts_api'
 require_relative 'balancePlatform/grant_offers_api'
+require_relative 'balancePlatform/network_tokens_api'
 require_relative 'balancePlatform/payment_instrument_groups_api'
 require_relative 'balancePlatform/payment_instruments_api'
 require_relative 'balancePlatform/platform_api'
@@ -39,6 +40,10 @@ def grant_offers_api
       @grant_offers_api ||= Adyen::GrantOffersApi.new(@client, @version)
     end
 
+    def network_tokens_api
+      @network_tokens_api ||= Adyen::NetworkTokensApi.new(@client, @version)
+    end
+
     def payment_instrument_groups_api
       @payment_instrument_groups_api ||= Adyen::PaymentInstrumentGroupsApi.new(@client, @version)
     end

lib/adyen/services/balancePlatform/network_tokens_api.rb

@@ -0,0 +1,29 @@
+require_relative '../service'
+module Adyen
+  class NetworkTokensApi < Service
+    attr_accessor :service, :version
+
+    def initialize(client, version = DEFAULT_VERSION)
+      super(client, version, 'BalancePlatform')
+    end
+
+    def get_network_token(network_token_id, headers: {})
+      endpoint = '/networkTokens/{networkTokenId}'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint, network_token_id)
+      
+      action = { method: 'get', url: endpoint }
+      @client.call_adyen_api(@service, action, {}, headers, @version)
+    end
+
+    def update_network_token(request, network_token_id, headers: {})
+      endpoint = '/networkTokens/{networkTokenId}'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint, network_token_id)
+      
+      action = { method: 'patch', url: endpoint }
+      @client.call_adyen_api(@service, action, request, headers, @version)
+    end
+
+  end
+end

lib/adyen/services/balancePlatform/payment_instruments_api.rb

@@ -16,6 +16,15 @@ def get_payment_instrument(id, headers: {})
       @client.call_adyen_api(@service, action, {}, headers, @version)
     end
 
+    def list_network_tokens(id, headers: {})
+      endpoint = '/paymentInstruments/{id}/networkTokens'.gsub(/{.+?}/, '%s')
+      endpoint = endpoint.gsub(%r{^/}, '')
+      endpoint = format(endpoint, id)
+      
+      action = { method: 'get', url: endpoint }
+      @client.call_adyen_api(@service, action, {}, headers, @version)
+    end
+
     def get_pan_of_payment_instrument(id, headers: {})
       endpoint = '/paymentInstruments/{id}/reveal'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')

lib/adyen/services/checkout/recurring_api.rb

@@ -7,10 +7,10 @@ def initialize(client, version = DEFAULT_VERSION)
       super(client, version, 'Checkout')
     end
 
-    def delete_token_for_stored_payment_details(recurring_id, headers: {}, query_params: {})
-      endpoint = '/storedPaymentMethods/{recurringId}'.gsub(/{.+?}/, '%s')
+    def delete_token_for_stored_payment_details(stored_payment_method_id, headers: {}, query_params: {})
+      endpoint = '/storedPaymentMethods/{storedPaymentMethodId}'.gsub(/{.+?}/, '%s')
       endpoint = endpoint.gsub(%r{^/}, '')
-      endpoint = format(endpoint, recurring_id)
+      endpoint = format(endpoint, stored_payment_method_id)
       endpoint += create_query_string(query_params)
       action = { method: 'delete', url: endpoint }
       @client.call_adyen_api(@service, action, {}, headers, @version)

lib/adyen/services/terminalCloudAPI.rb

@@ -0,0 +1,38 @@
+require_relative './service'
+module Adyen
+  class TerminalCloudAPI < Service
+    attr_accessor :service
+
+    def initialize(client)
+      super(client, nil ,'TerminalCloudAPI')
+    end
+
+    def connected_terminals(request, headers: {})
+      endpoint = '/connectedTerminals'.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 sync(request, headers: {})
+      endpoint = '/sync'.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 async(request, headers: {})
+      endpoint = '/async'.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
+end

lib/adyen/version.rb

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

spec/client_spec.rb

@@ -236,4 +236,23 @@
     expect(client.service_url('PosTerminalManagement', 'assignTerminals', '1'))
       .to eq('https://postfmapi-test.adyen.com/postfmapi/terminal/v1/assignTerminals')
   end
+
+  it 'checks the creation of TerminalCloudAPI sync url' do
+    client = Adyen::Client.new(api_key: 'api_key', env: :test)
+    expect(client.service_url('TerminalCloudAPI', 'sync', nil))
+      .to eq('https://terminal-api-test.adyen.com/sync')
+  end
+
+  it 'checks the creation of TerminalCloudAPI async url' do
+    client = Adyen::Client.new(api_key: 'api_key', env: :test)
+    expect(client.service_url('TerminalCloudAPI', 'async', nil))
+      .to eq('https://terminal-api-test.adyen.com/async')
+  end
+
+  it 'checks the creation of TerminalCloudAPI connectedTerminals url' do
+    client = Adyen::Client.new(api_key: 'api_key', env: :test)
+    expect(client.service_url('TerminalCloudAPI', 'connectedTerminals', nil))
+      .to eq('https://terminal-api-test.adyen.com/connectedTerminals')
+      
+  end
 end