Mid-May 2020 Release (Fixes)

Author: gnongsie

generator/cybersource-ruby-template/api_client.mustache

@@ -20,7 +20,10 @@ module {{moduleName}}
     attr_accessor :default_headers
 
     # Defines the client ID for the SDK
-    attr_accessor :client_id
+    attr_accessor :client_id   
+
+    # Defines the user-defined Accept Header Type
+    attr_accessor :accept_header
 
     # Initializes the ApiClient
     # @option config [Configuration] Configuration for initializing the object, default to Configuration.default
@@ -35,6 +38,10 @@ module {{moduleName}}
       @client_id = 'cybs-rest-sdk-ruby-' + Gem.loaded_specs["cybersource_rest_client"].version.to_s
     end
 
+    def set_user_defined_accept_header(accept_type)
+      @accept_header = accept_type
+    end
+
     def self.default
       @@default ||= ApiClient.new
     end
@@ -44,17 +51,23 @@ module {{moduleName}}
     # @return [Array<(Object, Fixnum, Hash)>] an array of 3 elements:
     #   the data deserialized from response body (could be nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
+      unless @accept_header.nil? || @accept_header.empty?
+        default_accept_header = ',' + (opts[:header_params])['Accept']
+        default_accept_header = @accept_header + default_accept_header.sub(',' + @accept_header, '')
+        opts[:header_params]['Accept'] = default_accept_header
+      end
+
       request = build_request(http_method, path, opts)
       response = request.run
 
       if @config.debugging
-		begin
-		raise
-			@config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
-		rescue
-			puts 'Cannot write to log'			
-		end
-	  end
+        begin
+        raise
+            @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
+        rescue
+            puts 'Cannot write to log'            
+        end
+      end
 
       unless response.success?
         if response.timed_out?
@@ -91,7 +104,7 @@ module {{moduleName}}
       url = build_request_url(path)
       body_params = opts[:body] || {}
       query_params = opts[:query_params] || {}
-	  if !query_params.empty?
+      if !query_params.empty?
         query_params = URI.encode_www_form(query_params)
       end
       headers = CallAuthenticationHeader(http_method, path, body_params, opts[:header_params], query_params)
@@ -126,26 +139,26 @@ module {{moduleName}}
         req_body = build_request_body(header_params, form_params, opts[:body])
         req_opts.update :body => req_body
         if @config.debugging
-			begin
-			raise
-				@config.logger.debug "HTTP request body param ~BEGIN~\n#{req_body}\n~END~\n"
-			rescue
-				puts 'Cannot write to log'
-			end
-		end
+            begin
+            raise
+                @config.logger.debug "HTTP request body param ~BEGIN~\n#{req_body}\n~END~\n"
+            rescue
+                puts 'Cannot write to log'
+            end
+        end
       end
 
       request = Typhoeus::Request.new(url, req_opts)
       download_file(request) if opts[:return_type] == 'File'
       request
     end
-	# set merchantConfig 
-	def set_configuration(config)
-	   require_relative '../AuthenticationSDK/core/MerchantConfig.rb'
-	   $merchantconfig_obj = Merchantconfig.new(config)
-	   @config.host = $merchantconfig_obj.requestHost
-	end
-	# Calling Authentication
+    # set merchantConfig 
+    def set_configuration(config)
+       require_relative '../AuthenticationSDK/core/MerchantConfig.rb'
+       $merchantconfig_obj = Merchantconfig.new(config)
+       @config.host = $merchantconfig_obj.requestHost
+    end
+    # Calling Authentication
     def CallAuthenticationHeader(http_method, path, body_params, header_params, query_params)
       require_relative '../AuthenticationSDK/core/Authorization.rb'
       require_relative '../AuthenticationSDK/authentication/payloadDigest/digest.rb'
@@ -204,7 +217,7 @@ module {{moduleName}}
       end
       request_target
     end
-	
+    
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json