citypay_api_client 1.0.3 → 1.1.1

data/lib/citypay_api_client/api/batch_processing_api__.rb

@@ -0,0 +1,225 @@
+=begin
+#CityPay Payment API
+
+# This CityPay API is a HTTP RESTful payment API used for direct server to server transactional processing. It provides a number of payment mechanisms including: Internet, MOTO, Continuous Authority transaction processing, 3-D Secure decision handling using RFA Secure, Authorisation, Refunding, Pre-Authorisation, Cancellation/Voids and Completion processing. The API is also capable of tokinsed payments using Card Holder Accounts.  ## Compliance and Security Your application will need to adhere to PCI-DSS standards to operate safely and to meet requirements set out by  Visa and MasterCard and the PCI Security Standards Council. These include  * Data must be collected using TLS version 1.2 using [strong cryptography](#enabled-tls-ciphers). We will not accept calls to our API at   lower grade encryption levels. We regularly scan our TLS endpoints for vulnerabilities and perform TLS assessments   as part of our compliance program. * The application must not store sensitive card holder data (CHD) such as the card security code (CSC) or   primary access number (PAN) * The application must not display the full card number on receipts, it is recommended to mask the PAN   and show the last 4 digits. The API will return this for you for ease of receipt creation * If you are developing a website, you will be required to perform regular scans on the network where you host the   application to meet your compliance obligations * You will be required to be PCI Compliant and the application must adhere to the security standard. Further information   is available from [https://www.pcisecuritystandards.org/](https://www.pcisecuritystandards.org/) * The API verifies that the request is for a valid account and originates from a trusted source using the remote IP   address. Our application firewalls analyse data that may be an attempt to break a large number of security common   security vulnerabilities. 
+
+Contact: support@citypay.com
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 6.2.1
+
+=end
+
+require 'cgi'
+
+module CityPayApiClient
+  class BatchProcessingApi
+    attr_accessor :api_client
+
+    def initialize(api_client = ApiClient.default)
+      @api_client = api_client
+    end
+    # Batch Process Request
+    # A batch process request is used to start the batch process workflow by uploading batch data and initialising a new batch for processing. Once validated the batch will be queued for processing and further updates can be received by a subsequent call to retrieve the batch status. 
+    # @param process_batch_request [ProcessBatchRequest] 
+    # @param [Hash] opts the optional parameters
+    # @return [ProcessBatchResponse]
+    def batch_process_request(process_batch_request, opts = {})
+      data, _status_code, _headers = batch_process_request_with_http_info(process_batch_request, opts)
+      data
+    end
+
+    # Batch Process Request
+    # A batch process request is used to start the batch process workflow by uploading batch data and initialising a new batch for processing. Once validated the batch will be queued for processing and further updates can be received by a subsequent call to retrieve the batch status. 
+    # @param process_batch_request [ProcessBatchRequest] 
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(ProcessBatchResponse, Integer, Hash)>] ProcessBatchResponse data, response status code and response headers
+    def batch_process_request_with_http_info(process_batch_request, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: BatchProcessingApi.batch_process_request ...'
+      end
+      # verify the required parameter 'process_batch_request' is set
+      if @api_client.config.client_side_validation && process_batch_request.nil?
+        fail ArgumentError, "Missing the required parameter 'process_batch_request' when calling BatchProcessingApi.batch_process_request"
+      end
+      # resource path
+      local_var_path = '/v6/batch/process'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
+      # HTTP header 'Content-Type'
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(process_batch_request)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'ProcessBatchResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
+
+      new_options = opts.merge(
+        :operation => :"BatchProcessingApi.batch_process_request",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: BatchProcessingApi#batch_process_request\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # BatchReportRequest
+    # The operation is used to retrieve a report of the result of a batch process.
+    # @param batch_report_request [BatchReportRequest] 
+    # @param [Hash] opts the optional parameters
+    # @return [BatchReportResponseModel]
+    def batch_report_request(batch_report_request, opts = {})
+      data, _status_code, _headers = batch_report_request_with_http_info(batch_report_request, opts)
+      data
+    end
+
+    # BatchReportRequest
+    # The operation is used to retrieve a report of the result of a batch process.
+    # @param batch_report_request [BatchReportRequest] 
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(BatchReportResponseModel, Integer, Hash)>] BatchReportResponseModel data, response status code and response headers
+    def batch_report_request_with_http_info(batch_report_request, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: BatchProcessingApi.batch_report_request ...'
+      end
+      # verify the required parameter 'batch_report_request' is set
+      if @api_client.config.client_side_validation && batch_report_request.nil?
+        fail ArgumentError, "Missing the required parameter 'batch_report_request' when calling BatchProcessingApi.batch_report_request"
+      end
+      # resource path
+      local_var_path = '/v6/batch/retrieve'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
+      # HTTP header 'Content-Type'
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(batch_report_request)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'BatchReportResponseModel'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
+
+      new_options = opts.merge(
+        :operation => :"BatchProcessingApi.batch_report_request",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: BatchProcessingApi#batch_report_request\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
+    # CheckBatchStatus
+    # The operation is used to retrieve the status of a batch process.
+    # @param check_batch_status [CheckBatchStatus] 
+    # @param [Hash] opts the optional parameters
+    # @return [CheckBatchStatusResponse]
+    def check_batch_status_request(check_batch_status, opts = {})
+      data, _status_code, _headers = check_batch_status_request_with_http_info(check_batch_status, opts)
+      data
+    end
+
+    # CheckBatchStatus
+    # The operation is used to retrieve the status of a batch process.
+    # @param check_batch_status [CheckBatchStatus] 
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(CheckBatchStatusResponse, Integer, Hash)>] CheckBatchStatusResponse data, response status code and response headers
+    def check_batch_status_request_with_http_info(check_batch_status, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: BatchProcessingApi.check_batch_status_request ...'
+      end
+      # verify the required parameter 'check_batch_status' is set
+      if @api_client.config.client_side_validation && check_batch_status.nil?
+        fail ArgumentError, "Missing the required parameter 'check_batch_status' when calling BatchProcessingApi.check_batch_status_request"
+      end
+      # resource path
+      local_var_path = '/v6/batch/status'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
+      # HTTP header 'Content-Type'
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(check_batch_status)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'CheckBatchStatusResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
+
+      new_options = opts.merge(
+        :operation => :"BatchProcessingApi.check_batch_status_request",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: BatchProcessingApi#check_batch_status_request\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+  end
+end

data/lib/citypay_api_client/api/{card_holder_account_api.rb → card_holder_account_api__.rb}

@@ -1,11 +1,11 @@
 =begin
 #CityPay Payment API
 
-# This CityPay API is a HTTP RESTful payment API used for direct server to server transactional processing. It provides a number of payment mechanisms including: Internet, MOTO, Continuous Authority transaction processing, 3-D Secure decision handling using RFA Secure, Authorisation, Refunding, Pre-Authorisation, Cancellation/Voids and Completion processing. The API is also capable of tokinsed payments using Card Holder Accounts.  ## Compliance and Security <aside class=\"notice\">   Before we begin a reminder that your application will need to adhere to PCI-DSS standards to operate safely   and to meet requirements set out by Visa and MasterCard and the PCI Security Standards Council including: </aside>  * Data must be collected using TLS version 1.2 using [strong cryptography](#enabled-tls-ciphers). We will not accept calls to our API at   lower grade encryption levels. We regularly scan our TLS endpoints for vulnerabilities and perform TLS assessments   as part of our compliance program. * The application must not store sensitive card holder data (CHD) such as the card security code (CSC) or   primary access number (PAN) * The application must not display the full card number on receipts, it is recommended to mask the PAN   and show the last 4 digits. The API will return this for you for ease of receipt creation * If you are developing a website, you will be required to perform regular scans on the network where you host the   application to meet your compliance obligations * You will be required to be PCI Compliant and the application must adhere to the security standard. Further information   is available from [https://www.pcisecuritystandards.org/](https://www.pcisecuritystandards.org/) * The API verifies that the request is for a valid account and originates from a trusted source using the remote IP   address. Our application firewalls analyse data that may be an attempt to break a large number of security common   security vulnerabilities. 
+# This CityPay API is a HTTP RESTful payment API used for direct server to server transactional processing. It provides a number of payment mechanisms including: Internet, MOTO, Continuous Authority transaction processing, 3-D Secure decision handling using RFA Secure, Authorisation, Refunding, Pre-Authorisation, Cancellation/Voids and Completion processing. The API is also capable of tokinsed payments using Card Holder Accounts.  ## Compliance and Security Your application will need to adhere to PCI-DSS standards to operate safely and to meet requirements set out by  Visa and MasterCard and the PCI Security Standards Council. These include  * Data must be collected using TLS version 1.2 using [strong cryptography](#enabled-tls-ciphers). We will not accept calls to our API at   lower grade encryption levels. We regularly scan our TLS endpoints for vulnerabilities and perform TLS assessments   as part of our compliance program. * The application must not store sensitive card holder data (CHD) such as the card security code (CSC) or   primary access number (PAN) * The application must not display the full card number on receipts, it is recommended to mask the PAN   and show the last 4 digits. The API will return this for you for ease of receipt creation * If you are developing a website, you will be required to perform regular scans on the network where you host the   application to meet your compliance obligations * You will be required to be PCI Compliant and the application must adhere to the security standard. Further information   is available from [https://www.pcisecuritystandards.org/](https://www.pcisecuritystandards.org/) * The API verifies that the request is for a valid account and originates from a trusted source using the remote IP   address. Our application firewalls analyse data that may be an attempt to break a large number of security common   security vulnerabilities. 
 
 Contact: support@citypay.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.0.0-SNAPSHOT
+OpenAPI Generator version: 6.2.1
 
 =end
 
@@ -48,7 +48,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'card_id' when calling CardHolderAccountApi.account_card_delete_request"
       end
       # resource path
-      local_var_path = '/account/{accountid}/card/{cardId}'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s)).sub('{' + 'cardId' + '}', CGI.escape(card_id.to_s))
+      local_var_path = '/v6/account/{accountid}/card/{cardId}'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s)).sub('{' + 'cardId' + '}', CGI.escape(card_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -62,15 +62,16 @@ module CityPayApiClient
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
       # return_type
-      return_type = opts[:return_type] || 'Acknowledgement' 
+      return_type = opts[:debug_return_type] || 'Acknowledgement'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_card_delete_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -116,7 +117,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'register_card' when calling CardHolderAccountApi.account_card_register_request"
       end
       # resource path
-      local_var_path = '/account/{accountid}/register'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
+      local_var_path = '/v6/account/{accountid}/register'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -126,21 +127,25 @@ module CityPayApiClient
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(register_card) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(register_card)
 
       # return_type
-      return_type = opts[:return_type] || 'CardHolderAccount' 
+      return_type = opts[:debug_return_type] || 'CardHolderAccount'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_card_register_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -192,7 +197,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'card_status' when calling CardHolderAccountApi.account_card_status_request"
       end
       # resource path
-      local_var_path = '/account/{accountid}/card/{cardId}/status'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s)).sub('{' + 'cardId' + '}', CGI.escape(card_id.to_s))
+      local_var_path = '/v6/account/{accountid}/card/{cardId}/status'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s)).sub('{' + 'cardId' + '}', CGI.escape(card_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -202,21 +207,25 @@ module CityPayApiClient
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(card_status) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(card_status)
 
       # return_type
-      return_type = opts[:return_type] || 'Acknowledgement' 
+      return_type = opts[:debug_return_type] || 'Acknowledgement'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_card_status_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -262,7 +271,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'contact_details' when calling CardHolderAccountApi.account_change_contact_request"
       end
       # resource path
-      local_var_path = '/account/{accountid}/contact'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
+      local_var_path = '/v6/account/{accountid}/contact'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -272,21 +281,25 @@ module CityPayApiClient
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(contact_details) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(contact_details)
 
       # return_type
-      return_type = opts[:return_type] || 'CardHolderAccount' 
+      return_type = opts[:debug_return_type] || 'CardHolderAccount'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_change_contact_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -326,7 +339,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'account_create' when calling CardHolderAccountApi.account_create"
       end
       # resource path
-      local_var_path = '/account/create'
+      local_var_path = '/v6/account/create'
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -336,21 +349,25 @@ module CityPayApiClient
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(account_create) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(account_create)
 
       # return_type
-      return_type = opts[:return_type] || 'CardHolderAccount' 
+      return_type = opts[:debug_return_type] || 'CardHolderAccount'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_create",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -390,7 +407,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'accountid' when calling CardHolderAccountApi.account_delete_request"
       end
       # resource path
-      local_var_path = '/account/{accountid}'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
+      local_var_path = '/v6/account/{accountid}'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -404,15 +421,16 @@ module CityPayApiClient
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
       # return_type
-      return_type = opts[:return_type] || 'Acknowledgement' 
+      return_type = opts[:debug_return_type] || 'Acknowledgement'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_delete_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -428,6 +446,69 @@ module CityPayApiClient
       return data, status_code, headers
     end
 
+    # Account Exists
+    # Checks that an account exists and is active by providing the account id as a url parameter. 
+    # @param accountid [String] The account id that refers to the customer&#39;s account no. This value will have been provided when setting up the card holder account.
+    # @param [Hash] opts the optional parameters
+    # @return [Exists]
+    def account_exists_request(accountid, opts = {})
+      data, _status_code, _headers = account_exists_request_with_http_info(accountid, opts)
+      data
+    end
+
+    # Account Exists
+    # Checks that an account exists and is active by providing the account id as a url parameter. 
+    # @param accountid [String] The account id that refers to the customer&#39;s account no. This value will have been provided when setting up the card holder account.
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(Exists, Integer, Hash)>] Exists data, response status code and response headers
+    def account_exists_request_with_http_info(accountid, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: CardHolderAccountApi.account_exists_request ...'
+      end
+      # verify the required parameter 'accountid' is set
+      if @api_client.config.client_side_validation && accountid.nil?
+        fail ArgumentError, "Missing the required parameter 'accountid' when calling CardHolderAccountApi.account_exists_request"
+      end
+      # resource path
+      local_var_path = '/v6/account-exists/{accountid}'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body]
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'Exists'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
+
+      new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_exists_request",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:GET, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: CardHolderAccountApi#account_exists_request\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # Account Retrieval
     # Allows for the retrieval of a card holder account for the given `id`. Should duplicate accounts exist for the same `id`, the first account created with that `id` will be returned.  The account can be used for tokenisation processing by listing all cards assigned to the account. The returned cards will include all `active`, `inactive` and `expired` cards. This can be used to  enable a card holder to view their wallet and make constructive choices on which card to use. 
     # @param accountid [String] The account id that refers to the customer&#39;s account no. This value will have been provided when setting up the card holder account.
@@ -452,7 +533,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'accountid' when calling CardHolderAccountApi.account_retrieve_request"
       end
       # resource path
-      local_var_path = '/account/{accountid}'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
+      local_var_path = '/v6/account/{accountid}'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -466,15 +547,16 @@ module CityPayApiClient
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] 
+      post_body = opts[:debug_body]
 
       # return_type
-      return_type = opts[:return_type] || 'CardHolderAccount' 
+      return_type = opts[:debug_return_type] || 'CardHolderAccount'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_retrieve_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -520,7 +602,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'account_status' when calling CardHolderAccountApi.account_status_request"
       end
       # resource path
-      local_var_path = '/account/{accountid}/status'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
+      local_var_path = '/v6/account/{accountid}/status'.sub('{' + 'accountid' + '}', CGI.escape(accountid.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -530,21 +612,25 @@ module CityPayApiClient
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(account_status) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(account_status)
 
       # return_type
-      return_type = opts[:return_type] || 'Acknowledgement' 
+      return_type = opts[:debug_return_type] || 'Acknowledgement'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.account_status_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,
@@ -561,7 +647,7 @@ module CityPayApiClient
     end
 
     # Charge
-    # A charge process obtains an authorisation using a tokenised value which represents a stored card  on a card holder account.  A card must previously be registered by calling `/account-register-card` with the card details  or retrieved using `/account-retrieve`  Tokens are generated whenever a previously registered list of cards are retrieved. Each token has, by design a  relatively short time to live of 30 minutes. This is both to safe guard the merchant and card holder from  replay attacks. Tokens are also restricted to your account, preventing malicious actors from stealing details for use elsewhere.    If a token is reused after it has expired it will be rejected and a new token will be required.   Tokenisation can be used for   - repeat authorisations on a previously stored card - easy authorisations just requiring CSC values to be entered - can be used for credential on file style payments - can require full 3-D Secure authentication to retain the liability shift - wallet style usage. 
+    # A charge process obtains an authorisation using a tokenised value which represents a stored card  on a card holder account.  A card must previously be registered by calling `/account-register-card` with the card details  or retrieved using `/account-retrieve`  Tokens are generated whenever a previously registered list of cards are retrieved. Each token has, by design a  relatively short time to live of 30 minutes. This is both to safe guard the merchant and card holder from  replay attacks. Tokens are also restricted to your account, preventing malicious actors from stealing details for use elsewhere.    If a token is reused after it has expired it will be rejected and a new token will be required.   Tokenisation can be used for   - repeat authorisations on a previously stored card - easy authorisations just requiring CSC values to be entered - can be used for credential on file style payments - can require full 3-D Secure authentication to retain the liability shift - wallet style usage    _Should an account be used with 3DSv2, the card holder name should also be stored alongside the card as this is a required field with both Visa and MasterCard for risk analysis._. 
     # @param charge_request [ChargeRequest] 
     # @param [Hash] opts the optional parameters
     # @return [Decision]
@@ -571,7 +657,7 @@ module CityPayApiClient
     end
 
     # Charge
-    # A charge process obtains an authorisation using a tokenised value which represents a stored card  on a card holder account.  A card must previously be registered by calling &#x60;/account-register-card&#x60; with the card details  or retrieved using &#x60;/account-retrieve&#x60;  Tokens are generated whenever a previously registered list of cards are retrieved. Each token has, by design a  relatively short time to live of 30 minutes. This is both to safe guard the merchant and card holder from  replay attacks. Tokens are also restricted to your account, preventing malicious actors from stealing details for use elsewhere.    If a token is reused after it has expired it will be rejected and a new token will be required.   Tokenisation can be used for   - repeat authorisations on a previously stored card - easy authorisations just requiring CSC values to be entered - can be used for credential on file style payments - can require full 3-D Secure authentication to retain the liability shift - wallet style usage. 
+    # A charge process obtains an authorisation using a tokenised value which represents a stored card  on a card holder account.  A card must previously be registered by calling &#x60;/account-register-card&#x60; with the card details  or retrieved using &#x60;/account-retrieve&#x60;  Tokens are generated whenever a previously registered list of cards are retrieved. Each token has, by design a  relatively short time to live of 30 minutes. This is both to safe guard the merchant and card holder from  replay attacks. Tokens are also restricted to your account, preventing malicious actors from stealing details for use elsewhere.    If a token is reused after it has expired it will be rejected and a new token will be required.   Tokenisation can be used for   - repeat authorisations on a previously stored card - easy authorisations just requiring CSC values to be entered - can be used for credential on file style payments - can require full 3-D Secure authentication to retain the liability shift - wallet style usage    _Should an account be used with 3DSv2, the card holder name should also be stored alongside the card as this is a required field with both Visa and MasterCard for risk analysis._. 
     # @param charge_request [ChargeRequest] 
     # @param [Hash] opts the optional parameters
     # @return [Array<(Decision, Integer, Hash)>] Decision data, response status code and response headers
@@ -584,7 +670,7 @@ module CityPayApiClient
         fail ArgumentError, "Missing the required parameter 'charge_request' when calling CardHolderAccountApi.charge_request"
       end
       # resource path
-      local_var_path = '/charge'
+      local_var_path = '/v6/charge'
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -594,21 +680,25 @@ module CityPayApiClient
       # HTTP header 'Accept' (if needed)
       header_params['Accept'] = @api_client.select_header_accept(['application/json', 'text/xml'])
       # HTTP header 'Content-Type'
-      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      content_type = @api_client.select_header_content_type(['application/json', 'text/xml'])
+      if !content_type.nil?
+          header_params['Content-Type'] = content_type
+      end
 
       # form parameters
       form_params = opts[:form_params] || {}
 
       # http body (model)
-      post_body = opts[:body] || @api_client.object_to_http_body(charge_request) 
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(charge_request)
 
       # return_type
-      return_type = opts[:return_type] || 'Decision' 
+      return_type = opts[:debug_return_type] || 'Decision'
 
       # auth_names
-      auth_names = opts[:auth_names] || ['cp-api-key']
+      auth_names = opts[:debug_auth_names] || ['cp-api-key']
 
       new_options = opts.merge(
+        :operation => :"CardHolderAccountApi.charge_request",
         :header_params => header_params,
         :query_params => query_params,
         :form_params => form_params,