+ Fixed issues

Author: snavinch

lib/AuthenticationSDK/core/Authorization.rb

@@ -16,7 +16,7 @@ def getToken(merchantconfig_obj, gmtdatetime, log_obj)
       elsif authenticationType == Constants::AUTH_TYPE_JWT
         token = GenerateJwtToken.new.getToken(merchantconfig_obj, gmtdatetime, log_obj)
       elsif authenticationType == Constants::AUTH_TYPE_OAUTH
-        token = GenerateOAuthToken.new.getToken((merchantconfig_obj, gmtdatetime, log_obj)
+        token = GenerateOAuthToken.new.getToken(merchantconfig_obj, gmtdatetime, log_obj)
       else
         raise StandardError.ner(Constants::ERROR_PREFIX + Constants::AUTH_ERROR)
       end

lib/AuthenticationSDK/core/MerchantConfig.rb

@@ -90,19 +90,19 @@ def validateMerchantDetails()
           @requestHost = Constants::SANDBOX_URL
         elsif @runEnvironment.upcase == Constants::BOA_RUN_ENV_PROD
           @requestHost = Constants::BOA_PRODUCTION_URL
-        elsif @runEnvironment.upcase == Constants.BOA_RUN_ENV_SANDBOX
+        elsif @runEnvironment.upcase == Constants::BOA_RUN_ENV_SANDBOX
           @requestHost = Constants::BOA_SANDBOX_URL
         elsif @runEnvironment.upcase == Constants::IDC_RUN_ENV_PROD
           @requestHost = Constants::IDC_PRODUCTION_URL
-        elsif @runEnvironment.upcase == Constants.IDC_RUN_ENV_SANDBOX
+        elsif @runEnvironment.upcase == Constants::IDC_RUN_ENV_SANDBOX
           @requestHost = Constants::IDC_SANDBOX_URL
-        elsif @runEnvironment.upcase == Constants.RUN_ENV_MUTUAL_AUTH_SANDBOX
+        elsif @runEnvironment.upcase == Constants::RUN_ENV_MUTUAL_AUTH_SANDBOX
           @requestHost = Constants::MA_SANDBOX_URL
-        elsif @runEnvironment.upcase == Constants.RUN_ENV_MUTUAL_AUTH_PROD
+        elsif @runEnvironment.upcase == Constants::RUN_ENV_MUTUAL_AUTH_PROD
           @requestHost = Constants::MA_PRODUCTION_URL
-        elsif @runEnvironment.upcase == Constants.RUN_ENV_SIT
+        elsif @runEnvironment.upcase == Constants::RUN_ENV_SIT
           @requestHost = Constants::SIT_URL
-        elsif @runEnvironment.upcase == Constants.RUN_ENV_MUTUAL_AUTH_SIT
+        elsif @runEnvironment.upcase == Constants::RUN_ENV_MUTUAL_AUTH_SIT
           @requestHost = Constants::MA_SIT_URL
         else
           @requestHost = @runEnvironment

lib/cybersource_rest_client/api_client.rb

@@ -38,8 +38,7 @@ class ApiClient
     def initialize(config = Configuration.default)
       @config = config
       @user_agent = "Swagger-Codegen/#{VERSION}/ruby"
-      @default_headers = {
-        'Content-Type' => 'application/json',
+      @default_headers = {        
         'User-Agent' => @user_agent
       }
 
@@ -116,21 +115,23 @@ def build_request(http_method, path, opts = {})
         query_params = Addressable::URI.form_encode(query_params)
       end
 
-      if merchantconfig_obj.authenticationType.upcase != Constants::AUTH_TYPE_MUTUAL_AUTH
-        headers = CallAuthenticationHeader(http_method, path, body_params, opts[:header_params], query_params)
+
+      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
       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.publicKey)
-        @config.key_file = File.join(merchantconfig_obj.clientCertDirectory, merchantconfig_obj.privateKey)
+      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 = {
@@ -142,7 +143,7 @@ def build_request(http_method, path, opts = {})
         :ssl_verifypeer => @config.verify_ssl,
         :ssl_verifyhost => _verify_ssl_host,
         :sslcert => @config.cert_file,
-        :sslkeypasswd => merchantconfig_obj.clientCertPassword || "",
+        :sslkeypasswd => $merchantconfig_obj.sslKeyPassword || "",
         :sslkey => @config.key_file,
         :verbose => @config.debugging
       }
@@ -396,6 +397,15 @@ def build_request_body(header_params, form_params, body)
             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