zuora_api 1.7.81 → 1.8.00

data/lib/zuora_api/login.rb

@@ -7,7 +7,7 @@ module ZuoraAPI
   class Login
     ENVIRONMENTS = [TEST = 'Test', SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
-    MIN_Endpoints = {'Test': '107.0', 'Sandbox': '107.0', 'Production': '107.0', 'Performance': '107.0', 'Services': '96.0', 'Unknown': '96.0', 'Staging': '107.0'}.freeze
+    MIN_Endpoint = '96.0'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
 
     CONNECTION_EXCEPTIONS = [
@@ -21,7 +21,7 @@ module ZuoraAPI
     ].freeze
 
     CONNECTION_READ_EXCEPTIONS = [
-      Timeout::Error,
+      Net::ReadTimeout,
       Errno::ECONNRESET,
       Errno::EPIPE
     ].freeze
@@ -39,8 +39,8 @@ module ZuoraAPI
 
     ZUORA_SERVER_ERRORS = [
       ZuoraAPI::Exceptions::ZuoraAPIInternalServerError,
-        ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
-        ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
+      ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
+      ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
       ZuoraAPI::Exceptions::ZuoraUnexpectedError
     ].freeze
     
@@ -50,12 +50,10 @@ module ZuoraAPI
       raise "URL is nil or empty, but URL is required" if url.nil? || url.empty?
       # raise "URL is improper. URL must contain zuora.com, zuora.eu, or zuora.na" if /zuora.com|zuora.eu|zuora.na/ === url
       self.hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
-      self.update_environment
-      min_endpoint = MIN_Endpoints[self.environment.to_sym]
       if !/apps\/services\/a\/\d+\.\d$/.match(url.strip)
-        self.url = "https://#{hostname}/apps/services/a/#{min_endpoint}"
-      elsif min_endpoint.to_f > url.scan(/(\d+\.\d)$/).dig(0,0).to_f
-        self.url = url.gsub(/(\d+\.\d)$/, min_endpoint)
+        self.url = "https://#{hostname}/apps/services/a/#{MIN_Endpoint}"
+      elsif MIN_Endpoint.to_f > url.scan(/(\d+\.\d)$/).dig(0,0).to_f
+        self.url = url.gsub(/(\d+\.\d)$/, MIN_Endpoint)
       else
         self.url = url
       end
@@ -67,6 +65,7 @@ module ZuoraAPI
       self.status = status.blank? ? "Active" : status
       self.user_info = Hash.new
       self.update_region
+      self.update_environment
       self.update_zconnect_provider
       @timeout_sleep = 5
     end
@@ -156,7 +155,7 @@ module ZuoraAPI
     # 1. Pass in cookies and optionally custom_authorities, name, and description
     # 2. Pass in user_id, entity_ids, client_id, client_secret, and optionally custom_authorities, name, and description
     # https://intranet.zuora.com/confluence/display/Sunburst/Create+an+OAuth+Client+through+API+Gateway#CreateanOAuthClientthroughAPIGateway-ZSession
-    def get_oauth_client (custom_authorities = [], info_name: "No Name", info_desc: "This client was created without a description.", user_id: nil, entity_ids: nil, client_id: nil, client_secret: nil, new_client_id: nil, new_client_secret: nil, cookies: nil, chomp_v1_from_genesis_endpoint: false, use_api_generated_client_secret: false)
+    def get_oauth_client (custom_authorities = [], info_name: "No Name", info_desc: "This client was created without a description.", user_id: nil, entity_ids: nil, client_id: nil, client_secret: nil, new_client_id: nil, new_client_secret: nil, cookies: nil, chomp_v1_from_genesis_endpoint: false)
       authorization = ""
       new_client_id = SecureRandom.uuid if new_client_id.blank?
       new_client_secret = SecureRandom.hex(10) if new_client_secret.blank?
@@ -186,7 +185,7 @@ module ZuoraAPI
         oauth_response = HTTParty.post(endpoint, :headers => {'authorization' => authorization, 'Content-Type' => 'application/json'}, :body => {'clientId' => new_client_id, 'clientSecret' => new_client_secret, 'userId' => user_id, 'entityIds' => entity_ids, 'customAuthorities' => custom_authorities, 'additionalInformation' => {'description' => info_desc, 'name' => info_name}}.to_json)
         output_json = JSON.parse(oauth_response.body)
         if oauth_response.code == 201
-          output_json["clientSecret"] = new_client_secret if !use_api_generated_client_secret
+          output_json["clientSecret"] = new_client_secret
           return output_json
         elsif oauth_response.code == 401 && !oauth_response.message.blank?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["message"], oauth_response)
@@ -253,7 +252,7 @@ module ZuoraAPI
     end
 
     def update_environment
-      if !self.hostname.blank?
+      if !self.url.blank?
         case self.hostname
         when /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/
           self.environment = 'Sandbox'
@@ -276,13 +275,13 @@ module ZuoraAPI
     end
 
     def update_zconnect_provider
-      update_region if self.region.blank?
-      update_environment if self.environment.blank?
+      region = update_region
+      environment = update_environment
       mappings = {"US" => {"Sandbox" => "ZConnectSbx",   "Services" => "ZConnectSvcUS", "Production" => "ZConnectProd",   "Performance" => "ZConnectPT1", "Test" => "ZConnectTest", "Staging" => "ZConnectQA", "KubeSTG" => "ZConnectDev", "KubeDEV" => "ZConnectDev", "KubePROD" => "ZConnectDev"},
                   "NA" => {"Sandbox" => "ZConnectSbxNA", "Services" => "ZConnectSvcNA", "Production" => "ZConnectProdNA", "Performance" => "ZConnectPT1NA"},
                   "EU" => {"Sandbox" => "ZConnectSbxEU", "Services" => "ZConnectSvcEU", "Production" => "ZConnectProdEU", "Performance" => "ZConnectPT1EU", "Test" => "ZConnectTest"},
                   "Unknown" => {"Unknown" => "Unknown"}}
-      self.zconnect_provider = mappings[self.region][self.environment]
+      self.zconnect_provider = mappings[region][environment]
     end
 
     def aqua_endpoint(url="")
@@ -322,8 +321,8 @@ module ZuoraAPI
       return domain ? endpoint.concat(prefix).concat(url) : prefix.concat(url)
     end
 
-    def rest_domain(endpoint: self.rest_endpoint)
-      return URI(endpoint).host
+    def rest_domain
+      return URI(self.rest_endpoint).host
     end
 
     def fileURL(url="")
@@ -335,41 +334,10 @@ module ZuoraAPI
     end
 
     def new_session(auth_type: :basic, debug: false, zuora_track_id: nil)
-      retries ||= 2
-      yield
-
-    rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      self.status = 'Invalid'
-      self.current_error = ex.message
-      raise
-    rescue ZuoraAPI::Exceptions::ZuoraAPIError  => ex
-      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(ex.message, ex.response)
-
-    rescue ZuoraAPI::Exceptions::ZuoraAPIInternalServerError => ex
-      raise ex if retries.zero?
-
-      retries -= 1
-      sleep(self.timeout_sleep)
-      retry
-        
-    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      self.log(location: "BasicLogin", exception: ex, message: "Timed out", level: :error)
-
-      self.current_error = "Request timed out. Try again"
-      self.status = 'Timeout'
-
-      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
-
-    rescue EOFError
-      if self.url.match?(/.*services\d{1,}.zuora.com*/)
-        self.current_error = "Services tenant '#{self.url.scan(/.*\/\/(services\d{1,}).zuora.com*/).last.first}' is no longer available."
-        self.status = 'Not Available'
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
-      end
-
     end
 
     def get_session(prefix: false, auth_type: :basic, zuora_track_id: nil)
+      Rails.logger.debug("Get session for #{auth_type} - #{self.class.to_s}") if Rails.env.to_s == 'development'
       case auth_type
       when :basic
         if self.current_session.blank?
@@ -378,13 +346,14 @@ module ZuoraAPI
             if self.bearer_token.blank? || self.oauth_expired?
               self.new_session(auth_type: :bearer, zuora_track_id: zuora_track_id)
             end
-            self.get_z_session(zuora_track_id: zuora_track_id)
+            self.get_z_session(zuora_track_id: zuora_track_id) if self.status == 'Active'
           when 'ZuoraAPI::Basic'
             self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
           else
             self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
           end
         end
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
         return prefix ? "ZSession #{self.current_session}" : self.current_session.to_s
       when :bearer
         case self.class.to_s
@@ -397,6 +366,8 @@ module ZuoraAPI
         else
           raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Unknown Login, does not support Authentication of Type: #{auth_type}")
         end
+
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
         return prefix ? "Bearer #{self.bearer_token}" : self.bearer_token.to_s
       end
     end
@@ -404,18 +375,16 @@ module ZuoraAPI
     def soap_call(
       ns1: 'ns1', 
       ns2: 'ns2', 
-      batch_size: nil,
-      headers: {},
+      batch_size: nil, 
       single_transaction: false, 
       debug: false, 
       zuora_track_id: nil, 
       errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS), 
       z_session: true, 
       timeout_retry: false, 
-      timeout: 130,
+      timeout: 120,
       timeout_sleep_interval: self.timeout_sleep, 
       output_exception_messages: true,
-      skip_session: false,
       **keyword_args)
       tries ||= 2
       xml = Nokogiri::XML::Builder.new do |xml|
@@ -425,10 +394,8 @@ module ZuoraAPI
                                  'xmlns:api' => "http://api.zuora.com/",
                                  "xmlns:#{ns1}" => "http://api.zuora.com/") do
           xml['SOAP-ENV'].Header do
-            if !skip_session
-              xml["#{ns1}"].SessionHeader do
-                xml["#{ns1}"].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: zuora_track_id)
-              end
+            xml["#{ns1}"].SessionHeader do
+              xml["#{ns1}"].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: zuora_track_id)
             end
             if single_transaction
               xml["#{ns1}"].CallOptions do
@@ -446,11 +413,12 @@ module ZuoraAPI
           end
         end
       end
+
       input_xml = Nokogiri::XML(xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip)
       input_xml.xpath('//ns1:session', 'ns1' =>'http://api.zuora.com/').children.remove
       Rails.logger.debug("Request SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
-      headers.merge!({ 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'})
+      headers = { 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'}
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
       request = HTTParty::Request.new(
@@ -467,11 +435,7 @@ module ZuoraAPI
       Rails.logger.debug("Response SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
       raise_errors(type: :SOAP, body: output_xml, response: response)
-
-      return output_xml, input_xml, response
-
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      raise if skip_session
       if !tries.zero? && z_session
         tries -= 1
         Rails.logger.debug("SOAP Call - Session Invalid")
@@ -483,33 +447,39 @@ module ZuoraAPI
         end
 
         retry
+      else
+        if errors.include?(ex.class)
+          raise ex
+        else
+          return output_xml, input_xml, response
+        end
       end
-        
-      raise ex if errors.include?(ex.class)
-  
-      return output_xml, input_xml, response
-      
     rescue *ZUORA_API_ERRORS => ex
-      raise ex if errors.include?(ex.class)
-     
-      response = ex.response unless response
-      return output_xml, input_xml, response
-      
+      if errors.include?(ex.class)
+        raise ex
+      else
+        response = ex.response unless response
+        return output_xml, input_xml, response
+      end
     rescue *CONNECTION_EXCEPTIONS => ex
-      if !tries.zero?
-        tries -= 1
-        self.log(location: "SOAP Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
-        sleep(timeout_sleep_interval)
-        retry
+      if tries.zero?
+        if output_exception_messages
+          if Rails.logger.class.to_s == "Ougai::Logger"
+            Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
+          else
+            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
+          end
+        end
+        raise ex 
       end
 
-      self.log(location: "SOAP Call", exception: ex, message: "Timed out", level: :error)  if output_exception_messages
-      raise ex 
-      
+      tries -= 1
+      sleep(timeout_sleep_interval)
+      retry
     rescue *CONNECTION_READ_EXCEPTIONS => ex
       if !tries.zero?
         tries -= 1
-        self.log(location: "SOAP Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
+
         if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
           retry
         elsif timeout_retry
@@ -518,74 +488,19 @@ module ZuoraAPI
         end
       end
 
-      self.log(location: "SOAP Call", exception: ex, message: "Timed out", level: :error)  if output_exception_messages
-      ex = ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read/write timeout from 'https://#{rest_domain(endpoint: url)}'", nil, request) if ex.is_a?(Timeout::Error) && !ex.instance_of?(ZuoraAPI::Exceptions::ZuoraAPIReadTimeout)
+      if output_exception_messages
+        if Rails.logger.class.to_s == "Ougai::Logger"
+          Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
+        else
+          Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
+        end
+      end
+      raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}", nil, request) if ex.instance_of?(Net::ReadTimeout)
       raise ex
-
     rescue => ex
       raise ex
-    ensure 
-      self.error_logger(ex) if defined?(ex) && Rails.logger.class.to_s == "Ougai::Logger"
-    end
-
-    def error_logger(ex)
-      exception_args = Rails.logger.with_fields.merge(self.exception_args(ex))
-      case ex
-      when ZuoraAPI::Exceptions::ZuoraAPIUnkownError, ZuoraAPI::Exceptions::ZuoraDataIntegrity
-        Rails.logger.error('Zuora Unknown/Integrity Error', ex, exception_args)
-      when ZuoraAPI::Exceptions::ZuoraAPIRequestLimit
-        Rails.logger.info('Zuora APILimit Reached', ex, exception_args)
-      when *(ZuoraAPI::Login::ZUORA_API_ERRORS-ZuoraAPI::Login::ZUORA_SERVER_ERRORS)
-        #Rails.logger.debug('Zuora API Error', ex, self.exception_args(ex))
-      when *ZuoraAPI::Login::ZUORA_SERVER_ERRORS
-        Rails.logger.error('Zuora Server Error', ex, exception_args)
-      end
-    end
-
-    def log(location: "Rest Call", exception: nil, message: "Timed out will retry after #{self.timeout_sleep} seconds", level: :info )
-      level = :debug if ![:debug, :info, :warn, :error, :fatal].include?(level)
-      if Rails.logger.class.to_s == "Ougai::Logger"
-        Rails.logger.send(level.to_sym, "#{location} - #{message}", exception) 
-      else
-        Rails.logger.send(level.to_sym, "#{location} - #{exception.class} #{message}") 
-      end
-    end
-
-    def exception_args(ex)
-      args = {}
-      if defined?(ex.response) && ex.response.present?
-        args.merge!({
-          request: {
-            path: ex.response.request.path.to_s,
-            method: ex.response.request.http_method.to_s.split("Net::HTTP::").last.upcase,
-            params: ex.response.request.raw_body.to_s,
-            headers: ex.response.request.options[:headers].map{|k,v| [k.to_s, k.to_s.downcase.strip == "authorization" ? "VALUE FILTERED" : v]}.to_h.to_s,
-          },
-          response: {
-            status: ex.response.code,
-            params: ex.response.body.to_s,
-            headers: ex.response.headers.to_s,
-          },
-          zuora_trace_id: ex.response.headers["zuora-request-id"],
-          zuora_track_id: ex.response.request.options[:headers]["Zuora-Track-Id"],
-        })
-      elsif defined?(ex.request) && ex.request.present?
-        args.merge!({
-          request: {
-            path: ex.request.path.to_s,
-            method: ex.request.http_method.to_s.split("Net::HTTP::").last.upcase,
-            params: ex.request.options[:body],
-            headers: ex.request.options[:headers].map{|k,v| [k.to_s, k.to_s.downcase.strip == "authorization" ? "VALUE FILTERED" : v]}.to_h.to_s
-          }
-        })
-        args.merge!({
-          zuora_track_id: ex.request.options[:headers]["Zuora-Track-Id"]
-        }) if ex.request.options[:headers]["Zuora-Track-Id"].present?
-      end
-    rescue => ex
-      Rails.logger.error("Failed to create exception arguments", ex, args)
-    ensure
-      return args
+    else
+      return output_xml, input_xml, response
     end
 
     def raise_errors(type: :SOAP, body: nil, response: nil)
@@ -602,13 +517,13 @@ module ZuoraAPI
       end
 
       if [502,503].include?(response.code)
-        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from 'https://#{rest_domain(endpoint: request_uri)}'", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{request_uri}", response)
       end
 
       # Check failure response code
       case response.code
       when 504
-        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from 'https://#{rest_domain(endpoint: request_uri)}'", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from #{request_uri}", response)
       when 429
         raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
       when 401
@@ -629,10 +544,6 @@ module ZuoraAPI
       when :SOAP
         error, success, message = get_soap_error_and_message(body)
 
-        if body.xpath('//fns:LoginFault', 'fns' =>'http://fault.api.zuora.com/').present? 
-          raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(message, response)
-        end
-
         if body.xpath('//ns1:queryResponse', 'ns1' => 'http://api.zuora.com/').present? &&
            body.xpath(
              '//ns1:records[@xsi:type="ns2:Export"]',
@@ -640,12 +551,12 @@ module ZuoraAPI
            ).present?
           result = body.xpath('//ns2:Status', 'ns2' => 'http://object.api.zuora.com/').text
           if result == 'Failed'
-            message = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
-            error = 'FATAL_ERROR'
-            if message.present?
-              identifier, new_message = message.scan(/^([\w\d]{16})\: (.*)/).first
-              error, message = ['UNEXPECTED_ERROR', new_message] if new_message.present?
+            reason = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
+            if reason.present?
+              message = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
+              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response|Socket Timeout|There is an internal error, please try again later)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
             else
+              error = 'FATAL_ERROR'
               message = 'Export failed due to unknown reason. Consult api logs.'
             end
           end
@@ -694,31 +605,14 @@ module ZuoraAPI
           when /^GET::400::\/api\/rest\/v1\/reports\/(reportlabels\/)?([a-zA-Z0-9\-_]+)\/report-details$/ # Get report, capture of the id is present if needed in future error responses.
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(reporting_message, response) if reporting_message.present?
           end
-        when /\/objects\/batch\//
-          if body['code'].present? && /61$/.match(body['code'].to_s).present? # if last 2 digits of code are 61
-            raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(body['message'], nil, body['details'])
-          end
-        when /^\/api\/v1\/payment_plans.*/
-           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['error'], response) if body['error']
         end
 
         body = body.dig("results").present? ? body["results"] : body if body.class == Hash
         if body.class == Hash && (!body["success"] || !body["Success"] || response.code != 200)
-          reason_keys = %w(reasons errors)
-          message_keys = %w(message title)
-          messages_array, codes_array = [[],[]]
-          reason_keys.each do |rsn_key|
-            message_keys.each do |msg_key|
-              messages_array = body.fetch(rsn_key, []).map {|error| error[msg_key]}.compact
-              break if messages_array.present?
-            end
-            codes_array = body.fetch(rsn_key, []).map {|error| error['code']}.compact
-            break if messages_array.present? && codes_array.present?
-          end
-          if body.dig('error').class == Hash
-            messages_array = messages_array.push(body.dig("error", 'message')).compact
-            codes_array = codes_array.push(body.dig("error", 'code')).compact
-          end
+          messages_array = body.fetch("reasons", []).map {|error| error['message']}.compact
+          messages_array = messages_array.push(body.dig("error", 'message')).compact if body.dig('error').class == Hash
+          codes_array =    body.fetch("reasons", []).map {|error| error['code']}.compact
+          codes_array = codes_array.push(body.dig("error", 'code')).compact  if body.dig('error').class == Hash
 
           if body['message'] == 'request exceeded limit'
             raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
@@ -750,11 +644,7 @@ module ZuoraAPI
           end
 
           if body['error'] == 'Unauthorized' && body['status'] == 401
-            if body['message'].present?
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(body['message'], response)
-            else 
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
-            end
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
           end
           #Authentication failed
           if (codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(11) || response.code == 401) && !codes_array.include?(422)
@@ -861,7 +751,7 @@ module ZuoraAPI
         output_json = JSON.parse(response.body)
         self.raise_errors(type: :JSON, body: output_json, response: response)
       
-      elsif (response_content_types.include?('application/xml') || response_content_types.include?('text/xml') || response_content_types.include?('application/soap+xml')) and type != :xml
+      elsif (response_content_types.include?('application/xml') || response_content_types.include?('text/xml')) and type != :xml
         output_xml = Nokogiri::XML(response.body)
         self.raise_errors(type: :SOAP, body: output_xml, response: response)
 
@@ -881,8 +771,6 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new(error_message, response)
           when /Client sent a bad request./, /Bad Request/, /403 Forbidden/
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(error_message, response)    
-          when /414 Request-URI Too Large/
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Request URL is too long", response)
           else 
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(error_message, response)
           end
@@ -909,11 +797,6 @@ module ZuoraAPI
         message = body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text
       end
 
-      if error.blank? || message.blank?
-        error   = body.xpath('//soapenv:Value', 'soapenv'=>'http://www.w3.org/2003/05/soap-envelope').text
-        message = body.xpath('//soapenv:Text', 'soapenv'=>'http://www.w3.org/2003/05/soap-envelope').text
-      end
-
       #Update/Create/Delete Calls with multiple requests and responses
       if body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').size > 0 && body.xpath('//ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
         error = []
@@ -957,22 +840,17 @@ module ZuoraAPI
           raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-      when /^INVALID_VERSION/, /invalid/, /^DUPLICATE_VALUE/, /^REQUEST_REJECTED/, /INVALID_ID/, /MAX_RECORDS_EXCEEDED/, /INVALID_FIELD/, /MALFORMED_QUERY/, /NO_PERMISSION/, /PDF_QUERY_ERROR/, /MISSING_REQUIRED_VALUE/, /INVALID_TYPE/, /TRANSACTION_FAILED/, /API_DISABLED/, /CANNOT_DELETE/, /ACCOUNTING_PERIOD_CLOSED/
+      when /invalid/, /^DUPLICATE_VALUE/, /^REQUEST_REJECTED/, /INVALID_ID/, /MAX_RECORDS_EXCEEDED/, /INVALID_FIELD/, /MALFORMED_QUERY/, /NO_PERMISSION/, /PDF_QUERY_ERROR/, /MISSING_REQUIRED_VALUE/, /INVALID_TYPE/, /TRANSACTION_FAILED/, /API_DISABLED/, /CANNOT_DELETE/, /ACCOUNTING_PERIOD_CLOSED/
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
       when /.*UNEXPECTED_ERROR/
         raise ZuoraAPI::Exceptions::ZuoraUnexpectedError.new(message, response, errors, success)
       when /.*soapenv:Server.*/
         if /^Invalid value.*for type.*|^Id is invalid|^date string can not be less than 19 charactors$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-        elsif /^unknown$|^Invalid white space character \(.*\) in text to output$|^Invalid null character in text to output$/.match(message).present?
+        elsif /^Invalid white space character \(.*\) in text to output$|^Invalid null character in text to output$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)
-      when /soapenv:Receiver/
-        if /^com.ctc.wstx.exc.WstxUnexpectedCharException: Unexpected character.*$/.match(message).present?
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-        end
-        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)
       else 
         raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Z:#{error}::#{message}", response, errors, success)
       end
@@ -1022,7 +900,7 @@ module ZuoraAPI
       base = self.url.include?(".com") ? self.url.split(".com")[0].concat(".com") : self.url.split(".eu")[0].concat(".eu")
       url = object ? "#{base}/apps/api/describe/#{object}" : "#{base}/apps/api/describe/"
       headers = self.entity_id.present? ? {"Zuora-Entity-Ids" => self.entity_id, 'Content-Type' => "text/xml; charset=utf-8"} : {'Content-Type' => "text/xml; charset=utf-8"}
-      response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic)}.merge(headers), :timeout => 130)
+      response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic)}.merge(headers), :timeout => 120)
 
       raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error.present? ? self.current_error : 'Describe call 401', response) if response.code == 401
 
@@ -1055,31 +933,35 @@ module ZuoraAPI
         end
         des_hash[:related_objects] = output_xml.xpath(".//related-objects").xpath(".//object").map{ |x| [x.xpath(".//name").text.to_sym, [ [:url, x.attributes["href"].value], [:label, x.xpath(".//name").text ] ].to_h] }.to_h
       end
-
-      return des_hash
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if !tries.zero?
-        tries -= 1
-        self.log(location: "Describe", exception: ex, message: "Timed out will retry after #{self.timeout_sleep} seconds", level: :debug)
-        sleep(self.timeout_sleep)
-        retry
+      if tries.zero?
+        if log_errors
+          if Rails.logger.class.to_s == "Ougai::Logger"
+            Rails.logger.error("Describe - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
+          else
+            Rails.logger.error("Describe - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
+          end
+        end
+        raise ex 
       end
 
-      self.log(location: "Describe", exception: ex, message: "Timed out", level: :error) if log_errors
-      raise ex
-
+      tries -= 1
+      sleep(self.timeout_sleep)
+      retry
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       if !tries.zero? && self.status == 'Active'
         tries -= 1
         Rails.logger.debug("Describe session expired. Starting new session.")
         self.new_session
         retry
+      else
+        Rails.logger.error("Describe session expired. Starting new session.") if log_errors
+        raise ex
       end
-
-      Rails.logger.error("Describe session expired. Starting new session.") if log_errors
-      raise ex
     rescue => ex
       raise ex
+    else
+      return des_hash
     end
 
     def rest_call(
@@ -1092,12 +974,11 @@ module ZuoraAPI
       z_session: true,
       session_type: :basic,
       timeout_retry: false,
-      timeout: 130,
+      timeout: 120,
       timeout_sleep_interval: self.timeout_sleep, 
       multipart: false,
       stream_body: false,
       output_exception_messages: true,
-      zuora_track_id: nil,
       **keyword_args,
       &block
     )
@@ -1107,13 +988,12 @@ module ZuoraAPI
 
       authentication_headers = {}
       if z_session
-        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type, zuora_track_id: zuora_track_id) }
+        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type) }
         if self.entity_id.present?
           authentication_headers["Zuora-Entity-Ids"] = self.entity_id if headers.dig("Zuora-Entity-Ids").nil?
           authentication_headers.delete_if { |key, value| ["entityId", "entityName"].include?(key.to_s) }
         end
       end
-      headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
       modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
 
@@ -1139,20 +1019,18 @@ module ZuoraAPI
         Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
 
         raise_errors(type: :JSON, body: output_json, response: response)
-      rescue => ex
+      rescue
         reset_files(body) if multipart
         raise
       end
-
-      return [output_json, response]
     rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
       if self.class.to_s == 'ZuoraAPI::Oauth' && ex.message.include?("Authentication type is not supported by this Login")
         session_type = :bearer
         retry
+      else
+        Rails.logger.debug("Rest Call - Session Bad Auth type")
+        raise ex
       end
-      Rails.logger.debug("Rest Call - Session Bad Auth type")
-      raise ex
-      
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       if !tries.zero? && z_session
         tries -= 1
@@ -1165,35 +1043,40 @@ module ZuoraAPI
         end
 
         retry
+      else
+        if errors.include?(ex.class)
+          raise ex
+        else
+          return [output_json, response]
+        end
       end
-
-      raise ex if errors.include?(ex.class)
-      return [output_json, response]
-      
     rescue *ZUORA_API_ERRORS => ex
-      raise ex if errors.include?(ex.class)
-      
-      response = ex.response unless response
-      return [output_json, response]
-  
+      if errors.include?(ex.class)
+        raise ex
+      else
+        response = ex.response unless response
+        return [output_json, response]
+      end
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
     rescue *CONNECTION_EXCEPTIONS => ex
-      if !tries.zero?
-        tries -= 1
-        self.log(location: "Rest Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
-        sleep(timeout_sleep_interval)
-        retry
+      if tries.zero?
+        if output_exception_messages
+          if Rails.logger.class.to_s == "Ougai::Logger"
+            Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
+          else
+            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
+          end
+        end
+        raise ex 
       end
 
-      self.log(location: "Rest Call", exception: ex, message: "Timed out", level: :error) if output_exception_messages
-      raise ex 
-   
+      tries -= 1
+      sleep(timeout_sleep_interval)
+      retry
     rescue *CONNECTION_READ_EXCEPTIONS => ex
-
       if !tries.zero?
         tries -= 1
-        self.log(location: "Rest Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
         if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
           retry
         elsif timeout_retry
@@ -1201,15 +1084,20 @@ module ZuoraAPI
           retry
         end
       end
-      
-      self.log(location: "Rest Call", exception: ex, message: "Timed out", level: :error) if output_exception_messages
-      ex = ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read/write timeout from 'https://#{rest_domain(endpoint: url)}'", nil, request) if ex.is_a?(Timeout::Error) && !ex.instance_of?(ZuoraAPI::Exceptions::ZuoraAPIReadTimeout)
+   
+      if output_exception_messages
+        if Rails.logger.class.to_s == "Ougai::Logger"
+          Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
+        else
+          Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
+        end
+      end
+      raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}", nil, request) if ex.instance_of?(Net::ReadTimeout)
       raise ex
-
     rescue => ex
       raise ex
-    ensure 
-      self.error_logger(ex) if defined?(ex) && Rails.logger.class.to_s == "Ougai::Logger"
+    else
+      return [output_json, response]
     end
 
     def update_create_tenant
@@ -1231,9 +1119,8 @@ module ZuoraAPI
       while !response["nextPage"].blank?
         url = self.rest_endpoint(response["nextPage"].split('/v1/').last)
         Rails.logger.debug("Fetch Catalog URL #{url}")
-        output_json, response = self.rest_call(debug: false, url: url, timeout_retry: true)
-
-        if !/(true|t|yes|y|1)$/.match(output_json['success'].to_s) || output_json['success'].class != TrueClass
+        output_json, response = self.rest_call(:debug => false, :url => url, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError], :timeout_retry => true )
+        if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}", response)
         end
         output_json["products"].each do |product|
@@ -1259,7 +1146,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, zuora_track_id: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 130, session_type: :basic, **execute_params)
+    def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, zuora_track_id: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 120, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       retry_count ||= timeout_retries
@@ -1364,20 +1251,14 @@ module ZuoraAPI
           return file_handle
         when Net::HTTPUnauthorized
           if z_session
-            unless (retry_count -= 1).zero?
+            if !(retry_count -= 1).zero?
               self.new_session
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError, 'Retrying'
+              raise response.class
+            else
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
             end
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
-          end
-          raise
-        when Net::HTTPNotFound
-          if url.include?(self.fileURL)
-            raise ZuoraAPI::Exceptions::FileDownloadError.new(
-              "The current tenant does not have a file with id '#{url.split('/').last}'"
-            )
           else
-            raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
+            raise
           end
         else
           raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
@@ -1388,81 +1269,133 @@ module ZuoraAPI
       sleep(5)
       if (retry_count -= 1) >= 0
         retry
+      else
+        Rails.logger.error("File Download Failed")
+        raise
       end
-      Rails.logger.error("File Download Failed")
-      raise
     end
 
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: "")
-      tries ||= 3
-
-      output_xml, input_xml = self.soap_call(debug: false, timeout_retry: true, zuora_track_id: z_track_id) do |xml|
-        xml['ns1'].create do
-          xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
-            xml['ns2'].Format 'csv'
-            xml['ns2'].Zip zip
-            xml['ns2'].Name 'googman'
-            xml['ns2'].Query query
-            xml['ns2'].Encrypted encrypted
+      begin
+        tries ||= 3
+        request = Nokogiri::XML::Builder.new do |xml|
+          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
+            xml['SOAP-ENV'].Header do
+              xml['ns1'].SessionHeader do
+                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
+              end
+            end
+            xml['SOAP-ENV'].Body do
+              xml['ns1'].create do
+                xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
+                  xml['ns2'].Format 'csv'
+                  xml['ns2'].Zip zip
+                  xml['ns2'].Name 'googman'
+                  xml['ns2'].Query query
+                  xml['ns2'].Encrypted encrypted
+                end
+              end
+            end
           end
         end
-      end
-      
-      id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
-
-      result = 'Waiting'
-      while result != "Completed"
-        sleep 3
-        output_xml, input_xml = self.soap_call(debug: false, timeout_retry: true, zuora_track_id: z_track_id) do |xml|
-          xml['ns1'].query do
-            xml['ns1'].queryString "SELECT Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
+
+        response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
+
+        output_xml = Nokogiri::XML(response_query.body)
+        raise_errors(type: :SOAP, body: output_xml, response: response_query) if output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
+
+        # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
+        
+        id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
+
+        confirmRequest = Nokogiri::XML::Builder.new do |xml|
+          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
+            xml['SOAP-ENV'].Header do
+              xml['ns1'].SessionHeader do
+                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
+              end
+            end
+            xml['SOAP-ENV'].Body do
+              xml['ns1'].query do
+                xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
+              end
+            end
           end
         end
-        result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
-      end
+        result = 'Waiting'
 
-      file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
-      export_file = get_file(:url => self.fileURL(file_id))
-      export_file_path = export_file.path
-
-      if extract && zip
-        require "zip"
-        new_path = export_file_path.partition('.zip').first
-        zipped = Zip::File.open(export_file_path)
-        file_handle = zipped.entries.first
-        file_handle.extract(new_path)
-        File.delete(export_file_path)
-        return new_path
-      else
-        return export_file_path
-      end
-    rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero?
-        Rails.logger.info("Export call failed - Trace ID: #{z_track_id}")
-        self.new_session
-        retry
-      end
-      raise ex
+        while result != "Completed"
+          sleep 3
+          response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
 
-    rescue ZuoraAPI::Exceptions::ZuoraUnexpectedError => ex
-      if !(tries -= 1).zero?
-        Rails.logger.info("Trace ID: #{z_track_id} UnexpectedError, will retry after 10 seconds")
-        sleep(self.timeout_sleep)
-        retry
-      end
-      raise ex
-      
-    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if !(tries -= 1).zero?
-        Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
-        sleep(self.timeout_sleep)
-        retry
+          output_xml = Nokogiri::XML(response_query.body)
+          result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
+          status_code = response_query.code if response_query
+
+          raise_errors(type: :SOAP, body: output_xml, response: response_query) if result.blank? || result == "Failed"
+          # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if result.blank? || result == "Failed"
+        end
+
+        file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
+        export_file = get_file(:url => self.fileURL(file_id))
+        export_file_path = export_file.path
+        Rails.logger.debug("=====> Export path #{export_file.path}")
+
+        if extract && zip
+          require "zip"
+          new_path = export_file_path.partition('.zip').first
+          zipped = Zip::File.open(export_file_path)
+          file_handle = zipped.entries.first
+          file_handle.extract(new_path)
+          File.delete(export_file_path)
+          return new_path
+        else
+          return export_file_path
+        end
+      rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+        if !(tries -= 1).zero?
+          Rails.logger.info("Export call failed - Trace ID: #{z_track_id}")
+          self.new_session
+          retry
+        else
+          raise ex
+        end
+
+      rescue ZuoraAPI::Exceptions::ZuoraUnexpectedError => ex
+        if !(tries -= 1).zero?
+          Rails.logger.info("Trace ID: #{z_track_id} UnexpectedError, will retry after 10 seconds")
+          sleep 10
+          retry
+        else
+          raise ex
+        end
+
+      rescue *ZUORA_API_ERRORS => ex
+        raise ex
+
+      rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
+        if !(tries -= 1).zero?
+          Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
+          sleep 5
+          retry
+        else
+          raise ex
+        end
+
+      rescue Errno::ECONNRESET => ex
+        if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
+          retry
+        else
+          raise ex
+        end
+
+      rescue ZuoraAPI::Exceptions::BadEntityError => ex
+        raise ex
       end
-      raise ex
     end
 
     def query(query, parse = false)
-      output_xml, input_xml = self.soap_call(debug: false, timeout_retry: true) do |xml|
+      output_xml, input_xml = self.soap_call({:debug => false, :timeout_retry => true}) do |xml|
         xml['ns1'].query do
           xml['ns1'].queryString query
         end