velopayments 2.20.29.beta1 → 2.29.128.beta1

data/lib/velopayments/models/user_details_update_request.rb

@@ -3,14 +3,15 @@
 
 ### Terms and Definitions  Throughout this document and the Velo platform the following terms are used:  * **Payor.** An entity (typically a corporation) which wishes to pay funds to one or more payees via a payout. * **Payee.** The recipient of funds paid out by a payor. * **Payment.** A single transfer of funds from a payor to a payee. * **Payout.** A batch of Payments, typically used by a payor to logically group payments (e.g. by business day). Technically there need be no relationship between the payments in a payout - a single payout can contain payments to multiple payees and/or multiple payments to a single payee. * **Sandbox.** An integration environment provided by Velo Payments which offers a similar API experience to the production environment, but all funding and payment events are simulated, along with many other services such as OFAC sanctions list checking.  ## Overview  The Velo Payments API allows a payor to perform a number of operations. The following is a list of the main capabilities in a natural order of execution:  * Authenticate with the Velo platform * Maintain a collection of payees * Query the payor’s current balance of funds within the platform and perform additional funding * Issue payments to payees * Query the platform for a history of those payments  This document describes the main concepts and APIs required to get up and running with the Velo Payments platform. It is not an exhaustive API reference. For that, please see the separate Velo Payments API Reference.  ## API Considerations  The Velo Payments API is REST based and uses the JSON format for requests and responses.  Most calls are secured using OAuth 2 security and require a valid authentication access token for successful operation. See the Authentication section for details.  Where a dynamic value is required in the examples below, the {token} format is used, suggesting that the caller needs to supply the appropriate value of the token in question (without including the { or } characters).  Where curl examples are given, the –d @filename.json approach is used, indicating that the request body should be placed into a file named filename.json in the current directory. Each of the curl examples in this document should be considered a single line on the command-line, regardless of how they appear in print.  ## Authenticating with the Velo Platform  Once Velo backoffice staff have added your organization as a payor within the Velo platform sandbox, they will create you a payor Id, an API key and an API secret and share these with you in a secure manner.  You will need to use these values to authenticate with the Velo platform in order to gain access to the APIs. The steps to take are explained in the following:  create a string comprising the API key (e.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8) and API secret (e.g. c396b26b-137a-44fd-87f5-34631f8fd529) with a colon between them. E.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8:c396b26b-137a-44fd-87f5-34631f8fd529  base64 encode this string. E.g.: NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  create an HTTP **Authorization** header with the value set to e.g. Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  perform the Velo authentication REST call using the HTTP header created above e.g. via curl:  ```   curl -X POST \\   -H \"Content-Type: application/json\" \\   -H \"Authorization: Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==\" \\   'https://api.sandbox.velopayments.com/v1/authenticate?grant_type=client_credentials' ```  If successful, this call will result in a **200** HTTP status code and a response body such as:  ```   {     \"access_token\":\"19f6bafd-93fd-4747-b229-00507bbc991f\",     \"token_type\":\"bearer\",     \"expires_in\":1799,     \"scope\":\"...\"   } ``` ## API access following authentication Following successful authentication, the value of the access_token field in the response (indicated in green above) should then be presented with all subsequent API calls to allow the Velo platform to validate that the caller is authenticated.  This is achieved by setting the HTTP Authorization header with the value set to e.g. Bearer 19f6bafd-93fd-4747-b229-00507bbc991f such as the curl example below:  ```   -H \"Authorization: Bearer 19f6bafd-93fd-4747-b229-00507bbc991f \" ```  If you make other Velo API calls which require authorization but the Authorization header is missing or invalid then you will get a **401** HTTP status response. 
 
-The version of the OpenAPI document: 2.20.29
+The version of the OpenAPI document: 2.29.128
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'time'
 
 module VeloPayments
   # <p>All properties are optional</p> <p>Only provided properties will be updated</p> <p>Use null to null out a property that is allowed to be nullable</p> 
@@ -50,6 +51,11 @@ module VeloPayments
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -130,12 +136,12 @@ module VeloPayments
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !@primary_contact_number.nil? && @primary_contact_number !~ pattern
         invalid_properties.push("invalid value for \"primary_contact_number\", must conform to the pattern #{pattern}.")
       end
 
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !@secondary_contact_number.nil? && @secondary_contact_number !~ pattern
         invalid_properties.push("invalid value for \"secondary_contact_number\", must conform to the pattern #{pattern}.")
       end
@@ -156,7 +162,7 @@ module VeloPayments
         invalid_properties.push('invalid value for "last_name", the character length must be great than or equal to 1.')
       end
 
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !@sms_number.nil? && @sms_number !~ pattern
         invalid_properties.push("invalid value for \"sms_number\", must conform to the pattern #{pattern}.")
       end
@@ -175,13 +181,13 @@ module VeloPayments
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if !@primary_contact_number.nil? && @primary_contact_number !~ Regexp.new(/^\+?[1-9]\d{1,14}$/)
-      return false if !@secondary_contact_number.nil? && @secondary_contact_number !~ Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      return false if !@primary_contact_number.nil? && @primary_contact_number !~ Regexp.new(/^\+[1-9]\d{1,14}$/)
+      return false if !@secondary_contact_number.nil? && @secondary_contact_number !~ Regexp.new(/^\+[1-9]\d{1,14}$/)
       return false if !@first_name.nil? && @first_name.to_s.length > 128
       return false if !@first_name.nil? && @first_name.to_s.length < 1
       return false if !@last_name.nil? && @last_name.to_s.length > 128
       return false if !@last_name.nil? && @last_name.to_s.length < 1
-      return false if !@sms_number.nil? && @sms_number !~ Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      return false if !@sms_number.nil? && @sms_number !~ Regexp.new(/^\+[1-9]\d{1,14}$/)
       return false if !@verification_code.nil? && @verification_code.to_s.length > 6
       return false if !@verification_code.nil? && @verification_code.to_s.length < 6
       true
@@ -190,7 +196,7 @@ module VeloPayments
     # Custom attribute writer method with validation
     # @param [Object] primary_contact_number Value to be assigned
     def primary_contact_number=(primary_contact_number)
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !primary_contact_number.nil? && primary_contact_number !~ pattern
         fail ArgumentError, "invalid value for \"primary_contact_number\", must conform to the pattern #{pattern}."
       end
@@ -201,7 +207,7 @@ module VeloPayments
     # Custom attribute writer method with validation
     # @param [Object] secondary_contact_number Value to be assigned
     def secondary_contact_number=(secondary_contact_number)
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !secondary_contact_number.nil? && secondary_contact_number !~ pattern
         fail ArgumentError, "invalid value for \"secondary_contact_number\", must conform to the pattern #{pattern}."
       end
@@ -240,7 +246,7 @@ module VeloPayments
     # Custom attribute writer method with validation
     # @param [Object] sms_number Value to be assigned
     def sms_number=(sms_number)
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !sms_number.nil? && sms_number !~ pattern
         fail ArgumentError, "invalid value for \"sms_number\", must conform to the pattern #{pattern}."
       end
@@ -302,7 +308,9 @@ module VeloPayments
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -310,7 +318,7 @@ module VeloPayments
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -322,8 +330,8 @@ module VeloPayments
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -353,7 +361,9 @@ module VeloPayments
           end
         end
       else # model
-        VeloPayments.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = VeloPayments.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -379,7 +389,7 @@ module VeloPayments
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -402,5 +412,7 @@ module VeloPayments
         value
       end
     end
+
   end
+
 end

data/lib/velopayments/models/user_info.rb

@@ -3,14 +3,15 @@
 
 ### Terms and Definitions  Throughout this document and the Velo platform the following terms are used:  * **Payor.** An entity (typically a corporation) which wishes to pay funds to one or more payees via a payout. * **Payee.** The recipient of funds paid out by a payor. * **Payment.** A single transfer of funds from a payor to a payee. * **Payout.** A batch of Payments, typically used by a payor to logically group payments (e.g. by business day). Technically there need be no relationship between the payments in a payout - a single payout can contain payments to multiple payees and/or multiple payments to a single payee. * **Sandbox.** An integration environment provided by Velo Payments which offers a similar API experience to the production environment, but all funding and payment events are simulated, along with many other services such as OFAC sanctions list checking.  ## Overview  The Velo Payments API allows a payor to perform a number of operations. The following is a list of the main capabilities in a natural order of execution:  * Authenticate with the Velo platform * Maintain a collection of payees * Query the payor’s current balance of funds within the platform and perform additional funding * Issue payments to payees * Query the platform for a history of those payments  This document describes the main concepts and APIs required to get up and running with the Velo Payments platform. It is not an exhaustive API reference. For that, please see the separate Velo Payments API Reference.  ## API Considerations  The Velo Payments API is REST based and uses the JSON format for requests and responses.  Most calls are secured using OAuth 2 security and require a valid authentication access token for successful operation. See the Authentication section for details.  Where a dynamic value is required in the examples below, the {token} format is used, suggesting that the caller needs to supply the appropriate value of the token in question (without including the { or } characters).  Where curl examples are given, the –d @filename.json approach is used, indicating that the request body should be placed into a file named filename.json in the current directory. Each of the curl examples in this document should be considered a single line on the command-line, regardless of how they appear in print.  ## Authenticating with the Velo Platform  Once Velo backoffice staff have added your organization as a payor within the Velo platform sandbox, they will create you a payor Id, an API key and an API secret and share these with you in a secure manner.  You will need to use these values to authenticate with the Velo platform in order to gain access to the APIs. The steps to take are explained in the following:  create a string comprising the API key (e.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8) and API secret (e.g. c396b26b-137a-44fd-87f5-34631f8fd529) with a colon between them. E.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8:c396b26b-137a-44fd-87f5-34631f8fd529  base64 encode this string. E.g.: NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  create an HTTP **Authorization** header with the value set to e.g. Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  perform the Velo authentication REST call using the HTTP header created above e.g. via curl:  ```   curl -X POST \\   -H \"Content-Type: application/json\" \\   -H \"Authorization: Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==\" \\   'https://api.sandbox.velopayments.com/v1/authenticate?grant_type=client_credentials' ```  If successful, this call will result in a **200** HTTP status code and a response body such as:  ```   {     \"access_token\":\"19f6bafd-93fd-4747-b229-00507bbc991f\",     \"token_type\":\"bearer\",     \"expires_in\":1799,     \"scope\":\"...\"   } ``` ## API access following authentication Following successful authentication, the value of the access_token field in the response (indicated in green above) should then be presented with all subsequent API calls to allow the Velo platform to validate that the caller is authenticated.  This is achieved by setting the HTTP Authorization header with the value set to e.g. Bearer 19f6bafd-93fd-4747-b229-00507bbc991f such as the curl example below:  ```   -H \"Authorization: Bearer 19f6bafd-93fd-4747-b229-00507bbc991f \" ```  If you make other Velo API calls which require authorization but the Authorization header is missing or invalid then you will get a **401** HTTP status response. 
 
-The version of the OpenAPI document: 2.20.29
+The version of the OpenAPI document: 2.29.128
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'time'
 
 module VeloPayments
   class UserInfo
@@ -30,6 +31,11 @@ module VeloPayments
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -121,7 +127,9 @@ module VeloPayments
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -129,7 +137,7 @@ module VeloPayments
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -141,8 +149,8 @@ module VeloPayments
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -172,7 +180,9 @@ module VeloPayments
           end
         end
       else # model
-        VeloPayments.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = VeloPayments.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -198,7 +208,7 @@ module VeloPayments
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -221,5 +231,7 @@ module VeloPayments
         value
       end
     end
+
   end
+
 end

data/lib/velopayments/models/user_response.rb

@@ -3,14 +3,15 @@
 
 ### Terms and Definitions  Throughout this document and the Velo platform the following terms are used:  * **Payor.** An entity (typically a corporation) which wishes to pay funds to one or more payees via a payout. * **Payee.** The recipient of funds paid out by a payor. * **Payment.** A single transfer of funds from a payor to a payee. * **Payout.** A batch of Payments, typically used by a payor to logically group payments (e.g. by business day). Technically there need be no relationship between the payments in a payout - a single payout can contain payments to multiple payees and/or multiple payments to a single payee. * **Sandbox.** An integration environment provided by Velo Payments which offers a similar API experience to the production environment, but all funding and payment events are simulated, along with many other services such as OFAC sanctions list checking.  ## Overview  The Velo Payments API allows a payor to perform a number of operations. The following is a list of the main capabilities in a natural order of execution:  * Authenticate with the Velo platform * Maintain a collection of payees * Query the payor’s current balance of funds within the platform and perform additional funding * Issue payments to payees * Query the platform for a history of those payments  This document describes the main concepts and APIs required to get up and running with the Velo Payments platform. It is not an exhaustive API reference. For that, please see the separate Velo Payments API Reference.  ## API Considerations  The Velo Payments API is REST based and uses the JSON format for requests and responses.  Most calls are secured using OAuth 2 security and require a valid authentication access token for successful operation. See the Authentication section for details.  Where a dynamic value is required in the examples below, the {token} format is used, suggesting that the caller needs to supply the appropriate value of the token in question (without including the { or } characters).  Where curl examples are given, the –d @filename.json approach is used, indicating that the request body should be placed into a file named filename.json in the current directory. Each of the curl examples in this document should be considered a single line on the command-line, regardless of how they appear in print.  ## Authenticating with the Velo Platform  Once Velo backoffice staff have added your organization as a payor within the Velo platform sandbox, they will create you a payor Id, an API key and an API secret and share these with you in a secure manner.  You will need to use these values to authenticate with the Velo platform in order to gain access to the APIs. The steps to take are explained in the following:  create a string comprising the API key (e.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8) and API secret (e.g. c396b26b-137a-44fd-87f5-34631f8fd529) with a colon between them. E.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8:c396b26b-137a-44fd-87f5-34631f8fd529  base64 encode this string. E.g.: NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  create an HTTP **Authorization** header with the value set to e.g. Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  perform the Velo authentication REST call using the HTTP header created above e.g. via curl:  ```   curl -X POST \\   -H \"Content-Type: application/json\" \\   -H \"Authorization: Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==\" \\   'https://api.sandbox.velopayments.com/v1/authenticate?grant_type=client_credentials' ```  If successful, this call will result in a **200** HTTP status code and a response body such as:  ```   {     \"access_token\":\"19f6bafd-93fd-4747-b229-00507bbc991f\",     \"token_type\":\"bearer\",     \"expires_in\":1799,     \"scope\":\"...\"   } ``` ## API access following authentication Following successful authentication, the value of the access_token field in the response (indicated in green above) should then be presented with all subsequent API calls to allow the Velo platform to validate that the caller is authenticated.  This is achieved by setting the HTTP Authorization header with the value set to e.g. Bearer 19f6bafd-93fd-4747-b229-00507bbc991f such as the curl example below:  ```   -H \"Authorization: Bearer 19f6bafd-93fd-4747-b229-00507bbc991f \" ```  If you make other Velo API calls which require authorization but the Authorization header is missing or invalid then you will get a **401** HTTP status response. 
 
-The version of the OpenAPI document: 2.20.29
+The version of the OpenAPI document: 2.29.128
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'time'
 
 module VeloPayments
   class UserResponse
@@ -39,9 +40,15 @@ module VeloPayments
     # The payorId or payeeId or null if the user is not a payor or payee user 
     attr_accessor :entity_id
 
+    # The payor or payee company name or null if the user is not a payor or payee user 
+    attr_accessor :company_name
+
     # The role(s) for the user 
     attr_accessor :roles
 
+    # Indicates the type of user. Could be BACKOFFICE, PAYOR or PAYEE.
+    attr_accessor :user_type
+
     # The type of the MFA device
     attr_accessor :mfa_type
 
@@ -88,7 +95,9 @@ module VeloPayments
         :'first_name' => :'firstName',
         :'last_name' => :'lastName',
         :'entity_id' => :'entityId',
+        :'company_name' => :'companyName',
         :'roles' => :'roles',
+        :'user_type' => :'userType',
         :'mfa_type' => :'mfaType',
         :'mfa_status' => :'mfaStatus',
         :'locked_out' => :'lockedOut',
@@ -96,6 +105,11 @@ module VeloPayments
       }
     end
 
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -108,11 +122,13 @@ module VeloPayments
         :'first_name' => :'String',
         :'last_name' => :'String',
         :'entity_id' => :'String',
+        :'company_name' => :'String',
         :'roles' => :'Array<Role>',
+        :'user_type' => :'String',
         :'mfa_type' => :'String',
         :'mfa_status' => :'String',
         :'locked_out' => :'Boolean',
-        :'locked_out_timestamp' => :'DateTime'
+        :'locked_out_timestamp' => :'Time'
       }
     end
 
@@ -174,12 +190,20 @@ module VeloPayments
         self.entity_id = attributes[:'entity_id']
       end
 
+      if attributes.key?(:'company_name')
+        self.company_name = attributes[:'company_name']
+      end
+
       if attributes.key?(:'roles')
         if (value = attributes[:'roles']).is_a?(Array)
           self.roles = value
         end
       end
 
+      if attributes.key?(:'user_type')
+        self.user_type = attributes[:'user_type']
+      end
+
       if attributes.key?(:'mfa_type')
         self.mfa_type = attributes[:'mfa_type']
       end
@@ -201,17 +225,17 @@ module VeloPayments
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !@sms_number.nil? && @sms_number !~ pattern
         invalid_properties.push("invalid value for \"sms_number\", must conform to the pattern #{pattern}.")
       end
 
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !@primary_contact_number.nil? && @primary_contact_number !~ pattern
         invalid_properties.push("invalid value for \"primary_contact_number\", must conform to the pattern #{pattern}.")
       end
 
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !@secondary_contact_number.nil? && @secondary_contact_number !~ pattern
         invalid_properties.push("invalid value for \"secondary_contact_number\", must conform to the pattern #{pattern}.")
       end
@@ -232,6 +256,18 @@ module VeloPayments
         invalid_properties.push('invalid value for "last_name", the character length must be great than or equal to 1.')
       end
 
+      if !@company_name.nil? && @company_name.to_s.length > 128
+        invalid_properties.push('invalid value for "company_name", the character length must be smaller than or equal to 128.')
+      end
+
+      if !@company_name.nil? && @company_name.to_s.length < 1
+        invalid_properties.push('invalid value for "company_name", the character length must be great than or equal to 1.')
+      end
+
+      if !@roles.nil? && @roles.length < 1
+        invalid_properties.push('invalid value for "roles", number of items must be greater than or equal to 1.')
+      end
+
       invalid_properties
     end
 
@@ -240,13 +276,18 @@ module VeloPayments
     def valid?
       status_validator = EnumAttributeValidator.new('String', ["ENABLED", "DISABLED", "PENDING"])
       return false unless status_validator.valid?(@status)
-      return false if !@sms_number.nil? && @sms_number !~ Regexp.new(/^\+?[1-9]\d{1,14}$/)
-      return false if !@primary_contact_number.nil? && @primary_contact_number !~ Regexp.new(/^\+?[1-9]\d{1,14}$/)
-      return false if !@secondary_contact_number.nil? && @secondary_contact_number !~ Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      return false if !@sms_number.nil? && @sms_number !~ Regexp.new(/^\+[1-9]\d{1,14}$/)
+      return false if !@primary_contact_number.nil? && @primary_contact_number !~ Regexp.new(/^\+[1-9]\d{1,14}$/)
+      return false if !@secondary_contact_number.nil? && @secondary_contact_number !~ Regexp.new(/^\+[1-9]\d{1,14}$/)
       return false if !@first_name.nil? && @first_name.to_s.length > 128
       return false if !@first_name.nil? && @first_name.to_s.length < 1
       return false if !@last_name.nil? && @last_name.to_s.length > 128
       return false if !@last_name.nil? && @last_name.to_s.length < 1
+      return false if !@company_name.nil? && @company_name.to_s.length > 128
+      return false if !@company_name.nil? && @company_name.to_s.length < 1
+      return false if !@roles.nil? && @roles.length < 1
+      user_type_validator = EnumAttributeValidator.new('String', ["BACKOFFICE", "PAYOR", "PAYEE"])
+      return false unless user_type_validator.valid?(@user_type)
       mfa_type_validator = EnumAttributeValidator.new('String', ["SMS", "YUBIKEY", "TOTP"])
       return false unless mfa_type_validator.valid?(@mfa_type)
       mfa_status_validator = EnumAttributeValidator.new('String', ["REGISTERED", "UNREGISTERED"])
@@ -267,7 +308,7 @@ module VeloPayments
     # Custom attribute writer method with validation
     # @param [Object] sms_number Value to be assigned
     def sms_number=(sms_number)
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !sms_number.nil? && sms_number !~ pattern
         fail ArgumentError, "invalid value for \"sms_number\", must conform to the pattern #{pattern}."
       end
@@ -278,7 +319,7 @@ module VeloPayments
     # Custom attribute writer method with validation
     # @param [Object] primary_contact_number Value to be assigned
     def primary_contact_number=(primary_contact_number)
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !primary_contact_number.nil? && primary_contact_number !~ pattern
         fail ArgumentError, "invalid value for \"primary_contact_number\", must conform to the pattern #{pattern}."
       end
@@ -289,7 +330,7 @@ module VeloPayments
     # Custom attribute writer method with validation
     # @param [Object] secondary_contact_number Value to be assigned
     def secondary_contact_number=(secondary_contact_number)
-      pattern = Regexp.new(/^\+?[1-9]\d{1,14}$/)
+      pattern = Regexp.new(/^\+[1-9]\d{1,14}$/)
       if !secondary_contact_number.nil? && secondary_contact_number !~ pattern
         fail ArgumentError, "invalid value for \"secondary_contact_number\", must conform to the pattern #{pattern}."
       end
@@ -325,6 +366,40 @@ module VeloPayments
       @last_name = last_name
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] company_name Value to be assigned
+    def company_name=(company_name)
+      if !company_name.nil? && company_name.to_s.length > 128
+        fail ArgumentError, 'invalid value for "company_name", the character length must be smaller than or equal to 128.'
+      end
+
+      if !company_name.nil? && company_name.to_s.length < 1
+        fail ArgumentError, 'invalid value for "company_name", the character length must be great than or equal to 1.'
+      end
+
+      @company_name = company_name
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] roles Value to be assigned
+    def roles=(roles)
+      if !roles.nil? && roles.length < 1
+        fail ArgumentError, 'invalid value for "roles", number of items must be greater than or equal to 1.'
+      end
+
+      @roles = roles
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] user_type Object to be assigned
+    def user_type=(user_type)
+      validator = EnumAttributeValidator.new('String', ["BACKOFFICE", "PAYOR", "PAYEE"])
+      unless validator.valid?(user_type)
+        fail ArgumentError, "invalid value for \"user_type\", must be one of #{validator.allowable_values}."
+      end
+      @user_type = user_type
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] mfa_type Object to be assigned
     def mfa_type=(mfa_type)
@@ -359,7 +434,9 @@ module VeloPayments
           first_name == o.first_name &&
           last_name == o.last_name &&
           entity_id == o.entity_id &&
+          company_name == o.company_name &&
           roles == o.roles &&
+          user_type == o.user_type &&
           mfa_type == o.mfa_type &&
           mfa_status == o.mfa_status &&
           locked_out == o.locked_out &&
@@ -375,7 +452,7 @@ module VeloPayments
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, status, email, sms_number, primary_contact_number, secondary_contact_number, first_name, last_name, entity_id, roles, mfa_type, mfa_status, locked_out, locked_out_timestamp].hash
+      [id, status, email, sms_number, primary_contact_number, secondary_contact_number, first_name, last_name, entity_id, company_name, roles, user_type, mfa_type, mfa_status, locked_out, locked_out_timestamp].hash
     end
 
     # Builds the object from hash
@@ -391,7 +468,9 @@ module VeloPayments
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
@@ -399,7 +478,7 @@ module VeloPayments
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -411,8 +490,8 @@ module VeloPayments
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -442,7 +521,9 @@ module VeloPayments
           end
         end
       else # model
-        VeloPayments.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = VeloPayments.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -468,7 +549,7 @@ module VeloPayments
           is_nullable = self.class.openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
-        
+
         hash[param] = _to_hash(value)
       end
       hash
@@ -491,5 +572,7 @@ module VeloPayments
         value
       end
     end
+
   end
+
 end

data/lib/velopayments/models/user_status.rb

@@ -3,14 +3,15 @@
 
 ### Terms and Definitions  Throughout this document and the Velo platform the following terms are used:  * **Payor.** An entity (typically a corporation) which wishes to pay funds to one or more payees via a payout. * **Payee.** The recipient of funds paid out by a payor. * **Payment.** A single transfer of funds from a payor to a payee. * **Payout.** A batch of Payments, typically used by a payor to logically group payments (e.g. by business day). Technically there need be no relationship between the payments in a payout - a single payout can contain payments to multiple payees and/or multiple payments to a single payee. * **Sandbox.** An integration environment provided by Velo Payments which offers a similar API experience to the production environment, but all funding and payment events are simulated, along with many other services such as OFAC sanctions list checking.  ## Overview  The Velo Payments API allows a payor to perform a number of operations. The following is a list of the main capabilities in a natural order of execution:  * Authenticate with the Velo platform * Maintain a collection of payees * Query the payor’s current balance of funds within the platform and perform additional funding * Issue payments to payees * Query the platform for a history of those payments  This document describes the main concepts and APIs required to get up and running with the Velo Payments platform. It is not an exhaustive API reference. For that, please see the separate Velo Payments API Reference.  ## API Considerations  The Velo Payments API is REST based and uses the JSON format for requests and responses.  Most calls are secured using OAuth 2 security and require a valid authentication access token for successful operation. See the Authentication section for details.  Where a dynamic value is required in the examples below, the {token} format is used, suggesting that the caller needs to supply the appropriate value of the token in question (without including the { or } characters).  Where curl examples are given, the –d @filename.json approach is used, indicating that the request body should be placed into a file named filename.json in the current directory. Each of the curl examples in this document should be considered a single line on the command-line, regardless of how they appear in print.  ## Authenticating with the Velo Platform  Once Velo backoffice staff have added your organization as a payor within the Velo platform sandbox, they will create you a payor Id, an API key and an API secret and share these with you in a secure manner.  You will need to use these values to authenticate with the Velo platform in order to gain access to the APIs. The steps to take are explained in the following:  create a string comprising the API key (e.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8) and API secret (e.g. c396b26b-137a-44fd-87f5-34631f8fd529) with a colon between them. E.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8:c396b26b-137a-44fd-87f5-34631f8fd529  base64 encode this string. E.g.: NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  create an HTTP **Authorization** header with the value set to e.g. Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  perform the Velo authentication REST call using the HTTP header created above e.g. via curl:  ```   curl -X POST \\   -H \"Content-Type: application/json\" \\   -H \"Authorization: Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==\" \\   'https://api.sandbox.velopayments.com/v1/authenticate?grant_type=client_credentials' ```  If successful, this call will result in a **200** HTTP status code and a response body such as:  ```   {     \"access_token\":\"19f6bafd-93fd-4747-b229-00507bbc991f\",     \"token_type\":\"bearer\",     \"expires_in\":1799,     \"scope\":\"...\"   } ``` ## API access following authentication Following successful authentication, the value of the access_token field in the response (indicated in green above) should then be presented with all subsequent API calls to allow the Velo platform to validate that the caller is authenticated.  This is achieved by setting the HTTP Authorization header with the value set to e.g. Bearer 19f6bafd-93fd-4747-b229-00507bbc991f such as the curl example below:  ```   -H \"Authorization: Bearer 19f6bafd-93fd-4747-b229-00507bbc991f \" ```  If you make other Velo API calls which require authorization but the Authorization header is missing or invalid then you will get a **401** HTTP status response. 
 
-The version of the OpenAPI document: 2.20.29
+The version of the OpenAPI document: 2.29.128
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'time'
 
 module VeloPayments
   class UserStatus

data/lib/velopayments/models/user_type.rb

@@ -3,14 +3,15 @@
 
 ### Terms and Definitions  Throughout this document and the Velo platform the following terms are used:  * **Payor.** An entity (typically a corporation) which wishes to pay funds to one or more payees via a payout. * **Payee.** The recipient of funds paid out by a payor. * **Payment.** A single transfer of funds from a payor to a payee. * **Payout.** A batch of Payments, typically used by a payor to logically group payments (e.g. by business day). Technically there need be no relationship between the payments in a payout - a single payout can contain payments to multiple payees and/or multiple payments to a single payee. * **Sandbox.** An integration environment provided by Velo Payments which offers a similar API experience to the production environment, but all funding and payment events are simulated, along with many other services such as OFAC sanctions list checking.  ## Overview  The Velo Payments API allows a payor to perform a number of operations. The following is a list of the main capabilities in a natural order of execution:  * Authenticate with the Velo platform * Maintain a collection of payees * Query the payor’s current balance of funds within the platform and perform additional funding * Issue payments to payees * Query the platform for a history of those payments  This document describes the main concepts and APIs required to get up and running with the Velo Payments platform. It is not an exhaustive API reference. For that, please see the separate Velo Payments API Reference.  ## API Considerations  The Velo Payments API is REST based and uses the JSON format for requests and responses.  Most calls are secured using OAuth 2 security and require a valid authentication access token for successful operation. See the Authentication section for details.  Where a dynamic value is required in the examples below, the {token} format is used, suggesting that the caller needs to supply the appropriate value of the token in question (without including the { or } characters).  Where curl examples are given, the –d @filename.json approach is used, indicating that the request body should be placed into a file named filename.json in the current directory. Each of the curl examples in this document should be considered a single line on the command-line, regardless of how they appear in print.  ## Authenticating with the Velo Platform  Once Velo backoffice staff have added your organization as a payor within the Velo platform sandbox, they will create you a payor Id, an API key and an API secret and share these with you in a secure manner.  You will need to use these values to authenticate with the Velo platform in order to gain access to the APIs. The steps to take are explained in the following:  create a string comprising the API key (e.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8) and API secret (e.g. c396b26b-137a-44fd-87f5-34631f8fd529) with a colon between them. E.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8:c396b26b-137a-44fd-87f5-34631f8fd529  base64 encode this string. E.g.: NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  create an HTTP **Authorization** header with the value set to e.g. Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  perform the Velo authentication REST call using the HTTP header created above e.g. via curl:  ```   curl -X POST \\   -H \"Content-Type: application/json\" \\   -H \"Authorization: Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==\" \\   'https://api.sandbox.velopayments.com/v1/authenticate?grant_type=client_credentials' ```  If successful, this call will result in a **200** HTTP status code and a response body such as:  ```   {     \"access_token\":\"19f6bafd-93fd-4747-b229-00507bbc991f\",     \"token_type\":\"bearer\",     \"expires_in\":1799,     \"scope\":\"...\"   } ``` ## API access following authentication Following successful authentication, the value of the access_token field in the response (indicated in green above) should then be presented with all subsequent API calls to allow the Velo platform to validate that the caller is authenticated.  This is achieved by setting the HTTP Authorization header with the value set to e.g. Bearer 19f6bafd-93fd-4747-b229-00507bbc991f such as the curl example below:  ```   -H \"Authorization: Bearer 19f6bafd-93fd-4747-b229-00507bbc991f \" ```  If you make other Velo API calls which require authorization but the Authorization header is missing or invalid then you will get a **401** HTTP status response. 
 
-The version of the OpenAPI document: 2.20.29
+The version of the OpenAPI document: 2.29.128
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'time'
 
 module VeloPayments
   class UserType

data/lib/velopayments/models/user_type2.rb

@@ -3,14 +3,15 @@
 
 ### Terms and Definitions  Throughout this document and the Velo platform the following terms are used:  * **Payor.** An entity (typically a corporation) which wishes to pay funds to one or more payees via a payout. * **Payee.** The recipient of funds paid out by a payor. * **Payment.** A single transfer of funds from a payor to a payee. * **Payout.** A batch of Payments, typically used by a payor to logically group payments (e.g. by business day). Technically there need be no relationship between the payments in a payout - a single payout can contain payments to multiple payees and/or multiple payments to a single payee. * **Sandbox.** An integration environment provided by Velo Payments which offers a similar API experience to the production environment, but all funding and payment events are simulated, along with many other services such as OFAC sanctions list checking.  ## Overview  The Velo Payments API allows a payor to perform a number of operations. The following is a list of the main capabilities in a natural order of execution:  * Authenticate with the Velo platform * Maintain a collection of payees * Query the payor’s current balance of funds within the platform and perform additional funding * Issue payments to payees * Query the platform for a history of those payments  This document describes the main concepts and APIs required to get up and running with the Velo Payments platform. It is not an exhaustive API reference. For that, please see the separate Velo Payments API Reference.  ## API Considerations  The Velo Payments API is REST based and uses the JSON format for requests and responses.  Most calls are secured using OAuth 2 security and require a valid authentication access token for successful operation. See the Authentication section for details.  Where a dynamic value is required in the examples below, the {token} format is used, suggesting that the caller needs to supply the appropriate value of the token in question (without including the { or } characters).  Where curl examples are given, the –d @filename.json approach is used, indicating that the request body should be placed into a file named filename.json in the current directory. Each of the curl examples in this document should be considered a single line on the command-line, regardless of how they appear in print.  ## Authenticating with the Velo Platform  Once Velo backoffice staff have added your organization as a payor within the Velo platform sandbox, they will create you a payor Id, an API key and an API secret and share these with you in a secure manner.  You will need to use these values to authenticate with the Velo platform in order to gain access to the APIs. The steps to take are explained in the following:  create a string comprising the API key (e.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8) and API secret (e.g. c396b26b-137a-44fd-87f5-34631f8fd529) with a colon between them. E.g. 44a9537d-d55d-4b47-8082-14061c2bcdd8:c396b26b-137a-44fd-87f5-34631f8fd529  base64 encode this string. E.g.: NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  create an HTTP **Authorization** header with the value set to e.g. Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==  perform the Velo authentication REST call using the HTTP header created above e.g. via curl:  ```   curl -X POST \\   -H \"Content-Type: application/json\" \\   -H \"Authorization: Basic NDRhOTUzN2QtZDU1ZC00YjQ3LTgwODItMTQwNjFjMmJjZGQ4OmMzOTZiMjZiLTEzN2EtNDRmZC04N2Y1LTM0NjMxZjhmZDUyOQ==\" \\   'https://api.sandbox.velopayments.com/v1/authenticate?grant_type=client_credentials' ```  If successful, this call will result in a **200** HTTP status code and a response body such as:  ```   {     \"access_token\":\"19f6bafd-93fd-4747-b229-00507bbc991f\",     \"token_type\":\"bearer\",     \"expires_in\":1799,     \"scope\":\"...\"   } ``` ## API access following authentication Following successful authentication, the value of the access_token field in the response (indicated in green above) should then be presented with all subsequent API calls to allow the Velo platform to validate that the caller is authenticated.  This is achieved by setting the HTTP Authorization header with the value set to e.g. Bearer 19f6bafd-93fd-4747-b229-00507bbc991f such as the curl example below:  ```   -H \"Authorization: Bearer 19f6bafd-93fd-4747-b229-00507bbc991f \" ```  If you make other Velo API calls which require authorization but the Authorization header is missing or invalid then you will get a **401** HTTP status response. 
 
-The version of the OpenAPI document: 2.20.29
+The version of the OpenAPI document: 2.29.128
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.0-SNAPSHOT
+OpenAPI Generator version: 6.0.0-SNAPSHOT
 
 =end
 
 require 'date'
+require 'time'
 
 module VeloPayments
   class UserType2