zuora_api 1.6.54 → 1.6.251

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: db9d04850886747fda373d56232f5a050b274cb1313d3e07c4acf34a803e6071
-  data.tar.gz: 0c9dfafc751ff2b2722ddace209f1092b06f98c3c4dee059b0a75165c915f435
+SHA1:
+  metadata.gz: 1bfd029f416736077243b7e0d6c8b3fd5e218167
+  data.tar.gz: 5344e6087fc2d37c50972ab97cd6705d4696bb23
 SHA512:
-  metadata.gz: af8e4adb50fcc272107b17e5a2d45c3b0b017c0978d02b68746b046399721b48e6b6d871d4519793b6fccfc2b11b140c7cde82d179ac1714953b0c30d132ec2e
-  data.tar.gz: 5df0bc633015dc4848a13eff13033e6fe5d512ec7c072df9397577d78359bde086d7bc1fb4766771fd22d4a9736fbb92290a2d75827ea742f0b6de192943d538
+  metadata.gz: a4fd0150091455e2999b35081be1a078ca2a529e2ff264227048f3c1f7788b7a193510acb030270f051058f635edf2b51f557f1f2ecac2280ec1a9d33a58e772
+  data.tar.gz: 6700d2cceaf338fbb1f151841e65cf7980cc2e0a13370416cbd2530e8893716d7ec9aa286f6f203800c0e27845210ed4a20e567ea97335e8ef0d88a6294882b5

data/.gitlab-ci.yml

@@ -1,4 +1,5 @@
-image: ruby:2.6
+
+image: ruby:2.3.1
 stages:
   - setup
   - test
@@ -40,24 +41,10 @@ rubygems-deploy:
   stage: deploy
   allow_failure: false
   script:
-  - echo "deb http://ftp.us.debian.org/debian testing main contrib non-free" >> /etc/apt/sources.list
-  - apt-get update
-  - apt-get install -y git
-  - apt-get clean all
-  - gem install dpl
-  - 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
-  - git config --global user.email "connect@zuora.com"
-  - git config --global user.name "Connect Automation"
-  - git commit -m "Automated Version Update $VERSION"
   - bundle install
   - gem install rake
   - version=$(rake install | grep -o 'pkg/zuora_api-.*gem')
   - curl -u $USERNAME:$PASSWORD https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials; chmod 0600 ~/.gem/credentials
   - gem push $version
   only:
-    - master
-    - staging
+  - master

data/CHANGELOG.md

@@ -1,23 +1,18 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [1.6.32] - 2018-5-14
-### Changed
-- Don't log fatal errors, allow application to decide for file download
-- Don't change api url if the user set a high api url
-
-###Removed
-- Force encoding
-
-## [1.6.28] - 2018-3-12
+## [1.6.16] - 2018-12-09
 ### Added
-- Way to avoid force encoding for filedownload
+- Example
 
-## [1.6.28] - 2018-3-12
-### Added
-- Way to avoid force encoding for filedownload
+### Changed
+- Example
+
+### Removed
+- Example
 
 ## [1.6.22] - 2019-01-03
+
 ### Changed
 - get_identity method - supports ZSession auth now
 - updated rspecs accordingly

data/lib/zuora_api/exceptions.rb

@@ -6,8 +6,8 @@ module ZuoraAPI
       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
+      def initialize(message = nil,response=nil, code =nil)
+        @code = code
         @message = message
         @response = response
         @default_message = "Error with Zuora Session."
@@ -22,8 +22,8 @@ module ZuoraAPI
       attr_reader :code, :response, :errors, :successes
       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
+      def initialize(message = nil,response=nil, code =nil, errors = [], successes = [])
+        @code = code
         @message = message
         @response = response
         @default_message = "Error with Zuora Entity"
@@ -40,8 +40,8 @@ module ZuoraAPI
       attr_reader :code, :response, :errors, :successes
       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
+      def initialize(message = nil,response=nil, code =nil, errors = [], successes = [])
+        @code = code
         @message = message
         @response = response
         @default_message = "Error communicating with Zuora."
@@ -58,8 +58,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, code =nil)
+        @code = code
         @message = message
         @response = response
         @default_message = "Your request limit has been exceeded for zuora."
@@ -74,24 +74,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
-        @message = message
-        @response = response
-        @default_message = "Operation failed due to lock competition. Please retry"
-      end
-
-      def to_s
-        @message || @default_message
-      end
-    end
-
-    class ZuoraDataIntegrity < 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
+      def initialize(message = nil,response=nil, code =nil)
+        @code = code
         @message = message
         @response = response
         @default_message = "Operation failed due to lock competition. Please retry"
@@ -106,8 +90,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, code =nil)
+        @code = code
         @message = message
         @response = response
         @default_message = "There is a temporary error with zuora system."
@@ -122,8 +106,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, code =nil)
+        @code = code
         @message = message
         @response = response
         @default_message = "Authentication type is not supported by this Login"

data/lib/zuora_api/login.rb

@@ -1,38 +1,28 @@
 require "httparty"
 require "nokogiri"
 require "uri"
-require 'zuora_api/exceptions'
 
 module ZuoraAPI
   class Login
     ENVIRONMENTS = [SANDBOX = 'Sandbox', PRODUCTION = 'Production', PREFORMANCE = 'Preformance', SERVICES = 'Services', UNKNOWN = 'Unknown', STAGING = 'Staging' ]
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
-    MIN_Endpoint = '96.0'
+    MIN_Endpoint = '91.0'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
-    CONNECTION_EXCEPTIONS = [Net::OpenTimeout, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL]
+    CONNECTION_EXCEPTIONS = [Net::OpenTimeout, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError]
     CONNECTION_READ_EXCEPTIONS = [Net::ReadTimeout, Errno::ECONNRESET, Errno::EPIPE]
-    ZUORA_API_ERRORS = [ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition, ZuoraAPI::Exceptions::ZuoraAPITemporaryError, ZuoraAPI::Exceptions::ZuoraDataIntegrity]
-    
-    attr_accessor :region, :url, :wsdl_number, :current_session, :bearer_token, :oauth_session_expires_at, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
 
-    def initialize(url: nil, entity_id: nil, session: nil, status: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
-      raise "URL is nil or empty, but URL is required" if url.nil? || url.empty?
+    attr_accessor :region, :url, :wsdl_number, :current_session, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
+
+    def initialize(url: nil, entity_id: nil, session: nil, status: nil, **keyword_args)
+      raise "URL is nil or empty, but URL is required" if url.nil? | url.empty?
       # raise "URL is improper. URL must contain zuora.com, zuora.eu, or zuora.na" if /zuora.com|zuora.eu|zuora.na/ === url
-      self.hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
-      if !/apps\/services\/a\/\d{2}\.\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)
-      else
-        self.url = url
-      end
-      self.entity_id = get_entity_id(entity_id: entity_id)
-      self.errors = Hash.new
-      self.current_session = session
-      self.bearer_token = bearer_token
-      self.oauth_session_expires_at = oauth_session_expires_at
-      self.status = status.blank? ? "Active" : status
-      self.user_info = Hash.new
+      @url = url.gsub(/(\d{2}\.\d)$/, MIN_Endpoint)
+      @hostname = /(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url)[0] if !/(?<=https:\/\/|http:\/\/)(.*?)(?=\/|$)/.match(url).nil?
+      @entity_id = get_entity_id(entity_id: entity_id)
+      @errors = Hash.new
+      @current_session = session
+      @status = status.blank? ? "Active" : status
+      @user_info = Hash.new
       self.update_region
       self.update_environment
       self.update_zconnect_provider
@@ -46,21 +36,21 @@ module ZuoraAPI
         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?
+        elsif !zconnect_accesstoken.blank?
+          code = zconnect_accesstoken.split("#!").last
+          encrypted_token, tenant_id = Base64.decode64(code).split(":")
           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")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Invalid ZConnect Cookie", {}, 400)
           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}")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}", {}, 400)
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
           end
         end
       rescue JSON::ParserError => ex
@@ -74,17 +64,17 @@ module ZuoraAPI
       zsession = cookies["ZSession"]
       zconnect_accesstoken = get_zconnect_accesstoken(cookies)
       begin
-        if zsession.present?
+        if !zsession.blank?
           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?
+        elsif !zconnect_accesstoken.blank?
           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}")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}", {}, 400)
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
           end
         end
       rescue JSON::ParserError => ex
@@ -106,9 +96,9 @@ module ZuoraAPI
           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}")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}", {}, 400)
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
           end
         end
       rescue JSON::ParserError => ex
@@ -130,9 +120,9 @@ module ZuoraAPI
           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}")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZConnect cookie present matching #{self.hostname}", {}, 400)
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present")
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("No ZSession cookie present", {}, 400)
           end
         end
       rescue JSON::ParserError => ex
@@ -180,12 +170,12 @@ module ZuoraAPI
         if entity_ids.blank? && cookies["ZuoraCurrentEntity"].present?
           entity_ids = Array(cookies["ZuoraCurrentEntity"].unpack("a8a4a4a4a12").join('-'))
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora Entity ID not provided")
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora Entity ID not provided", {}, 400)
         end
         if user_id.blank? && cookies["Zuora-User-Id"].present?
           user_id = cookies["Zuora-User-Id"]
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora User ID not provided")
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora User ID not provided", {}, 400)
         end
       elsif !client_id.nil? && !client_secret.nil?
         bearer_response = HTTParty.post("https://#{self.hostname}/oauth/token", :headers => {'Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json'}, :body => {'client_id' => client_id, 'client_secret' => URI::encode(client_secret), 'grant_type' => 'client_credentials'})
@@ -202,12 +192,12 @@ module ZuoraAPI
           output_json["clientSecret"] = new_client_secret
           return output_json
         elsif oauth_response.code == 401 && !oauth_response.message.blank?
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["message"], oauth_response)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["message"], {}, oauth_response.code)
         else
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["error"], oauth_response)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["error"], {}, oauth_response.code)
         end
       else
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Insufficient credentials provided")
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Insufficient credentials provided", {}, 400)
       end
     end
 
@@ -267,7 +257,7 @@ module ZuoraAPI
       if !self.url.blank?
         if /(?<=\.|\/|-|^)(apisandbox|sandbox)(?=\.|\/|-|$)/ === self.hostname
           self.environment = 'Sandbox'
-        elsif /(?<=\.|\/|^)(service[\d]*|services[\d]*|ep-edge)(?=\.|\/|$)/ === self.hostname
+        elsif /(?<=\.|\/|^)(service|services[\d]*|ep-edge)(?=\.|\/|$)/ === self.hostname
           self.environment = 'Services'
         elsif /(?<=\.|\/|-|^)(pt[\d]*)(?=\.|\/|-|$)/ === self.hostname
           self.environment = 'Performance'
@@ -342,22 +332,17 @@ module ZuoraAPI
       when 'Services'
         https = /https:\/\/|http:\/\//.match(self.url)[0]
         host = self.hostname
-        endpoint = "#{https}rest#{host}/v1/#{url}"
+        endpoint = "#{https}#{host}/apps/v1/#{url}"
       when 'Staging'
-        endpoint = "https://rest-staging2.zuora.com/v1/".concat(url)
+        endpoint = "https://rest-staging2.zuora.com/".concat(url)
       when 'Unknown'
         raise "Environment unknown, returning passed in parameter unaltered"
       end
       return endpoint
     end
 
-    def rest_domain
-      require 'addressable/uri'
-      return ::Addressable::URI.parse(self.rest_endpoint).host      
-    end
-
     def fileURL(url="")
-      return self.rest_endpoint("file/").concat(url)
+      return self.url.split(".com").first.concat(".com/apps/api/file/").concat(url)
     end
 
     def dateFormat
@@ -368,16 +353,17 @@ module ZuoraAPI
     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'
+      Rails.logger.debug("Get session for #{auth_type} - #{self.class.to_s}")
       case auth_type
       when :basic
         if self.current_session.blank?
+          Rails.logger.debug("Create new session")
           case self.class.to_s
           when 'ZuoraAPI::Oauth'
             if self.bearer_token.blank? || self.oauth_expired?
               self.new_session(auth_type: :bearer)
             end
-            self.get_z_session if self.status == 'Active'
+            self.get_z_session
           when 'ZuoraAPI::Basic'
             self.new_session(auth_type: :basic)
           else
@@ -400,7 +386,7 @@ module ZuoraAPI
       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, single_transaction: false, debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], 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/",
@@ -450,7 +436,7 @@ module ZuoraAPI
           return output_xml, input_xml, response
         end
       end
-    rescue *ZUORA_API_ERRORS => ex
+    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition => ex
       if errors.include?(ex.class)
         raise ex
       else
@@ -472,12 +458,6 @@ module ZuoraAPI
       else
         raise ex
       end
-    rescue Errno::ECONNRESET => ex
-      if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
-        retry
-      else
-        raise ex
-      end
     rescue => ex
       raise ex
     else
@@ -519,102 +499,93 @@ module ZuoraAPI
           if error.class == String
             case error
             when "INVALID_SESSION"
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{error}::#{message}", body, response.code )
             when "REQUEST_EXCEEDED_LIMIT"
-              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{error}::#{message}", body, response.code)
             when "LOCK_COMPETITION"
-              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", body, response.code)
             when "BATCH_FAIL_ERROR"
               if message.include?("optimistic locking failed")
-                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", response) 
+                raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{error}::#{message}", body, response.code) 
               else
-                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response)
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.code)
               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
+              raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{error}::#{message}", body, response.code)
             else
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", response) if error.present?
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{error}::#{message}", body, response.code) if error.present?
             end
           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)
-            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
+              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(', '), body, response.code)
+              else
+                raise ZuoraAPI::Exceptions::ZuoraAPIError.new(error.group_by {|v| v}.map {|k,v| "(#{v.size}x) - #{k == "::" ? 'UNKNOWN::No error provided' : k}"}.join(', '), body, response.code, error, success)
+              end
           end
         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)
+          raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", body, response.code)
         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
-          messages_array = messages_array.push(body.dig("error", 'message')).compact if body.dig('error').class == Hash
-          codes_array =    body.fetch("reasons", []).map {|error| error['code']}.compact
-          codes_array = codes_array.push(body.dig("error", 'code')).compact  if body.dig('error').class == Hash
+          messages_array = (body["reasons"] || []).map {|error| error['message']}.compact
+          codes_array = (body["reasons"] || []).map {|error| error['code']}.compact
 
           if body['message'] == "No bearer token" && response.code == 400
-            raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Authentication type is not supported by this Login", response)
+            raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new()
           end
 
           if body['errorMessage']
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['errorMessage'], response)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['errorMessage'],body,response.code)
           end
 
           if body.dig("reasons").nil? ? false : body.dig("reasons")[0].dig("code") == 90000020
-            raise ZuoraAPI::Exceptions::BadEntityError.new("#{messages_array.join(', ')}", response)
+            raise ZuoraAPI::Exceptions::BadEntityError.new("#{messages_array.join(', ')}", body, response.code)
           end
 
           if body['error'] == 'Unauthorized' && body['status'] = 401
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", body, response.code)
           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)
+          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(11) || response.code == 401
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", body, response.code)
           end
 
           #Zuora REST Create Amendment error #Authentication failed
           if body["faultcode"].present? && body["faultcode"] == "fns:INVALID_SESSION"
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body['faultstring']}", response)
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body['faultstring']}", body, response.code)
           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)
+            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", body, response.code)
           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          
+            raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}", body, response.code)
+          end
 
           #All Errors catch
           if codes_array.size > 0
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}", response)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{messages_array.join(', ')}", body, response.code)
           end
 
           #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)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             when "fns:REQUEST_EXCEEDED_LIMIT"
-              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             when "fns:LOCK_COMPETITION"
-              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             when "INVALID_SESSION"
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             else
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", response)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{body["faultcode"]}::#{body["faultstring"]}", body, response.code)
             end
           end
 
@@ -623,39 +594,34 @@ module ZuoraAPI
             (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)
+              raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{errors.join(", ")}", body, response.code, errors)
             end
           end
         end
 
-        #Zuora REST Actions error (Create, Update, Delete, Amend)
+        #Zuora REST Actions error (Create, Update, Delete)
         if body.class == Array
           all_errors = body.select {|obj| !obj['Success'] || !obj['success'] }.map {|obj| obj['Errors'] || obj['errors'] }.compact
           all_success = body.select {|obj| obj['Success'] || obj['success']}.compact
 
           if all_success.blank? && all_errors.present?
             error_codes = all_errors.flatten.group_by {|error| error['Code']}.keys.uniq
-            error_messages = all_errors.flatten.group_by {|error| error['Message']}.keys.uniq
-            if error_codes.size == 1 || error_messages.size == 1
-              if error_codes.first == "LOCK_COMPETITION"
-                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 
+            if error_codes.size == 1 && error_codes[0] == "LOCK_COMPETITION"
+              raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("Retry Lock Competition", body, response.code)
             end
           end
 
           if all_errors.size > 0
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{all_errors.flatten.group_by {|error| error['Message']}.keys.uniq.join(' ')}", response, all_errors, all_success)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{all_errors.flatten.group_by {|error| error['Message']}.keys.uniq.join(' ')}", body, response.code, all_errors, all_success  )
           end
         end
 
         #All other errors
-        if ![200,201].include?(response.code)
+        if response.code != 200
           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::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", body, response.code)
           else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", response)
+            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", body, response.code)
           end
         end
       end
@@ -678,7 +644,7 @@ module ZuoraAPI
       }
       response = self.rest_call(method: :post, body: params.to_json, url: self.aqua_endpoint("batch-query/"))
       if(response[0]["id"].nil?)
-        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error in AQuA Process.", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error in AQuA Process. #{response}")
       end
       return getFileById(id: response[0]["id"])
     end
@@ -691,7 +657,7 @@ module ZuoraAPI
         response, fullResponse = self.rest_call(method: :get, body: {}, url: self.aqua_endpoint("batch-query/jobs/#{id}"))
         result = response["batches"][0]["status"]
         if result == "error"
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Aqua Error", response)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Aqua Error: #{response}")
           break
         end
       end
@@ -707,7 +673,7 @@ module ZuoraAPI
       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)
 
-      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error.present? ? self.current_error : 'Describe call 401', response) if response.code == 401
+      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error.present? ? self.current_error : 'Describe call 401' ) if response.code == 401
 
       output_xml = Nokogiri::XML(response.body)
       des_hash = Hash.new
@@ -747,12 +713,11 @@ module ZuoraAPI
         raise ex
       end
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !(tries -= 1).zero? && self.status == 'Active'
-        Rails.logger.debug("Session expired. Starting new session.")
+      if !(tries -= 1).zero?
+        Rails.logger.info("Session expired. Starting new session.")
         self.new_session
         retry
       else
-        Rails.logger.error("Session expired. Starting new session.")
         raise ex
       end
     rescue => ex
@@ -761,7 +726,7 @@ module ZuoraAPI
       return des_hash
     end
 
-    def rest_call(method: :get, body: nil, headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError].concat(ZUORA_API_ERRORS), z_session: true, session_type: :basic, timeout_retry: false, timeout: 120, **keyword_args)
+    def rest_call(method: :get, body: nil, headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, session_type: :basic, timeout_retry: false, timeout: 120, **keyword_args)
       tries ||= 2
 
       if self.entity_id.present?
@@ -772,9 +737,9 @@ module ZuoraAPI
       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)
+      headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(headers).merge(authentication_headers)
 
-      response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: modified_headers, timeout: timeout).perform
+      response = HTTParty::Request.new("Net::HTTP::#{method.to_s.capitalize}".constantize, url, body: body, headers: headers, timeout: timeout).perform
       Rails.logger.debug("Response Code: #{response.code}") if debug
       begin
         output_json = JSON.parse(response.body)
@@ -785,8 +750,8 @@ module ZuoraAPI
 
       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")
-        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)
+      if self.class.to_s == 'ZuoraAPI::Oauth'
+        self.rest_call(method: method.to_sym, url: url, 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
@@ -803,7 +768,7 @@ module ZuoraAPI
           return [output_json, response]
         end
       end
-    rescue *ZUORA_API_ERRORS => ex
+    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
       if errors.include?(ex.class)
         raise ex
       else
@@ -827,12 +792,6 @@ module ZuoraAPI
       else
         raise ex
       end
-    rescue Errno::ECONNRESET => ex
-      if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
-        retry
-      else
-        raise ex
-      end
     rescue => ex
       raise ex
     else
@@ -860,7 +819,7 @@ module ZuoraAPI
         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
-          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}", response)
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Error Getting Catalog: #{output_json}")
         end
         output_json["products"].each do |product|
           catalog_map[product["id"]] = {"productId" => product["id"]}
@@ -897,130 +856,129 @@ module ZuoraAPI
         uri = URI.parse(url)
         http = Net::HTTP.new(uri.host, uri.port)
         http.read_timeout = timeout #Seconds
-        http.use_ssl = true  if !uri.scheme.nil? && uri.scheme.downcase == 'https'
+        http.use_ssl = true  if uri.scheme.downcase == 'https'
         if z_session
           headers = headers.merge({"Authorization" => self.get_session(prefix: true)})
           headers = headers.merge({"Zuora-Entity-Ids" => self.entity_id}) if !self.entity_id.blank?
         end
 
         response_save = nil
-        begin
-          http.request_get(uri.request_uri, headers) do |response|
-            response_save = response
-            status_code = response.code if response
-
-            case response
-            when Net::HTTPNotFound
-              raise
-
-            when Net::HTTPUnauthorized
-              if count <= 0
-                if z_session
-                  raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
-                else
-                  raise
-                end
-              end
-              self.new_session if z_session
-              return get_file(:url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries, :timeout => timeout)
+        http.request_get(uri.request_uri, headers) do |response|
+          response_save = response
+          status_code = response.code if response
 
-            when Net::HTTPClientError
-              raise
+          case response
+          when Net::HTTPNotFound
+            Rails.logger.fatal("404 - Not Found")
+            raise
 
-            when Net::HTTPOK
-              headers = {}
-              response.each_header do |k,v|
-                headers[k] = v
-              end
-              Rails.logger.debug("Headers: #{headers.to_s}")
-              if output_file_name.present?
-                file_ending ||= output_file_name.end_with?(".csv.zip") ? ".csv.zip" : File.extname(output_file_name)
-                filename ||= File.basename(output_file_name, file_ending)
+          when Net::HTTPUnauthorized
+            if count <= 0
+              if z_session
+                raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+              else
+                raise
               end
+            end
+            Rails.logger.fatal("Unauthorized: Retry")
+            self.new_session if z_session
+            return get_file(:url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries, :timeout => timeout)
 
-              size, export_progress = [0, 0]
-              encoding, type, full_filename = [nil, nil, nil]
-              if response.header["Content-Disposition"].present?
-                case response.header["Content-Disposition"]
-                when /.*; filename\*=.*/
-                  full_filename ||= /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[2].strip
-                  encoding = /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[1].strip
-                when /.*; filename=/
-                  full_filename ||= /.*; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
-                else
-                  raise "Can't parse Content-Disposition header: #{response.header["Content-Disposition"]}"
-                end
-                file_ending ||= full_filename.end_with?(".csv.zip") ? ".csv.zip" : File.extname(full_filename)
-                filename ||= File.basename(full_filename, file_ending)
-              end
+          when *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS)
+            Rails.logger.fatal("#{response.class} timeout - retry")
+            return get_file(:url => url, :headers => headers, :count => count, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries - 1, :timeout => timeout)
 
-              #If user supplied a filename use it, else default to content header filename, else default to uri pattern
-              file_ending ||= uri.path.end_with?(".csv.zip") ? ".csv.zip" : File.extname(uri.path)
-              filename ||= File.basename(uri.path, file_ending)
-
-              if response.header["Content-Type"].present?
-                case response.header["Content-Type"]
-                when /.*;charset=.*/
-                  type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
-                  encoding = /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
-                else
-                  type = response.header["Content-Type"]
-                  encoding ||= 'UTF-8'
-                end
-              end
+          when Net::HTTPClientError
+            raise
+
+          when Net::HTTPOK
+            headers = {}
+            response.each_header do |k,v|
+              headers[k] = v
+            end
+            Rails.logger.debug("Headers: #{headers.to_s}")
 
-              if response.header["Content-Length"].present?
-                export_size = response.header["Content-Length"].to_i
-              elsif response.header["ContentLength"].present?
-                export_size = response.header["ContentLength"].to_i
+            if output_file_name.present?
+              file_ending ||= output_file_name.end_with?(".csv.zip") ? ".csv.zip" : File.extname(output_file_name)
+              filename ||= File.basename(output_file_name, file_ending)
+            end
+
+            size, export_progress = [0, 0]
+            encoding, type, full_filename = [nil, nil, nil]
+            if response.header["Content-Disposition"].present?
+              case response.header["Content-Disposition"]
+              when /.*; filename\*=.*/
+                full_filename ||= /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[2].strip
+                encoding = /.*; filename\*=(.*)''(.*)/.match(response.header["Content-Disposition"])[1].strip
+              when /.*; filename=/
+                full_filename ||= /.*; filename=(.*)/.match(response.header["Content-Disposition"])[1].strip
+              else
+                raise "Can't parse Content-Disposition header: #{response.header["Content-Disposition"]}"
               end
+              file_ending ||= full_filename.end_with?(".csv.zip") ? ".csv.zip" : File.extname(full_filename)
+              filename ||= File.basename(full_filename, file_ending)
+            end
 
-              Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type} #{export_size}")
+            #If user supplied a filename use it, else default to content header filename, else default to uri pattern
+            file_ending ||= uri.path.end_with?(".csv.zip") ? ".csv.zip" : File.extname(uri.path)
+            filename ||= File.basename(uri.path, file_ending)
 
-              file_prefix = add_timestamp ? "#{filename}_#{Time.now.to_i}" : filename
-              if tempfile
-                require 'tempfile'
-                file_handle = ::Tempfile.new([file_prefix, "#{file_ending}"], file_path)
+            if response.header["Content-Type"].present?
+              case response.header["Content-Type"]
+              when /.*;charset=.*/
+                type = /(.*);charset=(.*)/.match(response.header["Content-Type"])[1]
+                encoding = /(.*);charset=(.*)/.match(response.header["Content-Type"])[2]
               else
-                file_handle = File.new(file_path.join("#{file_prefix}#{file_ending}"), "w+")
+                type = response.header["Content-Type"]
+                encoding ||= 'UTF-8'
               end
-              file_handle.binmode
-
-              response.read_body do |chunk|
-                file_handle << chunk
-
-                if defined?(export_size) && export_size != 0  && export_size.class == Integer
-                  size += chunk.size
-                  new_progress = (size * 100) / export_size
-                  unless new_progress == export_progress
-                    Rails.logger.debug("Login: Export Downloading %s (%3d%%)" % [filename, new_progress])
-                  end
-                  export_progress = new_progress
+            end
+            Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type}")
+
+            if response.header["Content-Length"].present?
+              export_size = response.header["Content-Length"].to_i
+            elsif response.header["ContentLength"].present?
+              export_size = response.header["ContentLength"].to_i
+            end
+
+            file_prefix = add_timestamp ? "#{filename}_#{Time.now.to_i}" : filename
+            if tempfile
+              require 'tempfile'
+              file_handle = ::Tempfile.new([file_prefix, "#{file_ending}"], file_path)
+            else
+              file_handle = File.new(file_path.join("#{file_prefix}#{file_ending}"), "w+")
+            end
+            file_handle.binmode
+
+            response.read_body do |chunk|
+              file_handle << chunk.force_encoding(encoding)
+
+              if defined?(export_size) && export_size != 0  && export_size.class == Integer
+                size += chunk.size
+                new_progress = (size * 100) / export_size
+                unless new_progress == export_progress
+                  Rails.logger.debug("Login: Export Downloading %s (%3d%%)" % [filename, new_progress])
                 end
+                export_progress = new_progress
               end
+            end
 
-              file_handle.close
-              Rails.logger.debug("Filepath: #{file_handle.path} Size: #{File.size(file_handle.path).to_f/1000000} mb")
+            file_handle.close
+            Rails.logger.debug("Filepath: #{file_handle.path} Size: #{File.size(file_handle.path).to_f/1000000} mb")
 
-              return file_handle
-            end
-          end
-        rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS).concat([Net::HTTPBadResponse]) => e
-          sleep(5)
-          if (timeout_retries -= 1) >= 0
-            Rails.logger.warn("Download Failed: #{e.class} : #{e.message}")
-            retry
-          else
-            raise
+            return file_handle
           end
         end
-      rescue => ex
-        Rails.logger.fatal(ex)
+      rescue Exception => e
+        Rails.logger.fatal("Download Failed: #{response_save} - #{e.class} : #{e.message}")
+        Rails.logger.fatal("Download Failed: #{e.backtrace.join("\n")}")
         raise
       end
     end
 
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true)
+      Rails.logger.debug("Build export")
+      Rails.logger.debug("#{query}")
       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
@@ -1075,6 +1033,7 @@ module ZuoraAPI
       end
 
       file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
+      Rails.logger.debug('=====> Export finished')
       export_file = get_file(:url => self.fileURL(file_id))
       export_file_path = export_file.path
       Rails.logger.debug("=====> Export path #{export_file.path}")
@@ -1093,6 +1052,7 @@ module ZuoraAPI
     end
 
     def query(query, parse = false)
+      Rails.logger.debug("Querying Zuora for #{query}")
       output_xml, input_xml = self.soap_call({:debug => false, :timeout_retry => true}) do |xml|
         xml['ns1'].query do
           xml['ns1'].queryString query

data/lib/zuora_api/logins/basic.rb

@@ -1,17 +1,15 @@
 module ZuoraAPI
   class Basic < Login
-    attr_accessor :username, :password, :session
-    def initialize(username: nil, password: nil, session: nil, **keyword_args)
-      self.username = username
-      self.password = password
-      self.current_session = session
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Basic Login but either 'Username' or 'Password' were not passed.") if self.current_session.blank? && (self.password.blank? && self.username.blank?)
+    attr_accessor :username, :password
+    def initialize(username: nil, password: nil, **keyword_args)
+      @username = username
+      @password = password
       super
     end
 
-    def new_session(auth_type: :basic, debug: false)
+    def new_session( auth_type: :basic, debug: false)
       raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login, does not support Authentication of Type: #{auth_type}") if auth_type != :basic
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Basic Login but either 'Username' or 'Password' were not passed.") if (self.password.blank? && self.username.blank?)
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login requires username and password to be set.") if auth_type == :basic && (self.password.blank? && self.username.blank?)
 
       tries ||= 2
       request = Nokogiri::XML::Builder.new do |xml|
@@ -29,16 +27,16 @@ module ZuoraAPI
       
       input_xml = Nokogiri::XML(request.to_xml(:save_with => XML_SAVE_OPTIONS).strip)
       input_xml.xpath('//ns1:session', 'ns1' =>'http://api.zuora.com/').children.remove
-      Rails.logger.debug('Connect') {"SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug
+      Rails.logger.debug('Connect') {"Request Code: #{@response_query.code} SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug
       
-      response_query = HTTParty.post(self.url,:body => request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => 10)
-      output_xml = Nokogiri::XML(response_query.body)
-      Rails.logger.debug('Connect') {"Response Code: #{response_query.code} SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug   
+      @response_query = HTTParty.post(self.url,:body => request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, :headers => {'Content-Type' => "text/xml; charset=utf-8"}, :timeout => 10)
+      @output_xml = Nokogiri::XML(@response_query.body)
+      Rails.logger.debug('Connect') {"Response Code: #{@response_query.code} SOAP XML: #{@output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}"} if debug   
 
-      if !response_query.success?
+      if !@response_query.success?
         self.current_session = nil
-        if output_xml.namespaces.size > 0  && output_xml.xpath('//soapenv:Fault').size > 0
-          self.current_error = output_xml.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
+        if @output_xml.namespaces.size > 0  && @output_xml.xpath('//soapenv:Fault').size > 0
+          self.current_error = @output_xml.xpath('//fns:FaultMessage', 'fns' =>'http://fault.api.zuora.com/').text
           if self.current_error.include?('deactivated')
             self.status = 'Deactivated'
             self.current_error = 'Deactivated user login, please check with Zuora tenant administrator'
@@ -77,20 +75,19 @@ module ZuoraAPI
             self.errors[:base] = self.current_error
           else
             self.status = 'Unknown'
-            self.current_error =  output_xml.xpath('//faultstring').text if self.current_error.blank?
+            self.current_error =  @output_xml.xpath('//faultstring').text if self.current_error.blank?
             self.errors[:base] = self.current_error
           end
 
         else
           self.status = 'Unknown'
-          self.current_error =  output_xml.xpath('//faultstring').text if self.current_error.blank?
+          self.current_error =  @output_xml.xpath('//faultstring').text if self.current_error.blank?
           self.errors[:base] = self.current_error
         end
       else             
         #Username & password combo
-        retrieved_session = output_xml.xpath('//ns1:Session', 'ns1' =>'http://api.zuora.com/').text
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("No session found for api call.", response_query) if retrieved_session.blank?
-        self.status = 'Active'
+        retrieved_session = @output_xml.xpath('//ns1:Session', 'ns1' =>'http://api.zuora.com/').text
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("No session found for api call.") if retrieved_session.blank?
         self.current_session = retrieved_session
       end
       return self.status
@@ -104,12 +101,6 @@ module ZuoraAPI
         self.status = 'Timeout'
         return self.status
       end
-    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'
-        return self.status
-      end
     end
   end
 end

data/lib/zuora_api/logins/oauth.rb

@@ -5,9 +5,9 @@ module ZuoraAPI
     def initialize(oauth_client_id: nil, oauth_secret: nil, bearer_token: nil, oauth_session_expires_at: nil, **keyword_args)
       self.oauth_client_id = oauth_client_id
       self.oauth_secret = oauth_secret
-      self.bearer_token = bearer_token
-      self.oauth_session_expires_at = oauth_session_expires_at
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if self.bearer_token.blank? && (self.oauth_client_id.blank? || self.oauth_secret.blank?)
+      self.bearer_token = bearer_token if !bearer_token.blank?
+      self.oauth_session_expires_at = oauth_session_expires_at if !oauth_session_expires_at.blank?
+      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if @oauth_client_id.blank? || @oauth_secret.blank?
       super
     end
 
@@ -16,10 +16,10 @@ module ZuoraAPI
         get_bearer_token()
       elsif auth_type == :basic
         get_bearer_token() if self.oauth_expired?
-        get_z_session() if self.status == 'Active'
+        get_z_session()
       else
         get_bearer_token()
-        get_z_session() if self.status == 'Active'
+        get_z_session()
       end
       return self.status
     end
@@ -66,8 +66,6 @@ module ZuoraAPI
 
     def get_bearer_token
       tries ||= 2
-      raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Request Oauth Login but either 'Oauth Client Id' or 'Oauth Secret' were not passed") if self.oauth_client_id.blank? || self.oauth_secret.blank?
-
       output_json, response = self.rest_call(:method => :post, 
         :url => self.rest_endpoint.chomp('v1/').concat("oauth/token"), 
         :z_session => false,
@@ -89,7 +87,11 @@ module ZuoraAPI
       self.status = 'Invalid Login'
       return self.status
     rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
-      raise ex
+      if errors.include?(ex.class)
+        raise ex
+      else
+        return [output_json, response]
+      end
     rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.54"
+  VERSION = "1.6.251"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.54
+  version: 1.6.251
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -186,7 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Gem that provides easy integration to Zuora