citypay_api_client 1.0.3 → 1.1.2

data/spec/api/paylink_api___spec.rb

@@ -0,0 +1,131 @@
+=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: 5.4.0-SNAPSHOT
+
+=end
+
+require 'spec_helper'
+require 'json'
+
+# Unit tests for CityPayApiClient::PaylinkApi
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe 'PaylinkApi' do
+  before do
+    # run before each test
+    @api_instance = CityPayApiClient::PaylinkApi.new
+  end
+
+  after do
+    # run after each test
+  end
+
+  describe 'test an instance of PaylinkApi' do
+    it 'should create an instance of PaylinkApi' do
+      expect(@api_instance).to be_instance_of(CityPayApiClient::PaylinkApi)
+    end
+  end
+
+  # unit tests for token_adjustment_request
+  # Paylink Token Adjustment
+  # Adjusts a TokenRequest's amount value when for instance   1. a Token is created and the shopping cart is updated 2. an invoice is adjusted either due to part payment or due to increased incurred costs. 
+  # @param token The token returned by the create token process.
+  # @param paylink_adjustment_request 
+  # @param [Hash] opts the optional parameters
+  # @return [Acknowledgement]
+  describe 'token_adjustment_request test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  # unit tests for token_close_request
+  # Close Paylink Token
+  # Marks a Paylink Token as closed. This closes the Token for any future action and the Token will not appear in any status request calls. 
+  # @param token The token returned by the create token process.
+  # @param [Hash] opts the optional parameters
+  # @return [Acknowledgement]
+  describe 'token_close_request test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  # unit tests for token_create_bill_payment_request
+  # Create Bill Payment Paylink Token
+  # CityPay Paylink supports invoice and bill payment services by allowing merchants to raise an invoice in their systems and associate the invoice with a Paylink checkout token. CityPay will co-ordinate the checkout flow in relationship with your customer. Our bill payment solution may be used to streamline the payment flow with cardholders to allow your invoice to be paid promptly and via multiple payment channels such as Card Payment, Apple Pay or Google Pay.  The bill payment service allows  1. setting up notification paths to an end customer, such as SMS or Email 2. enabling attachments to be included with Paylink tokens 3. produce chaser notifications for unpaid invoices 4. provide callbacks for notification of the payment of an invoice 5. support part payments against an invoice 6. support of field guards to protect the payment screen 7. support of status reporting on tokens 8. URL short codes for SMS notifications  <img src=\"../images/merchant-BPS-workflow.png\" alt=\"Paylink BPSv2 Overview\" width=\"50%\"/>    ### Notification Paths  Notification paths can be provided which identify the channels for communication of the invoice availability. Up to 3 notification paths may be provided per request.  Each notification uses a template to generate the body of the message. This allows for variable text to be sent out and customised for each call.  SMS messages use URL Short Codes (USC) as a payment link to the invoice payment page. This allows for a standard payment URL to be shortened for optimised usage in SMS. For instance a URL of `https://checkout.citypay.com/PL1234/s348yb8yna4a48n2f8nq2f3msgyng-psn348ynaw8ynaw/en` becomes `citypay.com/Za48na3x`. Each USC is unique however it is a requirement that each USC generated is protected with Field Guards to ensure that sensitive data (such as customer contact details and GDPR) is protected.  To send a notification path, append a `notification-path` property to the request.  ```json  {   \"notification-path\": [     {       \"channel\": \"sms\",       \"to\": \"+441534884000\"     },     {       \"channel\": \"email\",       \"to\": [\"help-desk@citypay.com\"],       \"cc\": [\"third-party@citypay.com\"],       \"reply\": [\"help@my-company.com\"]     }   ] }  ```  Notification paths trigger a number of events which are stored as part of the timeline of events of a Paylink token  - `BillPaymentSmsNotificationQueued` - identifies when an SMS notification has been queued for delivery - `BillPaymentSmsNotificationSent` - identifies when an SMS notification has been sent to the upstream network - `BillPaymentSmsNotificationDelivered` - identifies when an SMS notification has been delivered as notified by the upstream network - `BillPaymentSmsNotificationUndelivered` - identifies when an SMS notification has undelivered notification is provided by the upstream network - `BillPaymentSmsNotificationFailure` - identifies when an SMS notification has failed - `BillPaymentEmailNotificationQueued` -  identifies when an email notification has been queued for delivery - `BillPaymentEmailNotificationSent` -  identifies when an email notification has been accepted by our SMS forwarder - `BillPaymentEmailNotificationFailure` - identifies when an email notification has failed delivery   #### SMS Notification Path  SMS originated from a CityPay pool of numbers and by default only sends to country codes where the service is registered. SMSs may contain a From field which is configured as part of you onboarding and have a name associated to identify the service origin. For example if your business is titled `Health Surgery Ltd` the SMS may be sent to originate from `Health Surgery`.   SMS is also configured for a \"polite mode\". This mode ensures that SMSs aren't sent in the middle of the night when backend services ordinarily run. SMSs will be queued until the time range is deemed as polite. Normally this is between 8am and 9pm.  | Field    | Type     | Usage    | Description                                                                                     | |----------|----------|----------|-------------------------------------------------------------------------------------------------| | template | string   | Reserved | An optional template name to use a template other than the default.                             | | to       | string   | Reserved | The phone number in [E.164](https://en.wikipedia.org/wiki/E.164) format to send the message to. |  #### Email Notification Paths  | Field    | Type     | Usage    | Description                                                                                     | |----------|----------|----------|-------------------------------------------------------------------------------------------------| | template | string   | Reserved | An optional template name to use a template other than the default.                             | | to       | string[] | Required | An array of email addresses to be used for delivery. A maximum of 5 addresses can be added.     | | cc       | string[] | Required | An array of email addresses to be used for cc delivery. A maximum of 5 addresses can be added.  | | bcc      | string[] | Required | An array of email addresses to be used for bcc delivery. A maximum of 5 addresses can be added. | | reply_to | string[] | Required | An array of email addresses to be used for the Reply-To header of an email.     |   ### Field Guards  To ensure that invoices are paid by the intended recipient, Paylink supports the addition of Field Guards.  A Field Guard is an intended field which is to be used as a form of guarded authentication. More than 1 field can be requested.  <img src=\"../images/paylink-field-guards.png\" alt=\"Paylink Field Guards\" width=\"50%\"/>  To determine the source value of the field, each field name is searched in the order of  - identifier - cardholder data such as name - custom parameters - pass through data  If no field values are found, the token request returns a D041 validation error.  #### Authentication and Validation  When values are entered by the user, resultant comparisons are performed by  1. Transliteration of both the source value and entered value. For example, names with accents (e.g. é will become e) 2. Only Alphanumeric values are retained any whitespace or special characters are ignored 3. Case is ignored  Should all values match, the user is authenticated and can continue to the payment form rendered by the Paylink server.  On successful login, an event will be added to include that the access guard validated access.  #### Access-Key  To ensure that a user does not need to re-enter these values multiple times, a cookie is pushed to the user’s browser with an access-key digest value. This value will be presented to the server on each refresh therefore allowing the guard to accept the call. Each value is uniquely stored per merchant account and cannot be shared cross merchant. The lifetime of the cookie is set to 24 hours.  #### Brute Force Prevention  To prevent multiple calls hitting the server, attempting a brute force attack, the login process  1. is fronted by a contemporary web application firewall 2. creates an event for each token when access was denied 3. should the number of failed events breach more than 5 in 30 minutes, the token is locked for an hour 4. should the number of events breach more than 20 the token is fully locked  ### Attachments  Attachments can be included in the request in 2 ways  1. Via a data element direct in the request 2. Via a URL upload to a provided pre-signed URL  The decision of which option is dependent on the size of the attachments. Should the attachment size be greater than 32kb a URL upload is required. Small attachments can be included in the JSON request. This is to prevent our web firewall from blocking your request and to also ensure efficiency of larger file uploads.  There is a maximum of 3 attachments that can be added to a request.  ```json     [{       \"filename\": \"invoice1.pdf\",       \"mime-type\": \"application/pdf\"     },{       \"filename\": \"invoice2.pdf\",       \"data\": \"b4sE64Enc0dEd...=\",       \"mime-type\": \"application/pdf\"     }] ```  | Field     | Type   | Usage    | Description                                                                                                                                          | |-----------|--------|----------|------------------------------------------------------------------------------------------------------------------------------------------------------| | filename  | string | Required | The name of the attachment normally taken from the filename. You should not include the filename path as appropriate                                 | | data      | string | Optional | base64 encoding of the file if less than 32kb in size                                                                                                | | mime-type | string | Required | The mime type of the attachment as defined in [RFC 9110](https://www.rfc-editor.org/rfc/rfc9110.html). Currently only `application/pdf` is supported |   #### Attachment Result  A result of an attachment specifies whether the attachment was successfully added or whether a further upload is requried  | Field  | Type   | Usage    | Description                                                                                                                                       | |--------|--------|----------|---------------------------------------------------------------------------------------------------------------------------------------------------| | result | string | Required | `OK` should the file have uploaded or `UPLOAD` if the file is required to be uploaded.                                                            | | name   | string | Required | The filename that was specified in the upload process                                                                                             | | url    | string | Optional | Should an upload be required, this URL is available for an upload to be issued. The URL is only available for uploads for 24 hours from creation. | 
+  # @param paylink_bill_payment_token_request 
+  # @param [Hash] opts the optional parameters
+  # @return [PaylinkTokenCreated]
+  describe 'token_create_bill_payment_request test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  # unit tests for token_create_request
+  # Create Paylink Token
+  # Creates a Paylink token from the CityPay API.
+  # @param paylink_token_request_model 
+  # @param [Hash] opts the optional parameters
+  # @return [PaylinkTokenCreated]
+  describe 'token_create_request test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  # unit tests for token_reconciled_request
+  # Reconcile Paylink Token
+  # Marks a Paylink Token as reconciled when reconcilation is performed on the merchant's side.
+  # @param token The token returned by the create token process.
+  # @param [Hash] opts the optional parameters
+  # @return [Acknowledgement]
+  describe 'token_reconciled_request test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  # unit tests for token_reopen_request
+  # Reopen Paylink Token
+  # Allows for a Paylink Token to be reopened if a Token has been previously closed and payment has not yet been made.
+  # @param token The token returned by the create token process.
+  # @param [Hash] opts the optional parameters
+  # @return [Acknowledgement]
+  describe 'token_reopen_request test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  # unit tests for token_status_changes_request
+  # Paylink Token Audit
+  # Obtains any changes on Paylink Tokens since a given date and time. This allows for a merchant to regularly check on  activity over a collection of Paylink Tokens and to check on any events that may have occurred. If a Token is `Closed`  it is not considered.  Only statuses that have been appended since the given date and time is returned. 
+  # @param paylink_token_status_change_request 
+  # @param [Hash] opts the optional parameters
+  # @return [PaylinkTokenStatusChangeResponse]
+  describe 'token_status_changes_request test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+  # unit tests for token_status_request
+  # Paylink Token Status
+  # Obtains the full status of a given Paylink Token.
+  # @param token The token returned by the create token process.
+  # @param [Hash] opts the optional parameters
+  # @return [PaylinkTokenStatus]
+  describe 'token_status_request test' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end

data/spec/api_client_spec.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
 
@@ -196,8 +196,8 @@ describe CityPayApiClient::ApiClient do
     let(:api_client) { CityPayApiClient::ApiClient.new }
 
     it 'works' do
-      expect(api_client.select_header_content_type(nil)).to eq('application/json')
-      expect(api_client.select_header_content_type([])).to eq('application/json')
+      expect(api_client.select_header_content_type(nil)).to be_nil
+      expect(api_client.select_header_content_type([])).to be_nil
 
       expect(api_client.select_header_content_type(['application/json'])).to eq('application/json')
       expect(api_client.select_header_content_type(['application/xml', 'application/json; charset=UTF8'])).to eq('application/json; charset=UTF8')

data/spec/configuration_spec.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
 
@@ -17,7 +17,7 @@ describe CityPayApiClient::Configuration do
   before(:each) do
     # uncomment below to setup host and base_path
     # require 'URI'
-    # uri = URI.parse("https://api.citypay.com/v6")
+    # uri = URI.parse("https://api.citypay.com")
     # CityPayApiClient.configure do |c|
     #   c.host = uri.host
     #   c.base_path = uri.path
@@ -27,14 +27,14 @@ describe CityPayApiClient::Configuration do
   describe '#base_url' do
     it 'should have the default value' do
       # uncomment below to test default value of the base path
-      # expect(config.base_url).to eq("https://api.citypay.com/v6")
+      # expect(config.base_url).to eq("https://api.citypay.com")
     end
 
     it 'should remove trailing slashes' do
       [nil, '', '/', '//'].each do |base_path|
         config.base_path = base_path
         # uncomment below to test trailing slashes
-        # expect(config.base_url).to eq("https://api.citypay.com/v6")
+        # expect(config.base_url).to eq("https://api.citypay.com")
       end
     end
   end

data/spec/it_api_sandbox_spec.rb

@@ -2,7 +2,9 @@ require 'spec_helper'
 require 'json'
 require 'date'
 require 'securerandom'
-
+require 'typhoeus'
+require 'base64'
+require_relative '../lib/citypay_api_client/utils/digest_utils'
 
 describe 'IntegrationTests' do
 
@@ -17,6 +19,7 @@ describe 'IntegrationTests' do
       config.api_key['cp-api-key'] = CityPayApiClient::ApiKey.new(client_id: client_id, licence_key: licence_key).generate
       config.debugging = true
       config.host = "sandbox.citypay.com"
+      config.server_index = 1
     end
     cha_api = CityPayApiClient::CardHolderAccountApi.new
   end
@@ -26,35 +29,36 @@ describe 'IntegrationTests' do
   end
 
   describe 'Can run operational tests' do
-    api_instance = CityPayApiClient::OperationalApi.new
+    api_instance = CityPayApiClient::OperationalFunctionsApi.new
 
     it 'should ping and ack' do
       uuid = SecureRandom.uuid
       result = api_instance.ping_request(CityPayApiClient::Ping.new(identifier:  uuid))
-      expect(result.code == "044")
-      expect(result.identifier == uuid)
+      expect(result.code).to eq("044")
+      expect(result.identifier).to eq(uuid)
     end
 
     it 'should list merchants' do
       result = api_instance.list_merchants_request("default")
-      expect(result.clientid == client_id)
+      expect(result.clientid ).to eq(client_id)
     end
 
   end
 
   describe 'Run payment processing tests' do
-    api_instance = CityPayApiClient::PaymentProcessingApi.new
+    api_instance = CityPayApiClient::AuthorisationAndPaymentApi.new
 
     it 'should authorise' do
       uuid = SecureRandom.uuid
       result = api_instance.authorisation_request(CityPayApiClient::AuthRequest.new(
-          merchantid: merchant_id,
-          cardnumber: "4000000000000002",
-          csc: "012",
-          expmonth: 12,
-          expyear: 2030,
-          amount: 1395,
-          identifier: uuid
+        merchantid: merchant_id,
+        cardnumber: "4000000000000002",
+        csc: "012",
+        expmonth: 12,
+        expyear: 2030,
+        amount: 1395,
+        identifier: uuid,
+        threedsecure: CityPayApiClient::ThreeDSecure.new(tds_policy: "2")
       ))
 
       expect(result.auth_response).to_not be_nil
@@ -63,10 +67,68 @@ describe 'IntegrationTests' do
 
       response = result.auth_response
 
-      expect(response.identifier == uuid.to_str)
-      expect(response.authcode == "A12345")
-      expect(response.amount == 1395)
-      expect(response.result_code == "001")
+      expect(response.identifier).to eq(uuid.to_str)
+      expect(response.authcode).to eq("A12345")
+      expect(response.amount).to eq(1395)
+      expect(response.result_code).to eq("001")
+
+      expect(DigestUtils.validate_digest(response, licence_key)).to eq(true)
+    end
+
+  end
+
+  describe 'Run payment processing tests 3DSv2' do
+    api_instance = CityPayApiClient::AuthorisationAndPaymentApi.new
+
+    it 'should authorise 3DSv2' do
+      uuid = SecureRandom.uuid
+      result = api_instance.authorisation_request(CityPayApiClient::AuthRequest.new(
+        merchantid: merchant_id,
+        cardnumber: "4000000000000002",
+        csc: "123",
+        expmonth: 12,
+        expyear: 2030,
+        amount: 1396,
+        identifier: uuid,
+        trans_type: "A",
+        threedsecure: CityPayApiClient::ThreeDSecure.new(
+          cp_bx: "eyJhIjoiRkFwSCIsImMiOjI0LCJpIjoid3dIOTExTlBKSkdBRVhVZCIsImoiOmZhbHNlLCJsIjoiZW4tVVMiLCJoIjoxNDQwLCJ3IjoyNTYwLCJ0IjowLCJ1IjoiTW96aWxsYS81LjAgKE1hY2ludG9zaDsgSW50ZWwgTWFjIE9TIFggMTFfMl8zKSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvODkuMC40Mzg5LjgyIFNhZmFyaS81MzcuMzYiLCJ2IjoiMS4wLjAifQ",
+          merchant_termurl: "https://citypay.com/acs/return"
+        )
+      ))
+
+      expect(result.auth_response).to be_nil
+      expect(result.authen_required).to be_nil
+      expect(result.request_challenged).to_not be_nil
+
+      response = result.request_challenged
+
+      expect(response.acs_url).to_not be_nil
+      expect(response.creq).to_not be_nil
+      expect(response.threedserver_trans_id).to_not be_nil
+
+      content = {
+        :threeDSSessionData => response.threedserver_trans_id,
+        :creq => response.creq
+      }
+
+      request = Typhoeus::Request.new("https://sandbox.citypay.com/3dsv2/acs",
+                                       method: :post,
+                                       headers: {
+                                         "Content-Type" => "application/json"
+                                       },
+                                       body: content.to_json)
+      res = request.run
+      c_res = res.response_body
+      object = JSON.parse(c_res)
+      c_res_auth_request = CityPayApiClient::CResAuthRequest.new({:cres => object['cres']})
+
+      c_res_request_response =  api_instance.c_res_request(c_res_auth_request)
+
+      expect(c_res_request_response.amount).to eq(1396)
+      expect(c_res_request_response.authcode).to eq("A12345")
+      expect(c_res_request_response.authen_result).to eq("Y")
+      expect(c_res_request_response.authorised).to eq(true)
     end
 
   end
@@ -79,52 +141,53 @@ describe 'IntegrationTests' do
     it 'should create a new cha' do
 
       result = api_instance.account_create(CityPayApiClient::AccountCreate.new(
-          account_id: cha_id,
-          contact: CityPayApiClient::ContactDetails.new(
-              address1: "7 Esplanade",
-              area: "St Helier",
-              company: "CityPay Limited",
-              country: "JE",
-              email: "dev@citypay.com",
-              firstname: "Integration",
-              lastname: "Test",
-              postcode: "JE2 3QA"
-          )
+        account_id: cha_id,
+        contact: CityPayApiClient::ContactDetails.new(
+          address1: "7 Esplanade",
+          area: "St Helier",
+          company: "CityPay Limited",
+          country: "JE",
+          email: "dev@citypay.com",
+          firstname: "Integration",
+          lastname: "Test",
+          postcode: "JE2 3QA"
+        )
       ))
 
-      expect(result.account_id == cha_id)
-      expect(result.contact.address1 == "7 Esplanade")
+      expect(result.account_id).to eq(cha_id)
+      expect(result.contact.address1).to eq("7 Esplanade")
 
     end
 
     it 'should add a card to the account' do
       result = api_instance.account_card_register_request(cha_id, CityPayApiClient::RegisterCard.new(
-          cardnumber: "4000000000000002",
-          expmonth: 12,
-          expyear: 2030,
-      ))
-      expect(result.account_id == cha_id)
-      expect(result.cards.length == 1)
-      expect(result.cards[0].expmonth == 12)
-      expect(result.cards[0].expyear == 2030)
+        cardnumber: "4000000000000002",
+        expmonth: 12,
+        expyear: 2030,
+        ))
+      expect(result.account_id).to eq(cha_id)
+      expect(result.cards.length).to eq(1)
+      expect(result.cards[0].expmonth).to eq(12)
+      expect(result.cards[0].expyear).to eq(2030)
 
     end
 
     it 'should retrieve the account and charge against it' do
       result = api_instance.account_retrieve_request(cha_id)
-      expect(result.account_id == cha_id)
-      expect(result.contact.address1 == "7 Esplanade")
-      expect(result.cards.length == 1)
-      expect(result.cards[0].expmonth == 12)
-      expect(result.cards[0].expyear == 2030)
+      expect(result.account_id).to eq(cha_id)
+      expect(result.contact.address1).to eq("7 Esplanade")
+      expect(result.cards.length).to eq(1)
+      expect(result.cards[0].expmonth).to eq(12)
+      expect(result.cards[0].expyear).to eq(2030)
 
       uuid = SecureRandom.uuid
       result2 = api_instance.charge_request(CityPayApiClient::ChargeRequest.new(
-          amount: 7801,
-          csc: "012",
-          merchantid: merchant_id,
-          identifier: uuid,
-          token: result.cards[0].token
+        amount: 7801,
+        csc: "012",
+        merchantid: merchant_id,
+        identifier: uuid,
+        threedsecure: CityPayApiClient::ThreeDSecure.new(tds_policy: "2"),
+        token: result.cards[0].token
       ))
 
       # decision object returned
@@ -134,10 +197,10 @@ describe 'IntegrationTests' do
 
       response = result2.auth_response
 
-      expect(response.identifier == uuid.to_str)
-      expect(response.authcode == "A12345")
-      expect(response.amount == 1395)
-      expect(response.result_code == "001")
+      expect(response.identifier).to eq(uuid.to_str)
+      expect(response.authcode).to eq("A12345")
+      expect(response.amount).to eq(7801)
+      expect(response.result_code).to eq("001")
 
     end
 
@@ -145,10 +208,9 @@ describe 'IntegrationTests' do
     it 'should delete the cha' do
 
       result = api_instance.account_delete_request(cha_id)
-
+      expect(result.code).to eq("001")
     end
 
   end
 
-
-end
+end

data/spec/models/account_create_spec.rb

@@ -19,7 +19,6 @@ require 'date'
 describe 'AccountCreate' do
   before do
     # run before each test
-    @instance = CityPayApiClient::AccountCreate.new
   end
 
   after do
@@ -28,7 +27,7 @@ describe 'AccountCreate' do
 
   describe 'test an instance of AccountCreate' do
     it 'should create an instance of AccountCreate' do
-      expect(@instance).to be_instance_of(CityPayApiClient::AccountCreate)
+
     end
   end
   describe 'test attribute "account_id"' do

data/spec/models/account_status_spec.rb

@@ -19,7 +19,7 @@ require 'date'
 describe 'AccountStatus' do
   before do
     # run before each test
-    @instance = CityPayApiClient::AccountStatus.new
+
   end
 
   after do
@@ -28,7 +28,7 @@ describe 'AccountStatus' do
 
   describe 'test an instance of AccountStatus' do
     it 'should create an instance of AccountStatus' do
-      expect(@instance).to be_instance_of(CityPayApiClient::AccountStatus)
+
     end
   end
   describe 'test attribute "status"' do

data/spec/models/acknowledgement_spec.rb

@@ -19,7 +19,7 @@ require 'date'
 describe 'Acknowledgement' do
   before do
     # run before each test
-    json1 = '
+    json = '
     {
       "code": "000",
       "context": "1B12WmDZB3EYSbb",
@@ -28,17 +28,7 @@ describe 'Acknowledgement' do
     }
 '
 
-    json2 = '
-    { "Acknowledgement": {
-      "code": "000",
-      "context": "1B12WmDZB3EYSbb",
-      "identifier": "testIdentifier",
-      "message": "System: Accepted Transaction"
-    }}
-'
-
-    @instance1 = CityPayApiClient::ApiClient.new.convert_to_type(JSON.parse(json1, :symbolize_names => true), "Acknowledgement")
-    @instance2 = CityPayApiClient::ApiClient.new.convert_to_type(JSON.parse(json2, :symbolize_names => true), "Acknowledgement")
+    @instance = CityPayApiClient::ApiClient.new.convert_to_type(JSON.parse(json, :symbolize_names => true), "Acknowledgement")
   end
 
   after do
@@ -47,35 +37,30 @@ describe 'Acknowledgement' do
 
   describe 'test an instance of Acknowledgement' do
     it 'should create an instance of Acknowledgement' do
-      expect(@instance1).to be_instance_of(CityPayApiClient::Acknowledgement)
-      expect(@instance2).to be_instance_of(CityPayApiClient::Acknowledgement)
+      expect(@instance).to be_instance_of(CityPayApiClient::Acknowledgement)
     end
   end
   describe 'test attribute "code"' do
     it 'should work' do
-      expect(@instance1.code).to eq("000")
-      expect(@instance2.code).to eq("000")
+      expect(@instance.code).to eq("000")
     end
   end
 
   describe 'test attribute "context"' do
     it 'should work' do
-      expect(@instance1.context).to eq("1B12WmDZB3EYSbb")
-      expect(@instance2.context).to eq("1B12WmDZB3EYSbb")
+      expect(@instance.context).to eq("1B12WmDZB3EYSbb")
     end
   end
 
   describe 'test attribute "identifier"' do
     it 'should work' do
-      expect(@instance1.identifier).to eq("testIdentifier")
-      expect(@instance2.identifier).to eq("testIdentifier")
+      expect(@instance.identifier).to eq("testIdentifier")
     end
   end
 
   describe 'test attribute "message"' do
     it 'should work' do
-      expect(@instance1.message).to eq("System: Accepted Transaction")
-      expect(@instance2.message).to eq("System: Accepted Transaction")
+      expect(@instance.message).to eq("System: Accepted Transaction")
     end
   end
 

data/spec/models/acl_check_request_spec.rb

@@ -0,0 +1,33 @@
+=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. 
+
+Contact: support@citypay.com
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.3.0-SNAPSHOT
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for CityPayApiClient::AclCheckRequest
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe CityPayApiClient::AclCheckRequest do
+  let(:instance) { CityPayApiClient::AclCheckRequest.new }
+
+  describe 'test an instance of AclCheckRequest' do
+    it 'should create an instance of AclCheckRequest' do
+      expect(instance).to be_instance_of(CityPayApiClient::AclCheckRequest)
+    end
+  end
+  describe 'test attribute "ip"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end