+ Changes to api_client.mustache

Author: snavinch

generator/cybersource-ruby-template/api_client.mustache

@@ -31,7 +31,6 @@ module {{moduleName}}
       @config = config
       @user_agent = "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/#{VERSION}/ruby{{/httpUserAgent}}"
       @default_headers = {
-        'Content-Type' => 'application/json',
         'User-Agent' => @user_agent
       }
 
@@ -107,9 +106,13 @@ module {{moduleName}}
       if !query_params.empty?
         query_params = Addressable::URI.form_encode(query_params)
       end
-      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] || {}
 
       {{#hasAuthMethods}}
@@ -119,6 +122,12 @@ module {{moduleName}}
       # 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,
@@ -128,6 +137,7 @@ module {{moduleName}}
         :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
       }
@@ -203,6 +213,10 @@ module {{moduleName}}
         token = "Bearer " + token
         header_params['Authorization'] = token
       end
+      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
@@ -377,6 +391,15 @@ module {{moduleName}}
             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