zuora_api 1.7.66b → 1.7.66h

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e57efb2492106ced22eaf4a943801d0f639eab7c8e1e6c5a4a927fe556963007
-  data.tar.gz: e21363cc410dd6c49e5513db1fd3561ea9d13ec7390e57b7abf6b966a44314b6
+  metadata.gz: f249f52bbfd3bc0ab1973ecdfa9bacf5d61d8c115f2c84a662c35df5479ffe88
+  data.tar.gz: 486c87116df598676c3939b0ef9bb15be136b1d84d5836077ab382476eedfd3a
 SHA512:
-  metadata.gz: 1869137cefa3e67accb4bd917e4466df8627cf198eff2409420c0176c8e4fe728f8a56d53297a7f7418d7f7b207a1843383c74379cfc5662ec38c19e3e05300a
-  data.tar.gz: 037fa29a6add8b326da59402cdd2207c65385d3046869866c3cb2a5cbc2e8935855aeba549fda5239579cf4e3aabd86ce992b3dc1c9284ee166bf8c333b95bbd
+  metadata.gz: 85cdae2878399c64bd5bda7bcffb7e18b57651abebcf6d909efaa11d0af253103232c70229db86f5564b18ef24dce3b1f4c3fa56ffa67bd98905e7920352974e
+  data.tar.gz: b7db4bcfa9cab99ca10f9545ccfeba97a75f555fd64d718ea3d9f267706c9339e2af0f47837d1cecc53c624b901158881d870051b522af2894b12e9afb84b6d9

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

data/Gemfile

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

data/lib/zuora_api/exceptions.rb

@@ -40,6 +40,19 @@ module ZuoraAPI
       def to_s
         @message || @default_message
       end
+
+      def parse_message(message)
+        case message
+        when /^Invalid Oauth Client Id$/, /^Unable to generate token.$/
+          @message = "Invalid login, please check client ID and Client Secret or URL endpoint"
+        when /^Forbidden$/
+          @message = "The user associated to OAuth credential set has been deactivated."
+        when /^Invalid login. User name and password do not match.$/
+          @message = "Invalid login, please check username and password or URL endpoint"
+        else
+          @message = message
+        end
+      end
     end
 
     class BadEntityError < Error

data/lib/zuora_api/login.rb

@@ -374,8 +374,8 @@ module ZuoraAPI
       return domain ? endpoint.concat(prefix).concat(url) : prefix.concat(url)
     end
 
-    def rest_domain
-      return URI(self.rest_endpoint).host
+    def rest_domain(endpoint: self.rest_endpoint)
+      return URI(endpoint).host
     end
 
     def fileURL(url="")
@@ -387,10 +387,41 @@ module ZuoraAPI
     end
 
     def new_session(auth_type: :basic, debug: false, zuora_track_id: nil)
+      tries ||= 2
+      yield
+
+    rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+      self.status = 'Inactive/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 tries.zero?
+
+      tries -= 1
+      sleep(self.timeout_sleep)
+      retry
+        
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
+      self.log(location: "BasicLogin", exception: ex, message: "Timed out", level: :error)
+
+      self.current_error = "Request timed out. Try again"
+      self.status = 'Timeout'
+
+      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+
+    rescue EOFError
+      if self.url.match?(/.*services\d{1,}.zuora.com*/)
+        self.current_error = "Services tenant '#{self.url.scan(/.*\/\/(services\d{1,}).zuora.com*/).last.first}' is no longer available."
+        self.status = 'Not Available'
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
+      end
+
     end
 
     def get_session(prefix: false, auth_type: :basic, zuora_track_id: nil)
-      Rails.logger.debug("Get session for #{auth_type} - #{self.class.to_s}") if Rails.env.to_s == 'development'
       case auth_type
       when :basic
         if self.current_session.blank?
@@ -399,14 +430,13 @@ module ZuoraAPI
             if self.bearer_token.blank? || self.oauth_expired?
               self.new_session(auth_type: :bearer, zuora_track_id: zuora_track_id)
             end
-            self.get_z_session(zuora_track_id: zuora_track_id) if self.status == 'Active'
+            self.get_z_session(zuora_track_id: zuora_track_id)
           when 'ZuoraAPI::Basic'
             self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
           else
             self.new_session(auth_type: :basic, zuora_track_id: zuora_track_id)
           end
         end
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
         return prefix ? "ZSession #{self.current_session}" : self.current_session.to_s
       when :bearer
         case self.class.to_s
@@ -419,8 +449,6 @@ module ZuoraAPI
         else
           raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Unknown Login, does not support Authentication of Type: #{auth_type}")
         end
-
-        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
         return prefix ? "Bearer #{self.bearer_token}" : self.bearer_token.to_s
       end
     end
@@ -428,16 +456,18 @@ module ZuoraAPI
     def soap_call(
       ns1: 'ns1', 
       ns2: 'ns2', 
-      batch_size: nil, 
+      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: 120,
+      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|
@@ -447,8 +477,10 @@ module ZuoraAPI
                                  'xmlns:api' => "http://api.zuora.com/",
                                  "xmlns:#{ns1}" => "http://api.zuora.com/") do
           xml['SOAP-ENV'].Header do
-            xml["#{ns1}"].SessionHeader do
-              xml["#{ns1}"].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: zuora_track_id)
+            if !skip_session
+              xml["#{ns1}"].SessionHeader do
+                xml["#{ns1}"].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: zuora_track_id)
+              end
             end
             if single_transaction
               xml["#{ns1}"].CallOptions do
@@ -466,12 +498,11 @@ module ZuoraAPI
           end
         end
       end
-
       input_xml = Nokogiri::XML(xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip)
       input_xml.xpath('//ns1:session', 'ns1' =>'http://api.zuora.com/').children.remove
       Rails.logger.debug("Request SOAP XML: #{input_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
-      headers = { 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'}
+      headers.merge!({ 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'})
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
       request = HTTParty::Request.new(
@@ -488,7 +519,11 @@ module ZuoraAPI
       Rails.logger.debug("Response SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
       raise_errors(type: :SOAP, body: output_xml, response: response)
+
+      return output_xml, input_xml, response
+
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+      raise if skip_session
       if !tries.zero? && z_session
         tries -= 1
         Rails.logger.debug("SOAP Call - Session Invalid")
@@ -513,24 +548,20 @@ module ZuoraAPI
       return output_xml, input_xml, response
       
     rescue *CONNECTION_EXCEPTIONS => ex
-      if tries.zero?
-        if output_exception_messages
-          if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
-          else
-            Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
-          end
-        end
-        raise ex 
+      if !tries.zero?
+        tries -= 1
+        self.log(location: "SOAP Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
+        sleep(timeout_sleep_interval)
+        retry
       end
 
-      tries -= 1
-      sleep(timeout_sleep_interval)
-      retry
+      self.log(location: "SOAP Call", exception: ex, message: "Timed out", level: :error)  if output_exception_messages
+      raise ex 
+      
     rescue *CONNECTION_READ_EXCEPTIONS => ex
       if !tries.zero?
         tries -= 1
-
+        self.log(location: "SOAP Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
         if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
           retry
         elsif timeout_retry
@@ -539,19 +570,79 @@ module ZuoraAPI
         end
       end
 
-      if output_exception_messages
-        if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("SOAP Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
-        else
-          Rails.logger.error("SOAP Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
-        end
-      end
-      raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}", nil, request) if ex.instance_of?(Net::ReadTimeout)
+      self.log(location: "SOAP Call", exception: ex, message: "Timed out", level: :error)  if output_exception_messages
+      ex = ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from 'https://#{rest_domain(endpoint: url)}'", nil, request) if ex.instance_of?(Net::ReadTimeout)
       raise ex
+
     rescue => ex
       raise ex
-    else
-      return output_xml, input_xml, response
+    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
+        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
+      Rails.logger.error("Failed to create exception arguments", ex, args)
+    ensure
+      return args
     end
 
     def raise_errors(type: :SOAP, body: nil, response: nil)
@@ -568,13 +659,13 @@ module ZuoraAPI
       end
 
       if [502,503].include?(response.code)
-        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{request_uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from 'https://#{rest_domain(endpoint: request_uri)}'", response)
       end
 
       # Check failure response code
       case response.code
       when 504
-        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from #{request_uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from 'https://#{rest_domain(endpoint: request_uri)}'", response)
       when 429
         raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
       when 401
@@ -595,6 +686,10 @@ module ZuoraAPI
       when :SOAP
         error, success, message = get_soap_error_and_message(body)
 
+        if body.xpath('//fns:LoginFault', 'fns' =>'http://fault.api.zuora.com/').present? 
+          raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(message, response)
+        end
+
         if body.xpath('//ns1:queryResponse', 'ns1' => 'http://api.zuora.com/').present? &&
            body.xpath(
              '//ns1:records[@xsi:type="ns2:Export"]',
@@ -699,7 +794,11 @@ module ZuoraAPI
           end
 
           if body['error'] == 'Unauthorized' && body['status'] == 401
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
+            if body['message'].present?
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(body['message'], response)
+            else 
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("#{messages_array.join(', ')}", response)
+            end
           end
           #Authentication failed
           if (codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(11) || response.code == 401) && !codes_array.include?(422)
@@ -955,7 +1054,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
 
@@ -988,35 +1087,31 @@ module ZuoraAPI
         end
         des_hash[:related_objects] = output_xml.xpath(".//related-objects").xpath(".//object").map{ |x| [x.xpath(".//name").text.to_sym, [ [:url, x.attributes["href"].value], [:label, x.xpath(".//name").text ] ].to_h] }.to_h
       end
+
+      return des_hash
     rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if tries.zero?
-        if log_errors
-          if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("Describe - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
-          else
-            Rails.logger.error("Describe - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
-          end
-        end
-        raise ex 
+      if !tries.zero?
+        tries -= 1
+        self.log(location: "Describe", exception: ex, message: "Timed out will retry after #{self.timeout_sleep} seconds", level: :debug)
+        sleep(self.timeout_sleep)
+        retry
       end
 
-      tries -= 1
-      sleep(self.timeout_sleep)
-      retry
+      self.log(location: "Describe", exception: ex, message: "Timed out", level: :error) if log_errors
+      raise ex
+
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       if !tries.zero? && self.status == 'Active'
         tries -= 1
         Rails.logger.debug("Describe session expired. Starting new session.")
         self.new_session
         retry
-      else
-        Rails.logger.error("Describe session expired. Starting new session.") if log_errors
-        raise ex
       end
+
+      Rails.logger.error("Describe session expired. Starting new session.") if log_errors
+      raise ex
     rescue => ex
       raise ex
-    else
-      return des_hash
     end
 
     def rest_call(
@@ -1029,11 +1124,12 @@ module ZuoraAPI
       z_session: true,
       session_type: :basic,
       timeout_retry: false,
-      timeout: 120,
+      timeout: 130,
       timeout_sleep_interval: self.timeout_sleep, 
       multipart: false,
       stream_body: false,
       output_exception_messages: true,
+      zuora_track_id: nil,
       **keyword_args,
       &block
     )
@@ -1043,12 +1139,13 @@ module ZuoraAPI
 
       authentication_headers = {}
       if z_session
-        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type) }
+        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type, zuora_track_id: zuora_track_id) }
         if self.entity_id.present?
           authentication_headers["Zuora-Entity-Ids"] = self.entity_id if headers.dig("Zuora-Entity-Ids").nil?
           authentication_headers.delete_if { |key, value| ["entityId", "entityName"].include?(key.to_s) }
         end
       end
+      headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
       modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
 
@@ -1074,10 +1171,12 @@ module ZuoraAPI
         Rails.logger.debug("Response JSON: #{output_json}") if debug && output_json.present?
 
         raise_errors(type: :JSON, body: output_json, response: response)
-      rescue
+      rescue => ex
         reset_files(body) if multipart
         raise
       end
+
+      return [output_json, response]
     rescue ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError => ex
       if self.class.to_s == 'ZuoraAPI::Oauth' && ex.message.include?("Authentication type is not supported by this Login")
         session_type = :bearer
@@ -1112,23 +1211,21 @@ module ZuoraAPI
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
     rescue *CONNECTION_EXCEPTIONS => ex
-      if tries.zero?
-        if output_exception_messages
-          if Rails.logger.class.to_s == "Ougai::Logger"
-            Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
-          else
-            Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
-          end
-        end
-        raise ex 
+      if !tries.zero?
+        tries -= 1
+        self.log(location: "Rest Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
+        sleep(timeout_sleep_interval)
+        retry
       end
 
-      tries -= 1
-      sleep(timeout_sleep_interval)
-      retry
+      self.log(location: "Rest Call", exception: ex, message: "Timed out", level: :error) if output_exception_messages
+      raise ex 
+   
     rescue *CONNECTION_READ_EXCEPTIONS => ex
+
       if !tries.zero?
         tries -= 1
+        self.log(location: "Rest Call", exception: ex, message: "Timed out will retry after #{timeout_sleep_interval} seconds", level: :debug)
         if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
           retry
         elsif timeout_retry
@@ -1136,20 +1233,15 @@ module ZuoraAPI
           retry
         end
       end
-   
-      if output_exception_messages
-        if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("Rest Call - Timed out will retry after #{timeout_sleep_interval} seconds", ex) 
-        else
-          Rails.logger.error("Rest Call - #{ex.class} Timed out will retry after #{timeout_sleep_interval} seconds") 
-        end
-      end
-      raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}", nil, request) if ex.instance_of?(Net::ReadTimeout)
+      
+      self.log(location: "Rest Call", exception: ex, message: "Timed out", level: :error) if output_exception_messages
+      ex = ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read 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
@@ -1171,8 +1263,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|
@@ -1198,7 +1291,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, zuora_track_id: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 120, session_type: :basic, **execute_params)
+    def get_file(url: nil, headers: {}, z_session: true, tempfile: true, output_file_name: nil, zuora_track_id: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 3, timeout: 130, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       retry_count ||= timeout_retries
@@ -1306,12 +1399,10 @@ module ZuoraAPI
             if !(retry_count -= 1).zero?
               self.new_session
               raise response.class
-            else
-              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
             end
-          else
-            raise
+            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error)
           end
+          raise
         else
           raise ZuoraAPI::Exceptions::FileDownloadError.new("File Download Failed #{response.class}")
         end
@@ -1321,133 +1412,120 @@ module ZuoraAPI
       sleep(5)
       if (retry_count -= 1) >= 0
         retry
-      else
-        Rails.logger.error("File Download Failed")
-        raise
       end
+      Rails.logger.error("File Download Failed")
+      raise
     end
 
     def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: "")
-      begin
-        tries ||= 3
-        request = Nokogiri::XML::Builder.new do |xml|
-          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-            xml['SOAP-ENV'].Header do
-              xml['ns1'].SessionHeader do
-                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
-              end
+      tries ||= 3
+      request = Nokogiri::XML::Builder.new do |xml|
+        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
+          xml['SOAP-ENV'].Header do
+            xml['ns1'].SessionHeader do
+              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
             end
-            xml['SOAP-ENV'].Body do
-              xml['ns1'].create do
-                xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
-                  xml['ns2'].Format 'csv'
-                  xml['ns2'].Zip zip
-                  xml['ns2'].Name 'googman'
-                  xml['ns2'].Query query
-                  xml['ns2'].Encrypted encrypted
-                end
+          end
+          xml['SOAP-ENV'].Body do
+            xml['ns1'].create do
+              xml['ns1'].zObjects('xsi:type' => "ns2:Export") do
+                xml['ns2'].Format 'csv'
+                xml['ns2'].Zip zip
+                xml['ns2'].Name 'googman'
+                xml['ns2'].Query query
+                xml['ns2'].Encrypted encrypted
               end
             end
           end
         end
+      end
 
-        response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
+      response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 130)
 
-        output_xml = Nokogiri::XML(response_query.body)
-        raise_errors(type: :SOAP, body: output_xml, response: response_query) if output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
+      output_xml = Nokogiri::XML(response_query.body)
+      raise_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
+      # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
+      
+      id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
 
-        confirmRequest = Nokogiri::XML::Builder.new do |xml|
-          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-            xml['SOAP-ENV'].Header do
-              xml['ns1'].SessionHeader do
-                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
-              end
+      confirmRequest = Nokogiri::XML::Builder.new do |xml|
+        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
+          xml['SOAP-ENV'].Header do
+            xml['ns1'].SessionHeader do
+              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
             end
-            xml['SOAP-ENV'].Body do
-              xml['ns1'].query do
-                xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
-              end
+          end
+          xml['SOAP-ENV'].Body do
+            xml['ns1'].query do
+              xml['ns1'].queryString "SELECT  Id, CreatedById, CreatedDate, Encrypted, FileId, Format, Name, Query, Size, Status, StatusReason, UpdatedById, UpdatedDate, Zip From Export where Id = '#{id}'"
             end
           end
         end
-        result = 'Waiting'
-
-        while result != "Completed"
-          sleep 3
-          response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
-
-          output_xml = Nokogiri::XML(response_query.body)
-          result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
-          status_code = response_query.code if response_query
+      end
+      result = 'Waiting'
 
-          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
+      while result != "Completed"
+        sleep 3
+        response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 130)
 
-        file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
-        export_file = get_file(:url => self.fileURL(file_id))
-        export_file_path = export_file.path
-        Rails.logger.debug("=====> Export path #{export_file.path}")
-
-        if extract && zip
-          require "zip"
-          new_path = export_file_path.partition('.zip').first
-          zipped = Zip::File.open(export_file_path)
-          file_handle = zipped.entries.first
-          file_handle.extract(new_path)
-          File.delete(export_file_path)
-          return new_path
-        else
-          return export_file_path
-        end
-      rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-        if !(tries -= 1).zero?
-          Rails.logger.info("Export call failed - Trace ID: #{z_track_id}")
-          self.new_session
-          retry
-        else
-          raise ex
-        end
+        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
 
-      rescue ZuoraAPI::Exceptions::ZuoraUnexpectedError => ex
-        if !(tries -= 1).zero?
-          Rails.logger.info("Trace ID: #{z_track_id} UnexpectedError, will retry after 10 seconds")
-          sleep 10
-          retry
-        else
-          raise ex
-        end
+        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
 
-      rescue *ZUORA_API_ERRORS => ex
-        raise ex
+      file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
+      export_file = get_file(:url => self.fileURL(file_id))
+      export_file_path = export_file.path
+      Rails.logger.debug("=====> Export path #{export_file.path}")
+
+      if extract && zip
+        require "zip"
+        new_path = export_file_path.partition('.zip').first
+        zipped = Zip::File.open(export_file_path)
+        file_handle = zipped.entries.first
+        file_handle.extract(new_path)
+        File.delete(export_file_path)
+        return new_path
+      else
+        return export_file_path
+      end
+    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 *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-        if !(tries -= 1).zero?
-          Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
-          sleep 5
-          retry
-        else
-          raise ex
-        end
+    rescue 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 Errno::ECONNRESET => ex
-        if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
-          retry
-        else
-          raise ex
-        end
+    rescue *ZUORA_API_ERRORS => ex
+      raise ex
 
-      rescue ZuoraAPI::Exceptions::BadEntityError => ex
-        raise ex
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
+      if !(tries -= 1).zero?
+        Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
+        sleep 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

data/lib/zuora_api/logins/basic.rb

@@ -10,113 +10,22 @@ module ZuoraAPI
     end
 
     def new_session(auth_type: :basic, debug: false, zuora_track_id: nil)
-      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?)
+      super do 
+        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?)
 
-      tries ||= 2
-      request = Nokogiri::XML::Builder.new do |xml|
-        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' =>"http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:api' => "http://api.zuora.com/" ) do
-          xml['SOAP-ENV'].Header
-          xml['SOAP-ENV'].Body do
-            xml['api'].login do
-              xml['api'].username self.username
-              xml['api'].password self.password
-              xml['api'].entityId self.entity_id if !self.entity_id.blank?
-            end
+        output_xml, input_xml, response = soap_call(timeout_retry: true, skip_session: true, zuora_track_id: zuora_track_id) do |xml|
+          xml['api'].login do
+            xml['api'].username self.username
+            xml['api'].password self.password
+            xml['api'].entityId self.entity_id if !self.entity_id.blank?
           end
         end
-      end
-      
-      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
-
-      headers = { 'Content-Type' => "text/xml; charset=utf-8" }
-      headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
-      response_query = HTTParty.post(self.url,:body => request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, :headers => headers, :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?
-        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 self.current_error.include?('deactivated')
-            self.status = 'Deactivated'
-            self.current_error = 'Deactivated user login, please check with Zuora tenant administrator'
-            self.errors[:username] = self.current_error
-          elsif self.current_error.include?('inactive')
-            self.status = 'Inactive'
-            self.current_error = 'Inactive user login, please check with Zuora tenant administrator'
-            self.errors[:username] = self.current_error
-          elsif self.current_error.include?("invalid username or password") || self.current_error.include?("Invalid login. User name and password do not match.")
-            self.status = 'Invalid Login'
-            self.current_error = 'Invalid login, please check username and password or URL endpoint'
-            self.errors[:username] = self.current_error
-            self.errors[:password] = self.current_error
-          elsif self.current_error.include?('unsupported version')
-            self.status = 'Unsupported API Version'
-            self.current_error = 'Unsupported API version, please verify URL endpoint'
-            self.errors[:url] = self.current_error
-          elsif self.current_error.include?('invalid api version')
-            self.status = 'Invalid API Version'
-            self.current_error = 'Invalid API version, please verify URL endpoint'
-            self.errors[:url] = self.current_error
-          elsif self.current_error.include?('invalid session')
-            self.status = 'Invalid Session'
-            self.current_error = 'Session invalid, please update session and verify URL endpoint'
-            self.errors[:session] = self.current_error
-          elsif self.current_error.include?('Your IP address')
-            self.status = 'Restricted IP'
-            self.current_error = 'IP restricted, contact Zuora tenant administrator and remove IP restriction'
-            self.errors[:base] = self.current_error
-          elsif self.current_error.include?('This account has been locked')
-            self.status = 'Locked'
-            self.current_error = 'Locked user login, please wait or navigate to Zuora to unlock user'
-            self.errors[:username] = self.current_error
-          elsif self.current_error.include?('Entity not exist:')
-            self.status = 'Entity Missing'
-            self.errors[:base] = self.current_error
-          else
-            self.status = 'Unknown'
-            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.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'
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("No session found for api call.", response) if retrieved_session.blank?
         self.current_session = retrieved_session
-      end
-      return self.status
-    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if !tries.zero?
-        tries -= 1
-        sleep(self.timeout_sleep)
-        retry
-      else
-        if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("BasicLogin - Timed out", ex) 
-        else
-          Rails.logger.error("BasicLogin - #{ex.class} Timed out") 
-        end
-
-        self.current_error = "Request timed out. Try again"
-        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'
+        self.status = 'Active'
         return self.status
       end
     end

data/lib/zuora_api/logins/oauth.rb

@@ -12,16 +12,18 @@ module ZuoraAPI
     end
 
     def new_session(auth_type: nil, zuora_track_id: nil)
-      if auth_type ==  :bearer
-        get_bearer_token(zuora_track_id: zuora_track_id)
-      elsif auth_type == :basic
-        get_bearer_token(zuora_track_id: zuora_track_id) if self.oauth_expired?
-        get_z_session(zuora_track_id: zuora_track_id) if self.status == 'Active'
-      else
-        get_bearer_token(zuora_track_id: zuora_track_id)
-        get_z_session(zuora_track_id: zuora_track_id) if self.status == 'Active'
+      super do
+        if auth_type ==  :bearer
+          get_bearer_token(zuora_track_id: zuora_track_id)
+        elsif auth_type == :basic
+          get_bearer_token(zuora_track_id: zuora_track_id) if self.oauth_expired?
+          get_z_session(zuora_track_id: zuora_track_id)
+        else
+          get_bearer_token(zuora_track_id: zuora_track_id) if self.oauth_expired?
+          get_z_session(zuora_track_id: zuora_track_id) 
+        end
+        return self.status
       end
-      return self.status
     end
 
     def get_active_bearer_token
@@ -30,7 +32,6 @@ module ZuoraAPI
     end
     
     def get_z_session(debug: false, zuora_track_id: nil)
-      tries ||= 2
       headers = self.entity_id.present? ? {"Zuora-Entity-Ids" => self.entity_id } : {}
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
       output_json, response = self.rest_call(:url => self.rest_endpoint("connections"), :session_type => :bearer, :headers => headers)
@@ -44,51 +45,22 @@ module ZuoraAPI
             headers: response.headers.to_s,
           }
         })
-        raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Failure Parsing Cookie Headers")
+        raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Failure Parsing Cookie Headers", response)
       end 
-    rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      if !tries.zero?
-        tries -= 1
-        Rails.logger.debug {"Session Invalid"}
-        self.new_session(auth_type: :bearer)
-        retry
-      end
-      raise ex if errors.include?(ex.class)
-      return [output_json, response]
-
-    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
-      raise ex if errors.include?(ex.class)
-      return [output_json, response]
-
-    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if !tries.zero?
-        tries -= 1
-        sleep(self.timeout_sleep)
-        retry
-      end
-      if Rails.logger.class.to_s == "Ougai::Logger"
-        Rails.logger.error("OAuthLogin - Timed out", ex) 
-      else
-        Rails.logger.error("OAuthLogin - #{ex.class} Timed out") 
-      end
-      self.current_error = "Request timed out. Try again"
-      self.status = 'Timeout'
-      return self.status
     end
 
     def get_bearer_token(zuora_track_id: nil)
-      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?
 
       headers = { "content-type" => "application/x-www-form-urlencoded" }
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
       output_json, response = self.rest_call(:method => :post, 
-        :url => self.rest_endpoint.chomp('v1/').concat("oauth/token"), 
-        :z_session => false,
-        :session_type => :bearer,
-        :headers => headers,
-        :body => {"client_id"=> self.oauth_client_id, "client_secret"=>self.oauth_secret, "grant_type" =>"client_credentials"}
+        url: self.rest_endpoint.chomp('v1/').concat("oauth/token"), 
+        z_session: false,
+        timeout_retry: true,
+        headers: headers,
+        body: {"client_id"=> self.oauth_client_id, "client_secret"=>self.oauth_secret, "grant_type" =>"client_credentials"}
       )
 
       self.bearer_token = output_json["access_token"]
@@ -98,44 +70,6 @@ module ZuoraAPI
       self.status = 'Active'
 
       return self.status
-
-    rescue ZuoraAPI::Exceptions::ZuoraAPIInternalServerError => ex
-      raise ex if tries.zero?
-
-      tries -= 1
-      sleep(self.timeout_sleep)
-      retry
-    rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
-      self.bearer_token = nil
-      self.oauth_session_expires_at = nil
-      self.current_error = ex.message
-      case ex.message
-      when "Forbidden"
-        self.current_error = "The user associated to OAuth credential set has been deactivated."
-        self.status = 'Deactivated'
-      else
-        self.current_error = "Invalid login, please check client ID and Client Secret or URL endpoint"
-        self.status = 'Invalid Login'
-      end
-
-      return self.status
-    rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
-      raise ex
-    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
-      if !tries.zero?
-        tries -= 1
-        sleep(self.timeout_sleep)
-        retry
-      else
-        if Rails.logger.class.to_s == "Ougai::Logger"
-          Rails.logger.error("OAuthLogin - Timed out will retry after #{self.timeout_sleep} seconds", ex) 
-        else
-          Rails.logger.error("OAuthLogin - #{ex.class} Timed out will retry after #{self.timeout_sleep} seconds") 
-        end
-        self.current_error = "Invalid login, please check client ID and Client Secret or URL endpoint"
-        self.status = 'Timeout'
-        return self.status
-      end
     end
 
     def oauth_expired?

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.66b"
+  VERSION = "1.7.66h"
 end

data/zuora_api.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency("webmock")
-  spec.add_development_dependency("simplecov")
+  spec.add_development_dependency("simplecov", "~> 0.18.5")
+  spec.add_dependency("ougai")
   spec.add_dependency("nokogiri")
   spec.add_dependency("httparty")
   spec.add_dependency("rubyzip")

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.66b
+  version: 1.7.66h
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -68,12 +68,26 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.5
+- !ruby/object:Gem::Dependency
+  name: ougai
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -186,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Gem that provides easy integration to Zuora