zuora_api 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b331dbd16a302e01b8cf4dc918343eb3c3bc62e809c15e4020eb2463b0b725ac
-  data.tar.gz: c8f2f3f7c3153280e0624e38658b51f2cdd2e3ded90ad916701c2392c21223d1
+  metadata.gz: 2c377d99b1a4c4a64d1b46d45b19e42136da2e0faba049e7a45621b3daaa41ad
+  data.tar.gz: e00b3a6e9628aed4086190a3be983bd7998196812df9d53010c274f882a36749
 SHA512:
-  metadata.gz: 29be5568ae328fe982f8c25f25d802f9ab941c2e0a4aa247d12ba1ef33afb25a77e7d738a1509e96a1e28ef8b07c68a205a9c3140dcc83f36a36536cc5d6c42e
-  data.tar.gz: b450c458b5402843f9fdf57789cfaf28216c14d74505fe031c95bee79505f6273164f299c78dc73e4848c0ed9c620b41f3cb7ef219774e74d216d12c8a26f0c3
+  metadata.gz: 14c76c2a211f55a38d79940436241c3fa9203a2c1a960415a3a2287950adb6059461571703530d4754e803833f3ffc98e42182c50588498a51070a0a6984cadb
+  data.tar.gz: a2176a640fb0f77bbc0893f5161c30c822a9a8cc1147b33e6f088ce60240666a19853f82e5d85ecf676273c9a9ecc59c7aaee006f0aa63c8fd52b8fdc60ee2d1

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2021 Zuora, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -145,3 +145,12 @@ Both do the same thing except one returns a url(data_export_insights) to downloa
 objectype: "ACCOUNT/USER"
 
 segmentuuid: A single or array of string or int of a segment uuid(s) that you get from the describe call. The csv holds a column with a bool that represents if that User or Account belongs to that segment.
+
+### License Information
+IN THE EVENT YOU ARE AN EXISTING ZUORA CUSTOMER, USE OF THIS SOFTWARE IS GOVERNEDBY THE MIT LICENSE SET FORTH BELOW AND NOT THE MASTER SUBSCRIPTION AGREEMENT OR OTHER COMMERCIAL AGREEMENT ENTERED INTO BETWEEN YOU AND ZUORA (“AGREEMENT”). FOR THE AVOIDANCE OF DOUBT, ZUORA’S OBLIGATIONS WITH RESPECT TO TECHNICAL SUPPORT, UPTIME, INDEMNIFICATION, AND SECURITY SET FORTH IN THE AGREEMENT DO NOT APPLY TO THE USE OF THIS SOFTWARE.
+
+Copyright 2021 Zuora, Inc.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/zuora_api.rb

@@ -4,6 +4,8 @@ require "zuora_api/logins/basic"
 require "zuora_api/logins/oauth"
 require 'zuora_api/exceptions'
 require "insights_api/login"
+require "ougai"
+
 module ZuoraAPI
   # Your code goes here...
 end

data/lib/zuora_api/exceptions.rb

@@ -40,6 +40,19 @@ module ZuoraAPI
       def to_s
         @message || @default_message
       end
+
+      def parse_message(message)
+        case message
+        when /^Invalid Oauth Client Id$/, /^Unable to generate token.$/
+          @message = "Invalid login, please check client ID and Client Secret or URL endpoint"
+        when /^Forbidden$/
+          @message = "The user associated to OAuth credential set has been deactivated."
+        when /^Invalid login. User name and password do not match.$/
+          @message = "Invalid login, please check username and password or URL endpoint"
+        else
+          @message = message
+        end
+      end
     end
 
     class BadEntityError < Error
@@ -177,14 +190,15 @@ module ZuoraAPI
     end
 
     class ZuoraAPITemporaryError < Error
-      attr_reader :code, :response
+      attr_reader :code, :response, :errors
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
+      def initialize(message = nil, response = nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = parse_message(message)
         @response = response
         @default_message = "There is a temporary error with zuora system."
+        @errors = errors
       end
 
       def to_s
@@ -224,7 +238,7 @@ module ZuoraAPI
       end
     end
 
-    class ZuoraAPIReadTimeout < Net::ReadTimeout
+    class ZuoraAPIReadTimeout < Timeout::Error
       attr_reader :code, :response, :request
       attr_writer :default_message
 

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_Endpoint = '96.0'
+    MIN_Endpoints = {'Test': '107.0', 'Sandbox': '107.0', 'Production': '107.0', 'Performance': '107.0', 'Services': '96.0', 'Unknown': '96.0', 'Staging': '107.0'}.freeze
     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 = [
-      Net::ReadTimeout,
+      Timeout::Error,
       Errno::ECONNRESET,
       Errno::EPIPE
     ].freeze
@@ -39,21 +39,23 @@ module ZuoraAPI
 
     ZUORA_SERVER_ERRORS = [
       ZuoraAPI::Exceptions::ZuoraAPIInternalServerError,
-      ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
-      ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
+        ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
+        ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
       ZuoraAPI::Exceptions::ZuoraUnexpectedError
     ].freeze
-    
+
     attr_accessor :region, :url, :wsdl_number, :current_session, :bearer_token, :oauth_session_expires_at, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
 
     def initialize(url: nil, entity_id: nil, session: nil, status: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
       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
@@ -65,7 +67,6 @@ 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
@@ -252,7 +253,7 @@ module ZuoraAPI
     end
 
     def update_environment
-      if !self.url.blank?
+      if !self.hostname.blank?
         case self.hostname
         when /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/
           self.environment = 'Sandbox'
@@ -275,13 +276,13 @@ module ZuoraAPI
     end
 
     def update_zconnect_provider
-      region = update_region
-      environment = update_environment
+      update_region if self.region.blank?
+      update_environment if self.environment.blank?
       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[region][environment]
+      self.zconnect_provider = mappings[self.region][self.environment]
     end
 
     def aqua_endpoint(url="")
@@ -298,7 +299,7 @@ module ZuoraAPI
       update_environment
       endpoint = url
       url_postfix = {"US" => ".", "EU" => ".eu.", "NA" => ".na."}[self.region]
-    
+
       case self.environment
       when 'Test'
         endpoint = "https://rest.test#{url_postfix}zuora.com"
@@ -321,8 +322,8 @@ module ZuoraAPI
       return domain ? endpoint.concat(prefix).concat(url) : prefix.concat(url)
     end
 
-    def rest_domain
-      return URI(self.rest_endpoint).host
+    def rest_domain(endpoint: self.rest_endpoint)
+      return URI(endpoint).host
     end
 
     def fileURL(url="")
@@ -334,10 +335,41 @@ 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?
@@ -346,14 +378,13 @@ 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) if self.status == 'Active'
+            self.get_z_session(zuora_track_id: zuora_track_id)
           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
@@ -366,25 +397,25 @@ 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
 
     def soap_call(
-      ns1: 'ns1', 
-      ns2: 'ns2', 
-      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: 120,
-      timeout_sleep_interval: self.timeout_sleep, 
+      ns1: 'ns1',
+      ns2: 'ns2',
+      batch_size: nil,
+      headers: {},
+      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_sleep_interval: self.timeout_sleep,
       output_exception_messages: true,
+      skip_session: false,
       **keyword_args)
       tries ||= 2
       xml = Nokogiri::XML::Builder.new do |xml|
@@ -394,8 +425,10 @@ module ZuoraAPI
                                  'xmlns:api' => "http://api.zuora.com/",
                                  "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: zuora_track_id)
+            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
             end
             if single_transaction
               xml["#{ns1}"].CallOptions do
@@ -413,12 +446,11 @@ 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 = { 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'}
+      headers.merge!({ '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(
@@ -435,7 +467,11 @@ 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")
@@ -447,39 +483,33 @@ 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
-      if errors.include?(ex.class)
-        raise ex
-      else
-        response = ex.response unless response
-        return output_xml, input_xml, response
-      end
+      raise ex if errors.include?(ex.class)
+
+      response = ex.response unless response
+      return output_xml, input_xml, response
+
     rescue *CONNECTION_EXCEPTIONS => ex
-      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 
+      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
       end
 
-      tries -= 1
-      sleep(timeout_sleep_interval)
-      retry
+      self.log(location: "SOAP Call", exception: ex, message: "Timed out", level: :error)  if output_exception_messages
+      raise ex
+
     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
@@ -488,19 +518,76 @@ module ZuoraAPI
         end
       end
 
-      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)
+      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)
       raise ex
+
     rescue => ex
       raise ex
-    else
-      return output_xml, input_xml, response
+    ensure
+      self.error_logger(ex) if defined?(ex)
+    end
+
+    def error_logger(ex)
+      return unless Rails.logger.is_a? Ougai::Logger
+
+      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.is_a? 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
     end
 
     def raise_errors(type: :SOAP, body: nil, response: nil)
@@ -517,24 +604,24 @@ module ZuoraAPI
       end
 
       if [502,503].include?(response.code)
-        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{request_uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from 'https://#{rest_domain(endpoint: request_uri)}'", response)
       end
 
       # Check failure response code
       case response.code
       when 504
-        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from #{request_uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from 'https://#{rest_domain(endpoint: 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
-        
+
       else
         if body.class == Hash
           case request_path
           when /^\/v1\/connections$/
-            response_headers = response.headers.to_h      
+            response_headers = response.headers.to_h
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Missing cookies for authentication call", response) if response_headers['set-cookie'].blank?
-            z_session_cookie = response_headers.fetch('set-cookie', []).select{|x| x.match(/^ZSession=.*/) }.first 
+            z_session_cookie = response_headers.fetch('set-cookie', []).select{|x| x.match(/^ZSession=.*/) }.first
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Missing ZSession cookie for authentication call", response) if z_session_cookie.blank?
           end
         end
@@ -544,6 +631,10 @@ 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"]',
@@ -551,12 +642,12 @@ module ZuoraAPI
            ).present?
           result = body.xpath('//ns2:Status', 'ns2' => 'http://object.api.zuora.com/').text
           if result == 'Failed'
-            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'  
+            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?
             else
-              error = 'FATAL_ERROR'
               message = 'Export failed due to unknown reason. Consult api logs.'
             end
           end
@@ -577,19 +668,19 @@ module ZuoraAPI
         end
 
         self.errors_via_content_type(response: response, type: :xml)
-        
+
       when :JSON
         case request_path
         when /^\/query\/jobs.*/  #DataQuery Paths
           return if body.class != Hash
           case match_string
-          when /^GET::200::\/query\/jobs\/([a-zA-Z0-9\-_]+)$/ #Get DQ job, Capture of the id is present if needed in future error responses. 
+          when /^GET::200::\/query\/jobs\/([a-zA-Z0-9\-_]+)$/ #Get DQ job, Capture of the id is present if needed in future error responses.
             if body.dig('data', "errorCode") == "LINK_10000005"
               raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(body.dig('data', "errorMessage"), response)
-            elsif (body.dig('data', "errorMessage").present? || body.dig('data', "queryStatus") == "failed") 
+            elsif (body.dig('data', "errorMessage").present? || body.dig('data', "queryStatus") == "failed")
               raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('data', "errorMessage"), response)
             end
-          when /^GET::404::\/query\/jobs\/([a-zA-Z0-9\-_]+)$/ #Get DQ job not found, capture of the id is present if needed in future error responses. 
+          when /^GET::404::\/query\/jobs\/([a-zA-Z0-9\-_]+)$/ #Get DQ job not found, capture of the id is present if needed in future error responses.
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('message'), response) if body.dig('message').present?
           when /^POST::400::\/query\/jobs$/ #Create DQ job
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('message'), response) if body.dig('message').present?
@@ -605,14 +696,31 @@ 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)
-          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
+          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
 
           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)
@@ -635,7 +743,7 @@ module ZuoraAPI
           end
 
           #Oauth Tokens - User deactivated
-          if body['path'] == '/oauth/token' 
+          if body['path'] == '/oauth/token'
             if body['status'] == 403 && response.code == 403
               raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Forbidden", response)
             elsif body['status'] == 400 && response.code == 400 && body['message'].include?("Invalid client id")
@@ -644,7 +752,11 @@ module ZuoraAPI
           end
 
           if body['error'] == 'Unauthorized' && body['status'] == 401
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
+            if body['message'].present?
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(body['message'], response)
+            else
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
+            end
           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)
@@ -667,7 +779,7 @@ module ZuoraAPI
           end
           #Internal Server Error
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(60)
-            if messages_array.uniq.size == 1 
+            if messages_array.uniq.size == 1
               if messages_array.first.match(/^Transaction declined.*|^There is an invoice pending tax.*|^The Zuora GetTax call to Avalara.*|^The tax calculation call to Zuora Connect returned the following error: Status Code: 4.*/)
                 raise ZuoraAPI::Exceptions::ZuoraAPIError.new(messages_array.first, response)
               end
@@ -740,18 +852,18 @@ module ZuoraAPI
         self.errors_via_content_type(response: response, type: :json)
 
         #All other errors
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new(response.body, response) if ![200,201].include?(response.code) 
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new(response.body, response) if ![200,201].include?(response.code)
       end
     end
 
     def errors_via_content_type(response: nil, type: :xml)
       response_content_types = response.headers.transform_keys(&:downcase).fetch('content-type', []).first || ""
-      
+
       if response_content_types.include?('application/json') && type != :json
         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')) and type != :xml
+
+      elsif (response_content_types.include?('application/xml') || response_content_types.include?('text/xml') || response_content_types.include?('application/soap+xml')) and type != :xml
         output_xml = Nokogiri::XML(response.body)
         self.raise_errors(type: :SOAP, body: output_xml, response: response)
 
@@ -770,8 +882,10 @@ module ZuoraAPI
           when /Service Unavailable/
             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)    
-          else 
+            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
         end
@@ -781,7 +895,7 @@ module ZuoraAPI
 
       raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response) if response.code == 500
     end
-          
+
 
     def get_soap_error_and_message(body)
       error   = body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
@@ -797,6 +911,11 @@ 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 = []
@@ -840,18 +959,23 @@ module ZuoraAPI
           raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-      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/
+      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/
         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 /^Invalid white space character \(.*\) in text to output$|^Invalid null character in text to output$/.match(message).present?
+        elsif /^unknown$|^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)
-      else 
+      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
     end
@@ -900,7 +1024,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 => 120)
+      response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic)}.merge(headers), :timeout => 130)
 
       raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error.present? ? self.current_error : 'Describe call 401', response) if response.code == 401
 
@@ -933,35 +1057,31 @@ 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?
-        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 
+      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
       end
 
-      tries -= 1
-      sleep(self.timeout_sleep)
-      retry
+      self.log(location: "Describe", exception: ex, message: "Timed out", level: :error) if log_errors
+      raise ex
+
     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(
@@ -974,11 +1094,12 @@ module ZuoraAPI
       z_session: true,
       session_type: :basic,
       timeout_retry: false,
-      timeout: 120,
-      timeout_sleep_interval: self.timeout_sleep, 
+      timeout: 130,
+      timeout_sleep_interval: self.timeout_sleep,
       multipart: false,
       stream_body: false,
       output_exception_messages: true,
+      zuora_track_id: nil,
       **keyword_args,
       &block
     )
@@ -988,12 +1109,13 @@ module ZuoraAPI
 
       authentication_headers = {}
       if z_session
-        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type) }
+        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type, zuora_track_id: zuora_track_id) }
         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)
 
@@ -1019,18 +1141,20 @@ module ZuoraAPI
         Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
 
         raise_errors(type: :JSON, body: output_json, response: response)
-      rescue
+      rescue => ex
         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
@@ -1043,40 +1167,35 @@ 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
-      if errors.include?(ex.class)
-        raise ex
-      else
-        response = ex.response unless response
-        return [output_json, response]
-      end
+      raise ex if errors.include?(ex.class)
+
+      response = ex.response unless response
+      return [output_json, response]
+
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
     rescue *CONNECTION_EXCEPTIONS => ex
-      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 
+      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
       end
 
-      tries -= 1
-      sleep(timeout_sleep_interval)
-      retry
+      self.log(location: "Rest Call", exception: ex, message: "Timed out", level: :error) if output_exception_messages
+      raise ex
+
     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
@@ -1084,20 +1203,15 @@ module ZuoraAPI
           retry
         end
       end
-   
-      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)
+
+      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)
       raise ex
+
     rescue => ex
       raise ex
-    else
-      return [output_json, response]
+    ensure
+      self.error_logger(ex) if defined?(ex)
     end
 
     def update_create_tenant
@@ -1119,8 +1233,9 @@ 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, :errors => [ZuoraAPI::Exceptions::ZuoraAPISessionError], :timeout_retry => true )
-        if !output_json['success'] =~ (/(true|t|yes|y|1)$/i) || output_json['success'].class != TrueClass
+        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
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}", response)
         end
         output_json["products"].each do |product|
@@ -1146,7 +1261,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: 120, 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: 130, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       retry_count ||= timeout_retries
@@ -1251,14 +1366,20 @@ module ZuoraAPI
           return file_handle
         when Net::HTTPUnauthorized
           if z_session
-            if !(retry_count -= 1).zero?
+            unless (retry_count -= 1).zero?
               self.new_session
-              raise response.class
-            else
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError, 'Retrying'
             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
+            raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
           end
         else
           raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
@@ -1269,133 +1390,81 @@ 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: "")
-      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
+      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
           end
         end
+      end
 
-        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
+      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
+      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}'"
           end
         end
-        result = 'Waiting'
-
-        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)
-
-          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
+        result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
+      end
 
-      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
+      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
 
-      rescue Errno::ECONNRESET => ex
-        if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
-          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(self.timeout_sleep)
+        retry
+      end
+      raise ex
 
-      rescue ZuoraAPI::Exceptions::BadEntityError => 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(self.timeout_sleep)
+        retry
       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