cybersource_rest_client 0.0.30 → 0.0.34

data/lib/cybersource_rest_client/api/payments_api.rb

@@ -21,7 +21,7 @@ module CyberSource
 	  @api_client.set_configuration(config)
     end
     # Process a Payment
-    # A payment authorizes the amount for the transaction. There are a number of supported payment feature, such as E-commerce and Card Present - Credit Card/Debit Card, Echeck, e-Wallets, Level II/III Data, etc..  A payment response includes the status of the request. It also includes processor-specific information when the request is successful and errors if unsuccessful. See the [Payments Developer Guides Page](https://developer.cybersource.com/api/developer-guides/dita-payments/GettingStarted.html).  Authorization can be requested with Capture, Decision Manager, Payer Authentication(3ds), and Token Creation. Find more on [Authorization with Add-On Features page.] (https://developer.cybersource.com/api/authorization-add-ons.html)  Possible [RESPONSE CODES](https://developer.cybersource.com/api/reference/response-codes.html) .  Processor specific [Testing Triggers](https://developer.cybersource.com/hello-world/testing-guide.html). 
+    # A payment authorizes the amount for the transaction. There are a number of supported payment feature, such as E-commerce and Card Present - Credit Card/Debit Card, Echeck, e-Wallets, Level II/III Data, etc..  A payment response includes the status of the request. It also includes processor-specific information when the request is successful and errors if unsuccessful. See the [Payments Developer Guides Page](https://developer.cybersource.com/api/developer-guides/dita-payments/GettingStarted.html).  Authorization can be requested with Capture, Decision Manager, Payer Authentication(3ds), and Token Creation. Find more on [Authorization with Add-On Features page.](https://developer.cybersource.com/api/authorization-add-ons.html) 
     # @param create_payment_request 
     # @param [Hash] opts the optional parameters
     # @return [PtsV2PaymentsPost201Response]
@@ -31,7 +31,7 @@ module CyberSource
     end
 
     # Process a Payment
-    # A payment authorizes the amount for the transaction. There are a number of supported payment feature, such as E-commerce and Card Present - Credit Card/Debit Card, Echeck, e-Wallets, Level II/III Data, etc..  A payment response includes the status of the request. It also includes processor-specific information when the request is successful and errors if unsuccessful. See the [Payments Developer Guides Page](https://developer.cybersource.com/api/developer-guides/dita-payments/GettingStarted.html).  Authorization can be requested with Capture, Decision Manager, Payer Authentication(3ds), and Token Creation. Find more on [Authorization with Add-On Features page.] (https://developer.cybersource.com/api/authorization-add-ons.html)  Possible [RESPONSE CODES](https://developer.cybersource.com/api/reference/response-codes.html) .  Processor specific [Testing Triggers](https://developer.cybersource.com/hello-world/testing-guide.html). 
+    # A payment authorizes the amount for the transaction. There are a number of supported payment feature, such as E-commerce and Card Present - Credit Card/Debit Card, Echeck, e-Wallets, Level II/III Data, etc..  A payment response includes the status of the request. It also includes processor-specific information when the request is successful and errors if unsuccessful. See the [Payments Developer Guides Page](https://developer.cybersource.com/api/developer-guides/dita-payments/GettingStarted.html).  Authorization can be requested with Capture, Decision Manager, Payer Authentication(3ds), and Token Creation. Find more on [Authorization with Add-On Features page.](https://developer.cybersource.com/api/authorization-add-ons.html) 
     # @param create_payment_request 
     # @param [Hash] opts the optional parameters
     # @return [Array<(PtsV2PaymentsPost201Response, Fixnum, Hash)>] PtsV2PaymentsPost201Response data, response status code and response headers

data/lib/cybersource_rest_client/api/refund_api.rb

@@ -21,7 +21,7 @@ module CyberSource
 	  @api_client.set_configuration(config)
     end
     # Refund a Capture
-    # Refund a capture API is only used, if you have requested Capture independenlty using [/pts/v2/payments/{id}/captures](https://developer.cybersource.com/api-reference-assets/index.html#payments_capture) API call Include the capture ID in the POST request to refund the captured amount. 
+    # Refund a capture API is only used, if you have requested Capture independenlty using [/pts/v2/payments/{id}/captures](https://developer.cybersource.com/api-reference-assets/index.html#payments_capture) API call. Include the capture ID in the POST request to refund the captured amount. 
     # @param refund_capture_request 
     # @param id The capture ID. This ID is returned from a previous capture request.
     # @param [Hash] opts the optional parameters
@@ -32,7 +32,7 @@ module CyberSource
     end
 
     # Refund a Capture
-    # Refund a capture API is only used, if you have requested Capture independenlty using [/pts/v2/payments/{id}/captures](https://developer.cybersource.com/api-reference-assets/index.html#payments_capture) API call Include the capture ID in the POST request to refund the captured amount. 
+    # Refund a capture API is only used, if you have requested Capture independenlty using [/pts/v2/payments/{id}/captures](https://developer.cybersource.com/api-reference-assets/index.html#payments_capture) API call. Include the capture ID in the POST request to refund the captured amount. 
     # @param refund_capture_request 
     # @param id The capture ID. This ID is returned from a previous capture request.
     # @param [Hash] opts the optional parameters
@@ -92,7 +92,7 @@ module CyberSource
       return data, status_code, headers
     end
     # Refund a Payment
-    # Refund a Payment API is only used, if you have requested Authorization and Capture together in [/pts/v2/payments](https://developer.cybersource.com/api-reference-assets/index.html#payments_payments) API call.  Include the payment ID in the POST request to refund the payment amount. 
+    # Refund a Payment API is only used, if you have requested Authorization and Capture together in [/pts/v2/payments](https://developer.cybersource.com/api-reference-assets/index.html#payments_payments) API call. Include the payment ID in the POST request to refund the payment amount. 
     # @param refund_payment_request 
     # @param id The payment ID. This ID is returned from a previous payment request.
     # @param [Hash] opts the optional parameters
@@ -103,7 +103,7 @@ module CyberSource
     end
 
     # Refund a Payment
-    # Refund a Payment API is only used, if you have requested Authorization and Capture together in [/pts/v2/payments](https://developer.cybersource.com/api-reference-assets/index.html#payments_payments) API call.  Include the payment ID in the POST request to refund the payment amount. 
+    # Refund a Payment API is only used, if you have requested Authorization and Capture together in [/pts/v2/payments](https://developer.cybersource.com/api-reference-assets/index.html#payments_payments) API call. Include the payment ID in the POST request to refund the payment amount. 
     # @param refund_payment_request 
     # @param id The payment ID. This ID is returned from a previous payment request.
     # @param [Hash] opts the optional parameters

data/lib/cybersource_rest_client/api/void_api.rb

@@ -86,7 +86,7 @@ module CyberSource
       return data, status_code, headers
     end
     # Void a Capture
-    # Refund a capture API is only used, if you have requested Capture independenlty using [/pts/v2/payments/{id}/captures](https://developer.cybersource.com/api-reference-assets/index.html#payments_capture) API call.  Include the capture ID in the POST request to cancel the capture. 
+    # Refund a capture API is only used, if you have requested Capture independenlty using [/pts/v2/payments/{id}/captures](https://developer.cybersource.com/api-reference-assets/index.html#payments_capture) API call. Include the capture ID in the POST request to cancel the capture. 
     # @param void_capture_request 
     # @param id The capture ID returned from a previous capture request.
     # @param [Hash] opts the optional parameters
@@ -97,7 +97,7 @@ module CyberSource
     end
 
     # Void a Capture
-    # Refund a capture API is only used, if you have requested Capture independenlty using [/pts/v2/payments/{id}/captures](https://developer.cybersource.com/api-reference-assets/index.html#payments_capture) API call.  Include the capture ID in the POST request to cancel the capture. 
+    # Refund a capture API is only used, if you have requested Capture independenlty using [/pts/v2/payments/{id}/captures](https://developer.cybersource.com/api-reference-assets/index.html#payments_capture) API call. Include the capture ID in the POST request to cancel the capture. 
     # @param void_capture_request 
     # @param id The capture ID returned from a previous capture request.
     # @param [Hash] opts the optional parameters
@@ -228,7 +228,7 @@ module CyberSource
       return data, status_code, headers
     end
     # Void a Payment
-    # Void a Payment API is only used, if you have requested Authorization and Capture together in [/pts/v2/payments](https://developer.cybersource.com/api-reference-assets/index.html#payments_payments) API call.  Include the payment ID in the POST request to cancel the payment. 
+    # Void a Payment API is only used, if you have requested Authorization and Capture together in [/pts/v2/payments](https://developer.cybersource.com/api-reference-assets/index.html#payments_payments) API call. Include the payment ID in the POST request to cancel the payment. 
     # @param void_payment_request 
     # @param id The payment ID returned from a previous payment request.
     # @param [Hash] opts the optional parameters
@@ -239,7 +239,7 @@ module CyberSource
     end
 
     # Void a Payment
-    # Void a Payment API is only used, if you have requested Authorization and Capture together in [/pts/v2/payments](https://developer.cybersource.com/api-reference-assets/index.html#payments_payments) API call.  Include the payment ID in the POST request to cancel the payment. 
+    # Void a Payment API is only used, if you have requested Authorization and Capture together in [/pts/v2/payments](https://developer.cybersource.com/api-reference-assets/index.html#payments_payments) API call. Include the payment ID in the POST request to cancel the payment. 
     # @param void_payment_request 
     # @param id The payment ID returned from a previous payment request.
     # @param [Hash] opts the optional parameters

data/lib/cybersource_rest_client/api_client.rb

@@ -15,7 +15,7 @@ require 'json'
 require 'logger'
 require 'tempfile'
 require 'typhoeus'
-require 'uri'
+require 'addressable/uri'
 
 module CyberSource
   class ApiClient
@@ -39,7 +39,6 @@ module CyberSource
       @config = config
       @user_agent = "Swagger-Codegen/#{VERSION}/ruby"
       @default_headers = {
-        'Content-Type' => 'application/json',
         'User-Agent' => @user_agent
       }
 
@@ -113,17 +112,27 @@ module CyberSource
       body_params = opts[:body] || {}
       query_params = opts[:query_params] || {}
       if !query_params.empty?
-        query_params = URI.encode_www_form(query_params)
+        query_params = Addressable::URI.form_encode(query_params)
+      end
+
+      headers = opts[:header_params]
+      if $merchantconfig_obj.authenticationType.upcase != Constants::AUTH_TYPE_MUTUAL_AUTH
+        headers = CallAuthenticationHeader(http_method, path, body_params, headers, query_params)
       end
-      headers = CallAuthenticationHeader(http_method, path, body_params, opts[:header_params], query_params)
       http_method = http_method.to_sym.downcase
-      header_params = @default_headers.merge(headers || {})
+      header_params = headers.merge(@default_headers)
       form_params = opts[:form_params] || {}
 
 
       # set ssl_verifyhosts option based on @config.verify_ssl_host (true/false)
       _verify_ssl_host = @config.verify_ssl_host ? 2 : 0
 
+      # client cert
+      if $merchantconfig_obj.enableClientCert
+        @config.cert_file = File.join($merchantconfig_obj.clientCertDirectory, $merchantconfig_obj.sslClientCert)
+        @config.key_file = File.join($merchantconfig_obj.clientCertDirectory, $merchantconfig_obj.privateKey)
+      end
+
       req_opts = {
         :method => http_method,
         :headers => header_params,
@@ -133,6 +142,7 @@ module CyberSource
         :ssl_verifypeer => @config.verify_ssl,
         :ssl_verifyhost => _verify_ssl_host,
         :sslcert => @config.cert_file,
+        :sslkeypasswd => $merchantconfig_obj.sslKeyPassword || "",
         :sslkey => @config.key_file,
         :verbose => @config.debugging
       }
@@ -208,9 +218,13 @@ module CyberSource
         token = "Bearer " + token
         header_params['Authorization'] = token
       end
-      header_params.each do |key, value|
-        log_obj.logger.info("#{key} : #{value}")
+      if $merchantconfig_obj.authenticationType.upcase == Constants::AUTH_TYPE_OAUTH
+        token = "Bearer " + token
+        header_params['Authorization'] = token
       end
+      # header_params.each do |key, value|
+      #   log_obj.logger.info("#{key} : #{value}")
+      # end
       return header_params
     end
     def get_query_param(path, query_params)
@@ -359,7 +373,7 @@ module CyberSource
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
+      Addressable::URI.encode(@config.base_url + path)
     end
 
     # Builds the HTTP request body
@@ -382,6 +396,15 @@ module CyberSource
             data[key] = value.to_s
           end
         end
+        JSON.parse(body).each do |key, value|
+          case value
+          when ::File, ::Array, nil
+            # let typhoeus handle File, Array and nil parameters
+            data[key] = value
+          else
+            data[key] = value.to_s
+          end
+        end
       elsif body
         data = body.is_a?(String) ? body : body.to_json
       else

data/lib/cybersource_rest_client/configuration.rb

@@ -10,7 +10,7 @@ Swagger Codegen version: 2.2.3
 
 =end
 
-require 'uri'
+require 'addressable/uri'
 
 module CyberSource
   class Configuration
@@ -175,7 +175,7 @@ module CyberSource
 
     def base_url
       url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      Addressable::URI.encode(url)
     end
 
     # Gets API key (with prefix if set).

data/lib/cybersource_rest_client/models/access_token_response.rb

@@ -0,0 +1,244 @@
+=begin
+#OAuth2 API
+
+#OAuth2 Token Service (OAuth2)
+
+OpenAPI spec version: v3
+
+Generated by: https://github.com/swagger-api/swagger-codegen.git
+Swagger Codegen version: 2.2.3
+
+=end
+
+require 'date'
+
+module CyberSource
+  class AccessTokenResponse
+    # Created JWT token.
+    attr_accessor :access_token
+
+    # Bearer.
+    attr_accessor :token_type
+
+    # Newly created JWT token for initial request or if refresh token expired, else the same refresh token as in the request.
+    attr_accessor :refresh_token
+
+    # Number of seconds left till the access token gets expired.
+    attr_accessor :expires_in
+
+    # List of permissions for APIs.
+    attr_accessor :scope
+
+    # Number of seconds left till the refresh token gets expired.
+    attr_accessor :refresh_token_expires_in
+
+    # Successful response can be returned only if client status is active.
+    attr_accessor :client_status
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'access_token' => :'access_token',
+        :'token_type' => :'token_type',
+        :'refresh_token' => :'refresh_token',
+        :'expires_in' => :'expires_in',
+        :'scope' => :'scope',
+        :'refresh_token_expires_in' => :'refresh_token_expires_in',
+        :'client_status' => :'client_status'
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        :'access_token' => :'String',
+        :'token_type' => :'String',
+        :'refresh_token' => :'String',
+        :'expires_in' => :'Integer',
+        :'scope' => :'String',
+        :'refresh_token_expires_in' => :'Integer',
+        :'client_status' => :'String'
+      }
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+      if attributes.has_key?(:'access_token')
+        self.access_token = attributes[:'access_token']
+      end
+
+      if attributes.has_key?(:'token_type')
+        self.token_type = attributes[:'token_type']
+      end
+
+      if attributes.has_key?(:'refresh_token')
+        self.refresh_token = attributes[:'refresh_token']
+      end
+
+      if attributes.has_key?(:'expires_in')
+        self.expires_in = attributes[:'expires_in']
+      end
+
+      if attributes.has_key?(:'scope')
+        self.scope = attributes[:'scope']
+      end
+
+      if attributes.has_key?(:'refresh_token_expires_in')
+        self.refresh_token_expires_in = attributes[:'refresh_token_expires_in']
+      end
+
+      if attributes.has_key?(:'client_status')
+        self.client_status = attributes[:'client_status']
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          access_token == o.access_token &&
+          token_type == o.token_type &&
+          refresh_token == o.refresh_token &&
+          expires_in == o.expires_in &&
+          scope == o.scope &&
+          refresh_token_expires_in == o.refresh_token_expires_in &&
+          client_status == o.client_status
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [access_token, token_type, refresh_token, expires_in, scope, refresh_token_expires_in, client_status].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          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
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :DateTime
+        DateTime.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :BOOLEAN
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        temp_model = CyberSource.const_get(type).new
+        temp_model.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        next if value.nil?
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end

data/lib/cybersource_rest_client/models/add_negative_list_request.rb

@@ -43,7 +43,7 @@ module CyberSource
       {
         :'order_information' => :'Riskv1liststypeentriesOrderInformation',
         :'payment_information' => :'Riskv1liststypeentriesPaymentInformation',
-        :'client_reference_information' => :'Riskv1decisionsClientReferenceInformation',
+        :'client_reference_information' => :'Riskv1liststypeentriesClientReferenceInformation',
         :'device_information' => :'Riskv1liststypeentriesDeviceInformation',
         :'risk_information' => :'Riskv1liststypeentriesRiskInformation',
         :'buyer_information' => :'Riskv1liststypeentriesBuyerInformation'