zuora_api 1.7.06 → 1.7.7a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f857a810633aad60e80293f6400b9fa8fab38bff15537589e4ffe0ef2aca808d
-  data.tar.gz: d4512de5de2f7eb888dc32ca7d283fee4f366ad7a96c8dc619bd8ebd83b8f55d
+  metadata.gz: 2697794114e89b4d76001a4746c1148229aeada880a18ab2cd3a97673549d2c6
+  data.tar.gz: 7a66c8c6b0d604bc9d1229424ecca8a557c6c36a84304049970988cbf7e6c771
 SHA512:
-  metadata.gz: 5d2a72796a2b442627768876ac6954b10aff3be6ea61b11375f4bd2d305b970c5887d26dbf0962b8876bb7575cfcf9a3c49e56d0a8ae0d6fe71ed4078fe04bd6
-  data.tar.gz: c957560ae8e70276ff8c9fd6d2e9777af145d837bbb93ee1114f36ec7946ab59033820113b93872c4b42855be40c86e04a979255f839908facc9fb4ea4faa350
+  metadata.gz: d7a8ae407cd8d86a1249b404ef27be7ee13e13e8f620ec7cda03d84db3c17c077ead6cbf8f90d6bb8be66fb5594d90adf7184e707a7ac1f1639b84434868fe4f
+  data.tar.gz: b9732ae7b0397cc983e87e3459f80fa013c81170f2fd1fec15256a51e79e6722eeac58dcda457eb7d4ec323cbe5efd869094f3abbc29124e737d95689d4150a1

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.idea

data/.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: ruby:2.6
+image: ruby:2.7
 stages:
   - setup
   - test
@@ -35,6 +35,7 @@ rspec-testing:
   script:
   - bundle install
   - rspec
+  coverage: '/\(\d+.\d+\%\) covered/'
 
 rubygems-deploy:
   stage: deploy
@@ -48,8 +49,8 @@ rubygems-deploy:
   - if [[ "staging"  == $CI_BUILD_REF_SLUG ]];then  export VERSION=`git describe --match "[0-9]*\.[0-9]*\.[0-9]*[a-z]" --abbrev=0 --tags HEAD`; fi
   - if [[ "master"  == $CI_BUILD_REF_SLUG ]];then export VERSION=`git describe --exclude "[0-9]*\.[0-9]*\.[0-9]*[a-z]" --abbrev=0 --tags HEAD`; fi
   - echo $VERSION
-  - sed -i "s/0.0.1/$VERSION/" /Connect/zuora-gem/lib/zuora_api/version.rb
-  - git add /Connect/zuora-gem/lib/zuora_api/version.rb
+  - sed -i "s/0.0.1/$VERSION/" lib/zuora_api/version.rb
+  - git add lib/zuora_api/version.rb
   - git config --global user.email "connect@zuora.com"
   - git config --global user.name "Connect Automation"
   - git commit -m "Automated Version Update $VERSION"

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.7.07] - 2018-9-10
+### Changed
+- Cookie name for service endpoint integration
+
+## [1.7.06] - 2018-8-25
+### Added
+- Retry for 502/503
+- Standard exception for 504
+
+## [1.7.05] - 2018-8-25
+### Added
+- Added support for oauth token forbidden
+
+## [1.7.02] - 2018-8-23
+### Added
+- Added mulit part support for rest call
+
 ## [1.7.01] - 2018-8-06
 ### Changed
 - Changed library used to determine host

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-
+ruby "2.7.1"
 # Specify your gem's dependencies in zuora.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Zuora Gem
 
-[![Gem Version](https://badge.fury.io/rb/zuora_api.svg)](https://badge.fury.io/rb/zuora_api) [![coverage report](https://gitlab.zuora.com/Connect/zuora-gem/badges/master/coverage.svg)](https://gitlab.zuora.com/Connect/zuora-gem/commits/master)
+[![Gem Version](https://badge.fury.io/rb/zuora_api.svg)](https://badge.fury.io/rb/zuora_api) [![coverage report](https://gitlab.0.ecc.auw2.zuora/extension-products/shared-libraries/zuora-gem/badges/master/coverage.svg)](https://gitlab.0.ecc.auw2.zuora/extension-products/shared-libraries/zuora-gem/commits/master)
 
 ## Installation
 Add this line to your application's Gemfile:

data/lib/insights_api/login.rb

@@ -190,12 +190,11 @@ module InsightsAPI
       end
 
       rescue => ex
-        if !(tries -= 1).zero?
-         sleep 3
-         retry
-        else
-         raise ex
-        end
+        raise ex if tries.zero?
+
+        tries -= 1
+        sleep 3
+        retry
       else
         return temp_file
     end

data/lib/zuora_api/exceptions.rb

@@ -1,14 +1,38 @@
 module ZuoraAPI
   module Exceptions
-    class Error < StandardError; end
+    class Error < StandardError; 
+      def parse_message(message)
+        case message
+        when /^Payment status should be Processed. Invalid payment is P-\d*./
+          @message = "Payment status should be Processed."  
+        when /^Adjustment cannot be created for invoice(.*) with a zero balance./
+          @message = "Adjustment cannot be created for invoice with a zero balance."
+        when /^The balance of all the invoice items and tax items is 0. No write-off is needed for the invoice .*./
+          @message = "The balance of all the invoice items and tax items is 0. No write-off is needed for the invoice."
+        when /^Json input does not match schema. Error(s): string ".*" is too long .*/
+          @message = "Json input does not match schema. Error(s): String is too long."
+        when /^Query failed \(#[\d\w_]*\): line [0-9]+:[0-9]+: (.*)$/
+          @message = "Query failed: #{$1}"
+        when /^Query failed \(#[\d\w_]*\): (.*)$/
+          @message = "Query failed: #{$1}"
+        when /^Could not find [\w\d]{32}.$/
+          @message = "Could not find object."
+        when /^Subscription [\w\d]{32} is in expired status. It is not supported to generate billing documents for expired subscriptions./
+          @message = "Subscription is in expired status. It is not supported to generate billing documents for expired subscriptions."
+        else
+          @message = message
+        end
+      end
+    end
+    class FileDownloadError < StandardError; end
     class AuthorizationNotPerformed < Error; end
     class ZuoraAPISessionError < Error
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+      def initialize(message = nil,response=nil, errors = [], successes = [])
+        @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
+        @message = parse_message(message)
         @response = response
         @default_message = "Error with Zuora Session."
       end
@@ -16,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
@@ -23,8 +60,8 @@ module ZuoraAPI
       attr_writer :default_message
 
       def initialize(message = nil,response=nil, errors = [], successes = [],  *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
+        @message = parse_message(message)
         @response = response
         @default_message = "Error with Zuora Entity"
         @errors = errors
@@ -41,8 +78,8 @@ module ZuoraAPI
       attr_writer :default_message
 
       def initialize(message = nil,response=nil, errors = [], successes = [],  *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+        @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
+        @message = parse_message(message)
         @response = response
         @default_message = "Error communicating with Zuora."
         @errors = errors
@@ -54,13 +91,31 @@ module ZuoraAPI
       end
     end
 
+    class ZuoraAPIInternalServerError < Error
+      attr_reader :code, :response, :errors, :successes
+      attr_writer :default_message
+
+      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 = "Zuora Internal Server Error."
+        @errors = errors
+        @successes = successes
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
     class ZuoraAPIRequestLimit < Error
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+      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 = "Your request limit has been exceeded for zuora."
       end
@@ -70,13 +125,29 @@ module ZuoraAPI
       end
     end
 
+    class ZuoraAPIUnkownError < Error
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      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 = "An unkown error occured. Workflow is not responsible. Please contact Support."
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
     class ZuoraAPILockCompetition < Error
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+      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 = "Operation failed due to lock competition. Please retry"
       end
@@ -90,9 +161,9 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+      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 = "Operation failed due to lock competition. Please retry"
       end
@@ -102,15 +173,32 @@ module ZuoraAPI
       end
     end
 
-    class ZuoraAPITemporaryError < Error
+    class ZuoraUnexpectedError < Error
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+      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 = "An unexpected error occurred"
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
+    class ZuoraAPITemporaryError < Error
+      attr_reader :code, :response, :errors
+      attr_writer :default_message
+
+      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
@@ -122,9 +210,9 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
-        @message = message
+      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 = "Authentication type is not supported by this Login"
       end
@@ -138,8 +226,8 @@ module ZuoraAPI
       attr_reader :code, :response
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
+      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
+        @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
         @default_message = "Authentication type is not supported by this Login"
@@ -151,13 +239,14 @@ module ZuoraAPI
     end
 
     class ZuoraAPIReadTimeout < Net::ReadTimeout
-      attr_reader :code, :response
+      attr_reader :code, :response, :request
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil,  *args)
-        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
+      def initialize(message = nil, response = nil, request = nil, errors = [], successes = [], *args)
+        @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
+        @request = request
         @default_message = "Authentication type is not supported by this Login"
       end
 

data/lib/zuora_api/login.rb

@@ -5,7 +5,7 @@ require 'zuora_api/exceptions'
 
 module ZuoraAPI
   class Login
-    ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
+    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'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
@@ -16,7 +16,8 @@ module ZuoraAPI
       Errno::ECONNREFUSED,
       SocketError,
       Errno::EHOSTUNREACH,
-      Errno::EADDRNOTAVAIL
+      Errno::EADDRNOTAVAIL,
+      Errno::ETIMEDOUT,
     ].freeze
 
     CONNECTION_READ_EXCEPTIONS = [
@@ -30,7 +31,17 @@ module ZuoraAPI
       ZuoraAPI::Exceptions::ZuoraAPIRequestLimit,
       ZuoraAPI::Exceptions::ZuoraAPILockCompetition,
       ZuoraAPI::Exceptions::ZuoraAPITemporaryError,
-      ZuoraAPI::Exceptions::ZuoraDataIntegrity
+      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
     ].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
@@ -39,10 +50,10 @@ module ZuoraAPI
       raise "URL is nil or empty, but URL is required" if url.nil? || url.empty?
       # raise "URL is improper. URL must contain zuora.com, zuora.eu, or zuora.na" if /zuora.com|zuora.eu|zuora.na/ === url
       self.hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
-      if !/apps\/services\/a\/\d{2}\.\d$/.match(url.strip)
+      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{2}\.\d)$/).dig(0,0).to_f 
-        self.url = url.gsub(/(\d{2}\.\d)$/, 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
@@ -61,27 +72,12 @@ 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
-          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
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -92,20 +88,12 @@ 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
-          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
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -116,20 +104,12 @@ 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
-          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
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -140,20 +120,12 @@ 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
-          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
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
         end
       rescue JSON::ParserError => ex
         output_json = {}
@@ -162,27 +134,21 @@ 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/",
-                      "Services"=> ""},
+                      "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/"},
              "EU" => {"Sandbox" => "https://zconnect.sandbox.eu.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.eu.zuora.com/api/rest/v1/",
-                      "Services"=> ""},
+                      "Services"=> "https://reporting-sbx0000.sbx.aec1.zuora.com/api/rest/v1/"},
              "NA" => {"Sandbox" => "https://zconnect.sandbox.na.zuora.com/api/rest/v1/",
                       "Production" => "https://zconnect.na.zuora.com/api/rest/v1/",
                       "Services"=> ""}
       }
-      return map[zuora_client.region][zuora_client.environment].insert(-1, path)
+      return map[self.region][self.environment].insert(-1, path)
     end
 
     # There are two ways to call this method. The first way is best.
@@ -232,7 +198,7 @@ module ZuoraAPI
     end
 
     def self.environments
-      %w(Sandbox Production Services Performance Staging)
+      %w(Sandbox Production Services Performance Staging Test)
     end
 
     def self.regions
@@ -244,11 +210,13 @@ 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/"},
+                       "Staging" => "https://staging2.zuora.com/apps/services/a/",
+                       "Test" => "https://test.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/"},
+                       "Services" => "https://services347.eu.zuora.com/apps/services/a/",
+                       "Test" => "https://test.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/",
@@ -285,15 +253,18 @@ module ZuoraAPI
 
     def update_environment
       if !self.url.blank?
-        if /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/ === self.hostname
+        case self.hostname
+        when /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/
           self.environment = 'Sandbox'
-        elsif /(?<=\.|\/|^)(service[\d]*|services[\d]*|ep-edge)(?=\.|\/|$)/ === self.hostname
+        when /(?<=\.|\/|^)(service[\d]*|services[\d]*|ep-edge)(?=\.|\/|$)/
           self.environment = 'Services'
-        elsif /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/ === self.hostname
+        when /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/
           self.environment = 'Performance'
-        elsif /(?<=\.|\/|^)(staging1|staging2|stg)(?=\.|\/|$)/ === self.hostname
+        when /(?<=\.|\/|^)(staging1|staging2|stg)(?=\.|\/|$)/
           self.environment = 'Staging'
-        elsif is_prod_env
+        when /(?<=\.|\/|^)(test)(?=\.|\/|$)/
+          self.environment = 'Test'
+        when /(?<=\.|\/|^)(www|api)(?=\.|\/|$)/, /(^|tls10\.|origin-www\.|zforsf\.|eu\.|na\.)(zuora\.com)/
           self.environment = 'Production'
         else
           self.environment = 'Unknown'
@@ -303,25 +274,14 @@ 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", "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"},
+      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]
-      # raise "Can't find ZConnect Provider for #{region} region and #{environment} environment" if self.zconnect_provider.nil?
     end
 
     def aqua_endpoint(url="")
@@ -334,45 +294,35 @@ module ZuoraAPI
       return "#{url_slash_apps_slash}api/#{url}"
     end
 
-    def rest_endpoint(url="")
+    def rest_endpoint(url="", domain=true, prefix='/v1/')
       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'
-        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
+        endpoint = "https://rest.sandbox#{url_postfix}zuora.com"
+        endpoint = "https://rest.apisandbox.zuora.com"  if self.region == "US"
       when 'Production'
-        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
+        endpoint = "https://rest#{url_postfix}zuora.com"
       when 'Performance'
-        endpoint = "https://rest.pt1.zuora.com/v1/".concat(url)
+        endpoint = "https://rest.pt1.zuora.com"
       when 'Services'
         https = /https:\/\/|http:\/\//.match(self.url)[0]
         host = self.hostname
-        endpoint = "#{https}rest#{host}/v1/#{url}"
+        endpoint = "#{https}rest#{host}"
       when 'Staging'
-        endpoint = "https://rest-staging2.zuora.com/v1/".concat(url)
+        endpoint = "https://rest-staging2.zuora.com"
       when 'Unknown'
         raise "Environment unknown, returning passed in parameter unaltered"
       end
-      return endpoint
+      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="")
@@ -383,43 +333,89 @@ 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)
+    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)
-      Rails.logger.debug("Get session for #{auth_type} - #{self.class.to_s}") if Rails.env.to_s == 'development'
+    def get_session(prefix: false, auth_type: :basic, zuora_track_id: nil)
       case auth_type
       when :basic
         if self.current_session.blank?
           case self.class.to_s
           when 'ZuoraAPI::Oauth'
             if self.bearer_token.blank? || self.oauth_expired?
-              self.new_session(auth_type: :bearer)
+              self.new_session(auth_type: :bearer, zuora_track_id: zuora_track_id)
             end
-            self.get_z_session if self.status == 'Active'
+            self.get_z_session(zuora_track_id: zuora_track_id)
           when 'ZuoraAPI::Basic'
-            self.new_session(auth_type: :basic)
+            self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
           else
-            raise "No Zuora Login Specified"
+            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
         when 'ZuoraAPI::Oauth'
           if self.bearer_token.blank? || self.oauth_expired?
-            self.new_session(auth_type: :bearer)
+            self.new_session(auth_type: :bearer, zuora_track_id: zuora_track_id)
           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, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS), z_session: true, timeout_retry: false, timeout: 120,**keyword_args)
+    def soap_call(
+      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|
         xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/",
@@ -428,8 +424,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)
+            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
@@ -447,96 +445,212 @@ 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
 
-      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)
+      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(
+        Net::HTTP::Post,
+        self.url,
+        body: xml.doc.to_xml(:save_with => XML_SAVE_OPTIONS).strip,
+        headers: headers,
+        timeout: timeout,
+      )
+
+      response = request.perform
+
       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)
+
+      return output_xml, input_xml, response
+
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero? && z_session
+      raise if skip_session
+      if !tries.zero? && z_session
+        tries -= 1
         Rails.logger.debug("SOAP Call - Session Invalid")
-        self.new_session(auth_type: :basic)
-        retry
-      else
-        if errors.include?(ex.class)
-          raise ex
-        else
-          return output_xml, input_xml, response
+
+        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
+
+        retry
       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
-        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 -= 1).zero?
-        Rails.logger.info("SOAP Call - #{ex.class} Timed out will retry after 5 seconds")
-        sleep(self.timeout_sleep)
+      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
-      else
-        raise ex
       end
+
+      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 -= 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
+      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
+          sleep(timeout_sleep_interval)
+          retry
+        end
       end
-    rescue Errno::ECONNRESET => ex
-      if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
-        retry
+
+      self.log(location: "SOAP Call", exception: ex, message: "Timed out", level: :error)  if output_exception_messages
+      ex = ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from 'https://#{rest_domain(endpoint: url)}'", nil, request) if ex.instance_of?(Net::ReadTimeout)
+      raise ex
+
+    rescue => ex
+      raise ex
+    ensure 
+      self.error_logger(ex) if defined?(ex) && Rails.logger.class.to_s == "Ougai::Logger"
+    end
+
+    def error_logger(ex)
+      exception_args = Rails.logger.with_fields.merge(self.exception_args(ex))
+      case ex
+      when ZuoraAPI::Exceptions::ZuoraAPIUnkownError, ZuoraAPI::Exceptions::ZuoraDataIntegrity
+        Rails.logger.error('Zuora Unknown/Integrity Error', ex, exception_args)
+      when ZuoraAPI::Exceptions::ZuoraAPIRequestLimit
+        Rails.logger.info('Zuora APILimit Reached', exception_args)
+      when *(ZuoraAPI::Login::ZUORA_API_ERRORS-ZuoraAPI::Login::ZUORA_SERVER_ERRORS)
+        #Rails.logger.debug('Zuora API Error', ex, self.exception_args(ex))
+      when *ZuoraAPI::Login::ZUORA_SERVER_ERRORS
+        Rails.logger.error('Zuora Server Error', ex, exception_args)
+      end
+    end
+
+    def log(location: "Rest Call", exception: nil, message: "Timed out will retry after #{self.timeout_sleep} seconds", level: :info )
+      level = :debug if ![:debug, :info, :warn, :error, :fatal].include?(level)
+      if Rails.logger.class.to_s == "Ougai::Logger"
+        Rails.logger.send(level.to_sym, "#{location} - #{message}", exception) 
       else
-        raise ex
+        Rails.logger.send(level.to_sym, "#{location} - #{exception.class} #{message}") 
+      end
+    end
+
+    def exception_args(ex)
+      args = {}
+      if ex.class == ZuoraAPI::Exceptions::ZuoraAPIRequestLimit
+        args.merge!({
+          zuora_trace_id: ex.response.headers["zuora-request-id"],
+          zuora_track_id: ex.response.request.options[:headers]["Zuora-Track-Id"]
+        })
+      elsif 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
-      raise ex
-    else
-      return output_xml, input_xml, response
+      Rails.logger.error("Failed to create exception arguments", ex, args)
+    ensure
+      return args
     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 downstream host", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from 'https://#{rest_domain(endpoint: request_uri)}'", response)
       end
 
-      if response.code == 504
-        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from downstream host", response)
+      # Check failure response code
+      case response.code
+      when 504
+        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      
+            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
       end
 
       case type
       when :SOAP
-        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
+        error, success, message = get_soap_error_and_message(body)
 
-        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
+        if body.xpath('//fns:LoginFault', 'fns' =>'http://fault.api.zuora.com/').present? 
+          raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(message, response)
         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 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'
+            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
-              success.push(call.xpath('./ns1:Id', 'ns1' =>'http://api.zuora.com/').text)
+              message = 'Export failed due to unknown reason. Consult api logs.'
             end
           end
         end
@@ -544,44 +658,52 @@ module ZuoraAPI
         #By default response if not passed in for SOAP as all SOAP is 200
         if error.present?
           if error.class == String
-            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
+            raise_errors_helper(error: error, message: message, response: response)
           elsif error.class == Array
-            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)
+            if error.uniq.size == 1
+              err, msg = error[0].split('::')
+              raise_errors_helper(error: err, message: msg, response: response, errors: error, success: success)
             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)
         
-        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)
+      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
+        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
         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
@@ -589,6 +711,14 @@ 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
@@ -602,16 +732,29 @@ module ZuoraAPI
           end
 
           #Oauth Tokens - User deactivated
-          if body['reason'] == 'Forbidden' && body['status'] == 403 && response.code == 403
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Forbidden", response)
+          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
           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)
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
+            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
           end
 
           #Zuora REST Create Amendment error #Authentication failed
@@ -619,16 +762,30 @@ 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)
@@ -636,26 +793,20 @@ module ZuoraAPI
 
           #Zuora REST Query Errors
           if body["faultcode"].present?
-            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
+            raise_errors_helper(error:  body["faultcode"], message: body["faultstring"], response: response)
           end
 
           if body["Errors"].present? || body["errors"].present?
-            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)
+            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
             end
           end
         end
@@ -673,7 +824,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
 
@@ -682,15 +833,130 @@ 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
-        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)
+        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)    
+          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
+
+        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)
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", response)
+            success.push(call.xpath('./ns1:Id', 'ns1' =>'http://api.zuora.com/').text)
           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_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?
+          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: '')
@@ -737,7 +1003,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
 
@@ -770,27 +1036,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 -= 1).zero?
-        Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
+      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
-      else
-        raise ex
       end
+
+      self.log(location: "Describe", exception: ex, message: "Timed out", level: :error) if log_errors
+      raise ex
+
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero? && self.status == 'Active'
+      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(
@@ -803,93 +1073,124 @@ module ZuoraAPI
       z_session: true,
       session_type: :basic,
       timeout_retry: false,
-      timeout: 120,
+      timeout: 130,
+      timeout_sleep_interval: self.timeout_sleep, 
       multipart: false,
-      **keyword_args
+      stream_body: false,
+      output_exception_messages: true,
+      zuora_track_id: nil,
+      **keyword_args,
+      &block
     )
       tries ||= 2
 
-      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)
+      authentication_headers = {}
+      if z_session
+        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?
 
-      response = HTTParty::Request.new(
-        "Net::HTTP::#{method.to_s.capitalize}".constantize,
-        url,
-        body: body,
-        headers: modified_headers,
-        timeout: timeout,
-        multipart: multipart,
-      ).perform
+      modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
 
-      Rails.logger.debug("Response Code: #{response.code}") if debug
       begin
-        output_json = JSON.parse(response.body)
-      rescue JSON::ParserError => ex
-        output_json = {}
+        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?
+
+        raise_errors(type: :JSON, body: output_json, response: response)
+      rescue => ex
+        reset_files(body) if multipart
+        raise
       end
-      Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
 
-      raise_errors(type: :JSON, body: output_json, response: response)
+      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")
-        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
+        session_type = :bearer
+        retry
       end
+      Rails.logger.debug("Rest Call - Session Bad Auth type")
+      raise ex
+      
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero? && z_session
+      if !tries.zero? && z_session
+        tries -= 1
         Rails.logger.debug("Rest Call - Session Invalid #{session_type}")
-        self.new_session(auth_type: session_type)
-        retry
-      else
-        if errors.include?(ex.class)
-          raise ex
-        else
-          return [output_json, response]
+
+        begin
+          self.new_session(auth_type: session_type)
+        rescue *ZUORA_API_ERRORS => ex
+          return [output_json, ex.response]
         end
+
+        retry
       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
-        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 -= 1).zero?
-        Rails.logger.info("Rest Call - #{ex.class} Timed out will retry after 5 seconds")
-        sleep(self.timeout_sleep)
+      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
-      else
-        raise ex
       end
+
+      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 -= 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
-    rescue Errno::ECONNRESET => ex
-      if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
-        retry
-      else
-        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)
+        if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
+          retry
+        elsif timeout_retry
+          sleep(timeout_sleep_interval)
+          retry
+        end
       end
+      
+      self.log(location: "Rest Call", exception: ex, message: "Timed out", level: :error) if output_exception_messages
+      ex = ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from 'https://#{rest_domain(endpoint: url)}'", nil, request) if ex.instance_of?(Net::ReadTimeout)
+      raise ex
+
     rescue => ex
       raise ex
-    else
-      return [output_json, response]
+    ensure 
+      self.error_logger(ex) if defined?(ex) && Rails.logger.class.to_s == "Ougai::Logger"
     end
 
     def update_create_tenant
@@ -911,8 +1212,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|
@@ -938,9 +1240,11 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    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)
+    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
+
       #Make sure directory exists
       require 'fileutils'
       FileUtils.mkdir_p(file_path) unless File.exists?(file_path)
@@ -955,8 +1259,9 @@ 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
@@ -1040,36 +1345,42 @@ 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 StandardError.new("File Download Failed #{response.class}")
+          raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
         end
       end
-          
-    rescue => ex 
+
+    rescue => ex
       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)
+    def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: "")
+      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)
+              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
             end
           end
           xml['SOAP-ENV'].Body do
@@ -1086,17 +1397,20 @@ module ZuoraAPI
         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"}, :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", "Z-Track-Id" => z_track_id}, :timeout => 130)
 
       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"
+      raise_errors(type: :SOAP, body: output_xml, response: response_query) if output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
+
+      # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
+      
       id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
 
       confirmRequest = Nokogiri::XML::Builder.new do |xml|
         xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
           xml['SOAP-ENV'].Header do
             xml['ns1'].SessionHeader do
-              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic)
+              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
             end
           end
           xml['SOAP-ENV'].Body do
@@ -1110,12 +1424,14 @@ module ZuoraAPI
 
       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)
+        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 => 130)
 
         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"
+
+        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
@@ -1134,10 +1450,39 @@ module ZuoraAPI
       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 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
+      end
+      raise ex
+
+    rescue *ZUORA_API_ERRORS => ex
+      raise ex
+
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
+        sleep 5
+        retry
+      end
+      raise ex
+
+    rescue ZuoraAPI::Exceptions::BadEntityError => ex
+      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
@@ -1199,5 +1544,17 @@ 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