zuora_api 1.7.7 → 1.7.08

data/lib/zuora_api/login.rb

@@ -5,7 +5,7 @@ require 'zuora_api/exceptions'
 
 module ZuoraAPI
   class Login
-    ENVIRONMENTS = [TEST = 'Test', SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
+    ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
     MIN_Endpoint = '96.0'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
@@ -16,8 +16,7 @@ module ZuoraAPI
       Errno::ECONNREFUSED,
       SocketError,
       Errno::EHOSTUNREACH,
-      Errno::EADDRNOTAVAIL,
-      Errno::ETIMEDOUT,
+      Errno::EADDRNOTAVAIL
     ].freeze
 
     CONNECTION_READ_EXCEPTIONS = [
@@ -31,17 +30,7 @@ module ZuoraAPI
       ZuoraAPI::Exceptions::ZuoraAPIRequestLimit,
       ZuoraAPI::Exceptions::ZuoraAPILockCompetition,
       ZuoraAPI::Exceptions::ZuoraAPITemporaryError,
-      ZuoraAPI::Exceptions::ZuoraDataIntegrity,
-      ZuoraAPI::Exceptions::ZuoraAPIInternalServerError,
-      ZuoraAPI::Exceptions::ZuoraUnexpectedError,
-      ZuoraAPI::Exceptions::ZuoraAPIUnkownError
-    ].freeze
-
-    ZUORA_SERVER_ERRORS = [
-      ZuoraAPI::Exceptions::ZuoraAPIInternalServerError,
-      ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
-      ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
-      ZuoraAPI::Exceptions::ZuoraUnexpectedError
+      ZuoraAPI::Exceptions::ZuoraDataIntegrity
     ].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
@@ -72,12 +61,27 @@ module ZuoraAPI
 
     def get_identity(cookies)
       zsession = cookies["ZSession"]
+      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
         if !zsession.blank?
           response = HTTParty.get("https://#{self.hostname}/apps/v1/identity", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
           output_json = JSON.parse(response.body)
+        elsif zconnect_accesstoken.present?
+          begin
+            code = zconnect_accesstoken.split("#!").last
+            encrypted_token, tenant_id = Base64.decode64(code).split(":")
+            body = {'token' => encrypted_token}.to_json
+          rescue => ex
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Invalid ZConnect Cookie")
+          end
+          response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/identity", :body => body, :headers => { 'Content-Type' => 'application/json' })
+          output_json = JSON.parse(response.body)
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+          if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+          end
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -88,12 +92,20 @@ module ZuoraAPI
 
     def get_full_nav(cookies)
       zsession = cookies["ZSession"]
+      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
         if zsession.present?
           response = HTTParty.get("https://#{self.hostname}/apps/v1/navigation", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
           output_json = JSON.parse(response.body)
+        elsif zconnect_accesstoken.present?
+          response = HTTParty.get("https://#{self.hostname}/apps/zconnectsession/navigation", :headers => {'Cookie' => "#{self.zconnect_provider}=#{zconnect_accesstoken}",'Content-Type' => 'application/json'})
+          output_json = JSON.parse(response.body)
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+          if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+          end
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -104,12 +116,20 @@ module ZuoraAPI
 
     def set_nav(state, cookies)
       zsession = cookies["ZSession"]
+      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
         if !zsession.blank?
           response = HTTParty.put("https://#{self.hostname}/apps/v1/preference/navigation", :body => state.to_json, :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
           output_json = JSON.parse(response.body)
+        elsif !zconnect_accesstoken.blank?
+          response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/navigationstate", :body => state.to_json, :headers => {'Cookie' => "#{self.zconnect_provider}=#{zconnect_accesstoken}", 'Content-Type' => 'application/json'})
+          output_json = JSON.parse(response.body)
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+          if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+          end
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -120,12 +140,20 @@ module ZuoraAPI
 
     def refresh_nav(cookies)
       zsession = cookies["ZSession"]
+      zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
         if !zsession.blank?
           response = HTTParty.post("https://#{self.hostname}/apps/v1/navigation/fetch", :headers => {'Cookie' => "ZSession=#{zsession}", 'Content-Type' => 'application/json'})
           output_json = JSON.parse(response.body)
+        elsif !zconnect_accesstoken.blank?
+          response = HTTParty.post("https://#{self.hostname}/apps/zconnectsession/refresh-navbarcache", :headers => {'Cookie' => "#{self.zconnect_provider}=#{zconnect_accesstoken}", 'Content-Type' => 'application/json'})
+          output_json = JSON.parse(response.body)
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+          if zconnect_accesstoken.blank? && cookies.keys.any? { |x| x.include? "ZConnect"}
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}")
+          else
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+          end
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -134,21 +162,27 @@ module ZuoraAPI
       return output_json
     end
 
+    def get_zconnect_accesstoken(cookies)
+      accesstoken = nil
+      self.update_zconnect_provider
+      if !cookies[self.zconnect_provider].nil? && !cookies[self.zconnect_provider].empty?
+        accesstoken = cookies[self.zconnect_provider]
+      end
+      return accesstoken
+    end
+
     def reporting_url(path)
       map = {"US" => {"Sandbox" => "https://zconnectsandbox.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.zuora.com/api/rest/v1/",
-                      "Test" => "https://reporting-sbx.zan.0001.sbx.auw2.zuora.com/api/rest/v1/",
-                      "Staging" => "https://reporting-stg11.zan.svc.auw2.zuora.com/api/rest/v1/",
-                      "Performance" => "https://zconnectpt1.zuora.com/api/rest/v1/",
-                      "Services" => "https://reporting-svc08.svc.auw2.zuora.com/api/rest/v1/"},
+                      "Services"=> ""},
              "EU" => {"Sandbox" => "https://zconnect.sandbox.eu.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.eu.zuora.com/api/rest/v1/",
-                      "Services"=> "https://reporting-sbx0000.sbx.aec1.zuora.com/api/rest/v1/"},
+                      "Services"=> ""},
              "NA" => {"Sandbox" => "https://zconnect.sandbox.na.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.na.zuora.com/api/rest/v1/",
                       "Services"=> ""}
       }
-      return map[self.region][self.environment].insert(-1, path)
+      return map[zuora_client.region][zuora_client.environment].insert(-1, path)
     end
 
     # There are two ways to call this method. The first way is best.
@@ -198,7 +232,7 @@ module ZuoraAPI
     end
 
     def self.environments
-      %w(Sandbox Production Services Performance Staging Test)
+      %w(Sandbox Production Services Performance Staging)
     end
 
     def self.regions
@@ -210,13 +244,11 @@ module ZuoraAPI
                        "Production" => "https://www.zuora.com/apps/services/a/",
                        "Performance" => "https://pt1.zuora.com/apps/services/a/",
                        "Services" => "https://services347.zuora.com/apps/services/a/",
-                       "Staging" => "https://staging2.zuora.com/apps/services/a/",
-                       "Test" => "https://test.zuora.com/apps/services/a/"},
+                       "Staging" => "https://staging2.zuora.com/apps/services/a/"},
               "EU" => {"Sandbox" => "https://sandbox.eu.zuora.com/apps/services/a/",
                        "Production" => "https://eu.zuora.com/apps/services/a/",
                        "Performance" => "https://pt1.eu.zuora.com/apps/services/a/",
-                       "Services" => "https://services347.eu.zuora.com/apps/services/a/",
-                       "Test" => "https://test.eu.zuora.com/apps/services/a/"},
+                       "Services" => "https://services347.eu.zuora.com/apps/services/a/"},
               "NA" => {"Sandbox" => "https://sandbox.na.zuora.com/apps/services/a/",
                        "Production" => "https://na.zuora.com/apps/services/a/",
                        "Performance" => "https://pt1.na.zuora.com/apps/services/a/",
@@ -253,18 +285,15 @@ module ZuoraAPI
 
     def update_environment
       if !self.url.blank?
-        case self.hostname
-        when /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/
+        if /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/ === self.hostname
           self.environment = 'Sandbox'
-        when /(?<=\.|\/|^)(service[\d]*|services[\d]*|ep-edge)(?=\.|\/|$)/
+        elsif /(?<=\.|\/|^)(service[\d]*|services[\d]*|ep-edge)(?=\.|\/|$)/ === self.hostname
           self.environment = 'Services'
-        when /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/
+        elsif /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/ === self.hostname
           self.environment = 'Performance'
-        when /(?<=\.|\/|^)(staging1|staging2|stg)(?=\.|\/|$)/
+        elsif /(?<=\.|\/|^)(staging1|staging2|stg)(?=\.|\/|$)/ === self.hostname
           self.environment = 'Staging'
-        when /(?<=\.|\/|^)(test)(?=\.|\/|$)/
-          self.environment = 'Test'
-        when /(?<=\.|\/|^)(www|api)(?=\.|\/|$)/, /(^|tls10\.|origin-www\.|zforsf\.|eu\.|na\.)(zuora\.com)/
+        elsif is_prod_env
           self.environment = 'Production'
         else
           self.environment = 'Unknown'
@@ -274,14 +303,25 @@ module ZuoraAPI
       end
     end
 
+    def is_prod_env
+      is_prod = false
+      www_or_api = /(?<=\.|\/|^)(www|api)(?=\.|\/|$)/ === self.hostname
+      host_prefix_match = /(^|tls10\.|origin-www\.|zforsf\.|eu\.|na\.)(zuora\.com)/ === self.hostname
+      if www_or_api || host_prefix_match
+        is_prod = true
+      end
+      return is_prod
+    end
+
     def update_zconnect_provider
       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"},
+      mappings = {"US" => {"Sandbox" => "ZConnectSbx", "KubeSTG" => "ZConnectDev", "KubeDEV" => "ZConnectDev", "KubePROD" => "ZConnectDev", "Services" => "ZConnectQA", "Production" => "ZConnectProd", "Performance" => "ZConnectPT1", "Staging" => "ZConnectQA"},
+                  "NA" => {"Sandbox" => "ZConnectSbxNA", "Services" => "ZConnectQANA", "Production" => "ZConnectProdNA", "Performance" => "ZConnectPT1NA"},
+                  "EU" => {"Sandbox" => "ZConnectSbxEU", "Services" => "ZConnectQAEU", "Production" => "ZConnectProdEU", "Performance" => "ZConnectPT1EU"},
                   "Unknown" => {"Unknown" => "Unknown"}}
       self.zconnect_provider = mappings[region][environment]
+      # raise "Can't find ZConnect Provider for #{region} region and #{environment} environment" if self.zconnect_provider.nil?
     end
 
     def aqua_endpoint(url="")
@@ -294,35 +334,45 @@ module ZuoraAPI
       return "#{url_slash_apps_slash}api/#{url}"
     end
 
-    def rest_endpoint(url="", domain=true, prefix='/v1/')
+    def rest_endpoint(url="")
       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"
       when 'Sandbox'
-        endpoint = "https://rest.sandbox#{url_postfix}zuora.com"
-        endpoint = "https://rest.apisandbox.zuora.com"  if self.region == "US"
+        case self.region
+        when 'US'
+          endpoint = "https://rest.apisandbox.zuora.com/v1/".concat(url)
+        when 'EU'
+          endpoint = "https://rest.sandbox.eu.zuora.com/v1/".concat(url)
+        when 'NA'
+          endpoint = "https://rest.sandbox.na.zuora.com/v1/".concat(url)
+        end
       when 'Production'
-        endpoint = "https://rest#{url_postfix}zuora.com"
+        case self.region
+        when 'US'
+          endpoint = "https://rest.zuora.com/v1/".concat(url)
+        when 'EU'
+          endpoint = "https://rest.eu.zuora.com/v1/".concat(url)
+        when 'NA'
+          endpoint = "https://rest.na.zuora.com/v1/".concat(url)
+        end
       when 'Performance'
-        endpoint = "https://rest.pt1.zuora.com"
+        endpoint = "https://rest.pt1.zuora.com/v1/".concat(url)
       when 'Services'
         https = /https:\/\/|http:\/\//.match(self.url)[0]
         host = self.hostname
-        endpoint = "#{https}rest#{host}"
+        endpoint = "#{https}rest#{host}/v1/#{url}"
       when 'Staging'
-        endpoint = "https://rest-staging2.zuora.com"
+        endpoint = "https://rest-staging2.zuora.com/v1/".concat(url)
       when 'Unknown'
         raise "Environment unknown, returning passed in parameter unaltered"
       end
-      return domain ? endpoint.concat(prefix).concat(url) : prefix.concat(url)
+      return endpoint
     end
 
     def rest_domain
-      return URI(self.rest_endpoint).host
+      return URI(self.rest_endpoint).host      
     end
 
     def fileURL(url="")
@@ -333,10 +383,10 @@ module ZuoraAPI
       return self.wsdl_number > 68 ? '%Y-%m-%d' : '%Y-%m-%dT%H:%M:%S'
     end
 
-    def new_session(auth_type: :basic, debug: false, zuora_track_id: nil)
+    def new_session(auth_type: :basic, debug: false)
     end
 
-    def get_session(prefix: false, auth_type: :basic, zuora_track_id: nil)
+    def get_session(prefix: false, auth_type: :basic)
       Rails.logger.debug("Get session for #{auth_type} - #{self.class.to_s}") if Rails.env.to_s == 'development'
       case auth_type
       when :basic
@@ -344,13 +394,13 @@ module ZuoraAPI
           case self.class.to_s
           when 'ZuoraAPI::Oauth'
             if self.bearer_token.blank? || self.oauth_expired?
-              self.new_session(auth_type: :bearer, zuora_track_id: zuora_track_id)
+              self.new_session(auth_type: :bearer)
             end
-            self.get_z_session(zuora_track_id: zuora_track_id) if self.status == 'Active'
+            self.get_z_session if self.status == 'Active'
           when 'ZuoraAPI::Basic'
-            self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
+            self.new_session(auth_type: :basic)
           else
-            self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
+            raise "No Zuora Login Specified"
           end
         end
         raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
@@ -359,33 +409,17 @@ module ZuoraAPI
         case self.class.to_s
         when 'ZuoraAPI::Oauth'
           if self.bearer_token.blank? || self.oauth_expired?
-            self.new_session(auth_type: :bearer, zuora_track_id: zuora_track_id)
+            self.new_session(auth_type: :bearer)
           end
         when 'ZuoraAPI::Basic'
           raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login, does not support Authentication of Type: #{auth_type}")
-        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, 
-      output_exception_messages: true,
-      **keyword_args)
+    def soap_call(ns1: 'ns1', ns2: 'ns2', batch_size: nil, single_transaction: false, debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS), z_session: true, timeout_retry: false, timeout: 120,**keyword_args)
       tries ||= 2
       xml = Nokogiri::XML::Builder.new do |xml|
         xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/",
@@ -395,7 +429,7 @@ module ZuoraAPI
                                  "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)
+              xml["#{ns1}"].session self.get_session(prefix: false, auth_type: :basic)
             end
             if single_transaction
               xml["#{ns1}"].CallOptions do
@@ -418,34 +452,15 @@ module ZuoraAPI
       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['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
-
-      request = HTTParty::Request.new(
-        Net::HTTP::Post,
-        self.url,
-        body: xml.doc.to_xml(:save_with => XML_SAVE_OPTIONS).strip,
-        headers: headers,
-        timeout: timeout,
-      )
-
-      response = request.perform
-
+      response = HTTParty.post(self.url,:body => xml.doc.to_xml(:save_with => XML_SAVE_OPTIONS).strip, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => timeout)
       output_xml = Nokogiri::XML(response.body)
       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)
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !tries.zero? && z_session
-        tries -= 1
+      if !(tries -= 1).zero? && z_session
         Rails.logger.debug("SOAP Call - Session Invalid")
-
-        begin
-          self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
-        rescue *ZUORA_API_ERRORS => ex
-          return output_xml, input_xml, ex.response
-        end
-
+        self.new_session(auth_type: :basic)
         retry
       else
         if errors.include?(ex.class)
@@ -458,45 +473,30 @@ module ZuoraAPI
       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?
-        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 -= 1).zero?
+        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
       end
-
-      tries -= 1
-      sleep(timeout_sleep_interval)
-      retry
     rescue *CONNECTION_READ_EXCEPTIONS => ex
-      if !tries.zero?
-        tries -= 1
-
-        if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
-          retry
-        elsif timeout_retry
-          sleep(timeout_sleep_interval)
-          retry
-        end
+      if !(tries -= 1).zero? && timeout_retry
+        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
       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
+    rescue Errno::ECONNRESET => ex
+      if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
+        retry
+      else
+        raise ex
       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
     else
@@ -504,60 +504,39 @@ module ZuoraAPI
     end
 
     def raise_errors(type: :SOAP, body: nil, response: nil)
-      request_uri, request_path, match_string = "", "", ""
-      if response.class.to_s == "HTTP::Message"
-        request_uri = response.http_header.request_uri.to_s
-        request_path = response.http_header.request_uri.path
-        match_string = "#{response.http_header.request_method}::#{response.code}::#{request_uri}"
-      else
-        request = response.request
-        request_uri = response.request.uri
-        request_path = request.path.path
-        match_string = "#{request.http_method.to_s.split("Net::HTTP::").last.upcase}::#{response.code}::#{request_path}"
-      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 downstream host", response)
       end
 
-      # Check failure response code
-      case response.code
-      when 504
-        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
-        
-      else
-        if body.class == Hash
-          case request_path
-          when /^\/v1\/connections$/
-            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 
-            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Missing ZSession cookie for authentication call", response) if z_session_cookie.blank?
-          end
-        end
+      if response.code == 504
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from downstream host", response)
       end
 
       case type
       when :SOAP
-        error, success, message = get_soap_error_and_message(body)
-
-        if body.xpath('//ns1:queryResponse', 'ns1' => 'http://api.zuora.com/').present? &&
-           body.xpath(
-             '//ns1:records[@xsi:type="ns2:Export"]',
-             'ns1' => 'http://api.zuora.com/', 'xsi' => 'http://www.w3.org/2001/XMLSchema-instance'
-           ).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'  
+        error   = body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
+        message = body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
+
+        if error.blank? || message.blank?
+          error   = body.xpath('//faultcode').text
+          message = body.xpath('//faultstring').text
+        end
+
+        if error.blank? || message.blank?
+          error   = body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text
+          message = body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').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 = []
+          success = []
+          body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').each_with_index do |call, object_index|
+            if call.xpath('./ns1:Success', 'ns1' =>'http://api.zuora.com/').text == 'false' && call.xpath('./ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
+              message = "#{call.xpath('./*/ns1:Code', 'ns1' =>'http://api.zuora.com/').text}::#{call.xpath('./*/ns1:Message', 'ns1' =>'http://api.zuora.com/').text}"
+              error.push(message)
             else
-              error = 'FATAL_ERROR'
-              message = 'Export failed due to unknown reason. Consult api logs.'
+              success.push(call.xpath('./ns1:Id', 'ns1' =>'http://api.zuora.com/').text)
             end
           end
         end
@@ -565,48 +544,44 @@ module ZuoraAPI
         #By default response if not passed in for SOAP as all SOAP is 200
         if error.present?
           if error.class == String
-            raise_errors_helper(error: error, message: message, response: response)
+            case error
+            when "INVALID_SESSION"
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", response)
+            when "REQUEST_EXCEEDED_LIMIT"
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", response)
+            when "LOCK_COMPETITION"
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response)
+            when "BATCH_FAIL_ERROR"
+              if message.include?("optimistic locking failed")
+                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response) 
+              else
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response)
+              end
+            when "TEMPORARY_ERROR"
+              raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{error}::#{message}", response)
+            when "INVALID_VALUE"
+              if message.include?("data integrity violation")
+                raise ZuoraAPI::Exceptions::ZuoraDataIntegrity.new("Data Integrity Violation", response)
+              else
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response)
+              end
+            else
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response) if error.present?
+            end
           elsif error.class == Array
-            if error.uniq.size == 1
-              err, msg = error[0].split('::')
-              raise_errors_helper(error: err, message: msg, response: response, errors: error, success: success)
+            if error[0].include?("LOCK_COMPETITION") && error.count == 1
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), response)
             else
               raise ZuoraAPI::Exceptions::ZuoraAPIError.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), response, error, success)
             end
           end
         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. 
-            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") 
-              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. 
-            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?
-          end
-        when /^\/api\/rest\/v1\/reports.*/  #Reporting Paths
-          reporting_message = response.parsed_response.dig("ZanResponse", "response", "message") || body.dig("message")
-          if reporting_message&.include?("com.zuora.rest.RestUsageException: The user does not have permissions for this API.")
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(reporting_message, response)
-          elsif reporting_message&.include?("500 Internal Server Error")
-            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Internal Server Error. The Reporting API is down. Contact Support.", response)
-          end
-          case match_string
-          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
+        if response.code == 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)
         end
 
+      when :JSON
         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
@@ -614,14 +589,6 @@ module ZuoraAPI
           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)
-          end
-
-          if (body.dig('message') || '').downcase.include?('unexpected error') && response.code != 500
-            raise ZuoraAPI::Exceptions::ZuoraUnexpectedError.new(body['message'], response)
-          end
-
           if body['message'] == "No bearer token" && response.code == 400
             raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Authentication type is not supported by this Login", response)
           end
@@ -635,12 +602,8 @@ module ZuoraAPI
           end
 
           #Oauth Tokens - User deactivated
-          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")
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Invalid Oauth Client Id", response)
-            end
+          if body['reason'] == 'Forbidden' && body['status'] == 403 && response.code == 403
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Forbidden", response)
           end
 
           if body['error'] == 'Unauthorized' && body['status'] == 401
@@ -648,12 +611,7 @@ module ZuoraAPI
           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)
-            new_message = messages_array.join(', ')
-            if new_message.present?
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(new_message, response)
-            else
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(body['message'], response)
-            end
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
           end
 
           #Zuora REST Create Amendment error #Authentication failed
@@ -661,30 +619,16 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body['faultstring']}", response)
           end
 
-          #Locking contention
-          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(50)
-            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}", response)
-          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.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
-            end
-            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("#{messages_array.join(', ')}", response)
-          end
-
-          #Retryiable Service Error
-          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(61)
-            raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{messages_array.join(', ')}", response)
-          end
-
           #Request exceeded limit
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(70)
             raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", response)
           end
 
+          #Locking contention
+          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(50)
+            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}", response)
+          end          
+
           #All Errors catch
           if codes_array.size > 0
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}", response)
@@ -692,20 +636,26 @@ module ZuoraAPI
 
           #Zuora REST Query Errors
           if body["faultcode"].present?
-            raise_errors_helper(error:  body["faultcode"], message: body["faultstring"], response: response)
+            case body["faultcode"]
+            when "fns:MALFORMED_QUERY"
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+            when "fns:REQUEST_EXCEEDED_LIMIT"
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+            when "fns:LOCK_COMPETITION"
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+            when "INVALID_SESSION"
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+            else
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+            end
           end
 
           if body["Errors"].present? || body["errors"].present?
-            codes, messages = [[],[]]
-            body.fetch("Errors", []).each { |obj| messages.push(obj["Message"]); messages.push(obj["title"]); codes.push(obj["Code"]); codes.push(obj["code"]) }
-            body.fetch("errors", []).each { |obj| messages.push(obj["Message"]); messages.push(obj["title"]); codes.push(obj["Code"]); codes.push(obj["code"]) }
-            codes, messages = [codes.uniq.compact, messages.uniq.compact]
-            if codes.size > 0
-              if codes.size == 1
-                raise_errors_helper(error: codes.first, message: messages.first, response: response, errors: messages)
-              else
-                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages.join(", ")}", response, messages)
-              end
+            errors = []
+            (body["Errors"] || []).select { |obj| errors.push(obj["Message"]) }.compact
+            (body["errors"] || []).select { |obj| errors.push(obj["Message"]) }.compact
+            if errors.size > 0
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{errors.join(", ")}", response, errors)
             end
           end
         end
@@ -723,7 +673,7 @@ module ZuoraAPI
                 raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("Retry Lock Competition", response)
               elsif error_messages.first.include?("data integrity violation")
                 raise ZuoraAPI::Exceptions::ZuoraDataIntegrity.new("Data Integrity Violation", response)
-              end
+              end 
             end
           end
 
@@ -732,128 +682,15 @@ module ZuoraAPI
           end
         end
 
-        if body.class == Hash && body['message'].present?
-          raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(body['message'], response) if response.code == 500
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['message'], response) if ![200,201].include?(response.code)
-        end
-
-        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) 
-      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
-        output_xml = Nokogiri::XML(response.body)
-        self.raise_errors(type: :SOAP, body: output_xml, response: response)
-
-      elsif response_content_types.include?('text/html')
-        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Akamai Error", response) if response.headers.fetch('server', '') == 'AkamaiGHost'
-
-        parse_body = Nokogiri::HTML(response.body)
-        error_title = parse_body.xpath('//h2').text
-        error_title = parse_body.xpath('//h1').text if error_title.blank?
-        error_message = parse_body.xpath('//p').text
-
-        error_message = error_title if error_message.blank?
-
-        if error_title.present?
-          case error_title
-          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)
-          end
-        end
-
-        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Http response body is missing", response) if response.body.blank?
-      end
-
-      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
-      message = body.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
-
-      if error.blank? || message.blank?
-        error   = body.xpath('//faultcode').text
-        message = body.xpath('//faultstring').text
-      end
-
-      if error.blank? || message.blank?
-        error   = body.xpath('//ns1:Code', 'ns1' =>'http://api.zuora.com/').text
-        message = body.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').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 = []
-        success = []
-        body.xpath('//ns1:result', 'ns1' =>'http://api.zuora.com/').each_with_index do |call, object_index|
-          if call.xpath('./ns1:Success', 'ns1' =>'http://api.zuora.com/').text == 'false' && call.xpath('./ns1:Errors', 'ns1' =>'http://api.zuora.com/').size > 0
-            message = "#{call.xpath('./*/ns1:Code', 'ns1' =>'http://api.zuora.com/').text}::#{call.xpath('./*/ns1:Message', 'ns1' =>'http://api.zuora.com/').text}"
-            error.push(message)
+        if ![200,201].include?(response.code)
+          if response.code == 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)
           else
-            success.push(call.xpath('./ns1:Id', 'ns1' =>'http://api.zuora.com/').text)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", response)
           end
         end
       end
-      return error, success, message
-    end
-
-    def raise_errors_helper(error: nil, message: nil, response: nil, errors: [], success: [])
-      case error
-      when /.*INVALID_SESSION/
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(message, response, errors, success)
-      when /.*REQUEST_EXCEEDED_LIMIT/
-        raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new(message, response, errors, success)
-      when /.*LOCK_COMPETITION/
-        raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new(message, response, errors, success)
-      when /.*BATCH_FAIL_ERROR/
-        if message.include?("optimistic locking failed") || message.include?("Operation failed due to a lock competition, please retry later.")
-          raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new(message, response, errors, success)
-        elsif message.include?("org.hibernate.exception.ConstraintViolationException")
-          raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)
-        end
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-      when /.*TEMPORARY_ERROR/, /.*TRANSACTION_TIMEOUT/
-        raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(message, response, errors, success)
-      when /.*INVALID_VALUE/
-        if message.include?("data integrity violation")
-          raise ZuoraAPI::Exceptions::ZuoraDataIntegrity.new("Data Integrity Violation", response, errors), success
-        end
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-      when /.*UNKNOWN_ERROR/
-        if /payment\/refund|Credit Balance Adjustment|Payment Gateway|ARSettlement permission/.match(message).nil?
-          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/
-        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?
-          raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.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
 
     def aqua_query(queryName: '', query: '', version: '1.2', jobName: 'Aqua',partner: '', project: '')
@@ -934,23 +771,15 @@ module ZuoraAPI
         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
     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 -= 1).zero?
+        Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
       end
-
-      tries -= 1
-      sleep(self.timeout_sleep)
-      retry
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !tries.zero? && self.status == 'Active'
-        tries -= 1
+      if !(tries -= 1).zero? && self.status == 'Active'
         Rails.logger.debug("Describe session expired. Starting new session.")
         self.new_session
         retry
@@ -975,73 +804,50 @@ module ZuoraAPI
       session_type: :basic,
       timeout_retry: false,
       timeout: 120,
-      timeout_sleep_interval: self.timeout_sleep, 
       multipart: false,
-      stream_body: false,
-      output_exception_messages: true,
-      **keyword_args,
-      &block
+      **keyword_args
     )
       tries ||= 2
 
-      raise "Method not supported, supported methods include: :get, :post, :put, :delete, :patch, :head, :options" if ![:get, :post, :put, :delete, :patch, :head, :options].include?(method)
-
-      authentication_headers = {}
-      if z_session
-        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
+      if self.entity_id.present?
+        headers["Zuora-Entity-Ids"] = self.entity_id if headers.dig("Zuora-Entity-Ids").nil?
+        headers.delete_if { |key, value| ["entityId", "entityName"].include?(key.to_s) }
       end
 
+      raise "Method not supported, supported methods include: :get, :post, :put, :delete, :patch, :head, :options" if ![:get, :post, :put, :delete, :patch, :head, :options].include?(method)
+
+      authentication_headers = z_session ? {"Authorization" =>  self.get_session(prefix: true, auth_type: session_type) } : {}
       modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
 
-      begin
-        request = HTTParty::Request.new(
-          "Net::HTTP::#{method.to_s.capitalize}".constantize,
-          url,
-          body: body,
-          headers: modified_headers,
-          timeout: timeout,
-          multipart: multipart,
-          stream_body: stream_body
-        )
-
-        response = request.perform(&block)
-
-        Rails.logger.debug("Response Code: #{response.code}") if debug
-        begin
-          output_json = JSON.parse(response.body)
-        rescue JSON::ParserError => ex
-          output_json = {}
-        end
-        Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
+      response = HTTParty::Request.new(
+        "Net::HTTP::#{method.to_s.capitalize}".constantize,
+        url,
+        body: body,
+        headers: modified_headers,
+        timeout: timeout,
+        multipart: multipart,
+      ).perform
 
-        raise_errors(type: :JSON, body: output_json, response: response)
-      rescue
-        reset_files(body) if multipart
-        raise
+      Rails.logger.debug("Response Code: #{response.code}") if debug
+      begin
+        output_json = JSON.parse(response.body)
+      rescue JSON::ParserError => ex
+        output_json = {}
       end
+      Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
+
+      raise_errors(type: :JSON, body: output_json, response: 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
+        self.rest_call(method: method.to_sym, url: url, body: body, debug: debug, errors: errors, z_session: z_session, session_type: :bearer, timeout_retry: timeout_retry, timeout: timeout)
       else
         Rails.logger.debug("Rest Call - Session Bad Auth type")
         raise ex
       end
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !tries.zero? && z_session
-        tries -= 1
+      if !(tries -= 1).zero? && z_session
         Rails.logger.debug("Rest Call - Session Invalid #{session_type}")
-
-        begin
-          self.new_session(auth_type: session_type)
-        rescue *ZUORA_API_ERRORS => ex
-          return [output_json, ex.response]
-        end
-
+        self.new_session(auth_type: session_type)
         retry
       else
         if errors.include?(ex.class)
@@ -1054,46 +860,32 @@ module ZuoraAPI
       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?
-        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 -= 1).zero?
+        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
       end
-
-      tries -= 1
-      sleep(timeout_sleep_interval)
-      retry
     rescue *CONNECTION_READ_EXCEPTIONS => ex
-      if !tries.zero?
-        tries -= 1
-        if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
-          retry
-        elsif timeout_retry
-          sleep(timeout_sleep_interval)
-          retry
-        end
+      if !(tries -= 1).zero? && timeout_retry
+        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
+        sleep(self.timeout_sleep)
+        retry
+      else
+        raise ex
       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
+    rescue Errno::ECONNRESET => ex
+      if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
+        retry
+      else
+        raise ex
       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
     else
@@ -1146,11 +938,9 @@ 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, 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
-
       #Make sure directory exists
       require 'fileutils'
       FileUtils.mkdir_p(file_path) unless File.exists?(file_path)
@@ -1165,9 +955,8 @@ module ZuoraAPI
         headers = headers.merge({"Zuora-Entity-Ids" => self.entity_id}) if !self.entity_id.blank?
       end
 
-      headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
-
       response_save = nil
+      retry_count ||= timeout_retries
       http.request_get(uri.request_uri, headers) do |response|
         response_save = response
         status_code = response.code if response
@@ -1261,11 +1050,11 @@ module ZuoraAPI
             raise
           end
         else
-          raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
+          raise StandardError.new("File Download Failed #{response.class}")
         end
       end
-
-    rescue => ex
+          
+    rescue => ex 
       sleep(5)
       if (retry_count -= 1) >= 0
         retry
@@ -1275,122 +1064,75 @@ module ZuoraAPI
       end
     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
+    def getDataSourceExport(query, extract: true, encrypted: false, zip: true)
+      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)
             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
+          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
 
-        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)
+      response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8"}, :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"
+      output_xml = Nokogiri::XML(response_query.body)
+      raise 'Export Creation Unsuccessful : ' + output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text 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
 
-        # 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
+      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)
             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
+          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
-        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
+      end
+      result = 'Waiting'
 
-      rescue *ZUORA_API_ERRORS => ex
-        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"}, :timeout => 120)
 
-      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
+        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 "Export Creation Unsuccessful : #{output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text}" if result.blank? || result == "Failed"
+      end
 
-      rescue ZuoraAPI::Exceptions::BadEntityError => ex
-        raise ex
+      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
     end
 
@@ -1457,17 +1199,5 @@ module ZuoraAPI
       end
       return "failure"
     end
-
-    def reset_files(body)
-      return unless body.is_a? Hash
-
-      body.transform_values! do |v|
-        if v.is_a?(File)
-          v.reopen(v.path)
-        else
-          v
-        end
-      end
-    end
   end
 end