zuora_api 1.7.65 → 1.7.66b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f825e33478662937ab98762bab71f5d10b55acedc5f14f51022f4e9a66bfb0e
-  data.tar.gz: 8a0edd6a1c0a7b11353b1057e14eb8d40cb47e85f3b7faac832532b1253e5ce5
+  metadata.gz: e57efb2492106ced22eaf4a943801d0f639eab7c8e1e6c5a4a927fe556963007
+  data.tar.gz: e21363cc410dd6c49e5513db1fd3561ea9d13ec7390e57b7abf6b966a44314b6
 SHA512:
-  metadata.gz: c7846e3e6df13eee656df3d122d98bf1f5694c83751836bd93810d6e3ec6ca6f88ba69b80d67cb04c9f30f4f94d2338c576eacd6d4401be0e27f9c2721f51fce
-  data.tar.gz: '0543405827032e0d71cf4f9462d565fb94ffb8ccdd76df9e59ccf2fd099ba8f608ff3ec057f1aa2b5577bb4448c583971e550cf69c1285b47736edc1ad3b9b1f'
+  metadata.gz: 1869137cefa3e67accb4bd917e4466df8627cf198eff2409420c0176c8e4fe728f8a56d53297a7f7418d7f7b207a1843383c74379cfc5662ec38c19e3e05300a
+  data.tar.gz: 037fa29a6add8b326da59402cdd2207c65385d3046869866c3cb2a5cbc2e8935855aeba549fda5239579cf4e3aabd86ce992b3dc1c9284ee166bf8c333b95bbd

data/lib/zuora_api/exceptions.rb

@@ -177,14 +177,15 @@ module ZuoraAPI
     end
 
     class ZuoraAPITemporaryError < Error
-      attr_reader :code, :response
+      attr_reader :code, :response, :errors
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
+      def initialize(message = nil, response = nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = parse_message(message)
         @response = response
         @default_message = "There is a temporary error with zuora system."
+        @errors = errors
       end
 
       def to_s
@@ -225,13 +226,14 @@ module ZuoraAPI
     end
 
     class ZuoraAPIReadTimeout < Net::ReadTimeout
-      attr_reader :code, :response
+      attr_reader :code, :response, :request
       attr_writer :default_message
 
-      def initialize(message = nil,response=nil, errors = [], successes = [], *args)
+      def initialize(message = nil, response = nil, request = nil, errors = [], successes = [], *args)
         @code = response.class.to_s == "HTTParty::Response" ? response.code : nil
         @message = message
         @response = response
+        @request = request
         @default_message = "Authentication type is not supported by this Login"
       end
 

data/lib/zuora_api/login.rb

@@ -39,8 +39,8 @@ module ZuoraAPI
 
     ZUORA_SERVER_ERRORS = [
       ZuoraAPI::Exceptions::ZuoraAPIInternalServerError,
-      ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
-      ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
+        ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout,
+        ZuoraAPI::Exceptions::ZuoraAPIReadTimeout,
       ZuoraAPI::Exceptions::ZuoraUnexpectedError
     ].freeze
     
@@ -474,12 +474,16 @@ module ZuoraAPI
       headers = { 'Content-Type' => "text/xml; charset=utf-8", 'Accept' => 'text/xml'}
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
-      response = HTTParty.post(
+      request = HTTParty::Request.new(
+        Net::HTTP::Post,
         self.url,
-        :body => xml.doc.to_xml(:save_with => XML_SAVE_OPTIONS).strip,
-        :headers => headers,
-        :timeout => timeout
+        body: xml.doc.to_xml(:save_with => XML_SAVE_OPTIONS).strip,
+        headers: headers,
+        timeout: timeout,
       )
+
+      response = request.perform
+
       output_xml = Nokogiri::XML(response.body)
       Rails.logger.debug("Response SOAP XML: #{output_xml.to_xml(:save_with => XML_SAVE_OPTIONS).strip}") if debug
 
@@ -496,20 +500,18 @@ module ZuoraAPI
         end
 
         retry
-      else
-        if errors.include?(ex.class)
-          raise ex
-        else
-          return output_xml, input_xml, response
-        end
       end
+        
+      raise ex if errors.include?(ex.class)
+  
+      return output_xml, input_xml, response
+      
     rescue *ZUORA_API_ERRORS => ex
-      if errors.include?(ex.class)
-        raise ex
-      else
-        response = ex.response unless response
-        return output_xml, input_xml, response
-      end
+      raise ex if errors.include?(ex.class)
+     
+      response = ex.response unless response
+      return output_xml, input_xml, response
+      
     rescue *CONNECTION_EXCEPTIONS => ex
       if tries.zero?
         if output_exception_messages
@@ -526,34 +528,26 @@ module ZuoraAPI
       sleep(timeout_sleep_interval)
       retry
     rescue *CONNECTION_READ_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
+      if !tries.zero?
+        tries -= 1
+
+        if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
+          retry
+        elsif timeout_retry
+          sleep(timeout_sleep_interval)
+          retry
         end
-        raise ex
       end
 
-      tries -= 1
-
-      if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
-        retry
-      elsif timeout_retry
-        sleep(timeout_sleep_interval)
-        retry
-      else
-        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
+      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
-        raise ex
       end
+      raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}", nil, request) if ex.instance_of?(Net::ReadTimeout)
+      raise ex
     rescue => ex
       raise ex
     else
@@ -561,24 +555,33 @@ module ZuoraAPI
     end
 
     def raise_errors(type: :SOAP, body: nil, response: nil)
-      request = response.request
-      match_string = "#{request.http_method.to_s.split("Net::HTTP::").last.upcase}::#{response.code}::#{request.path.path}"
+      request_uri, request_path, match_string = "", "", ""
+      if response.class.to_s == "HTTP::Message"
+        request_uri = response.http_header.request_uri.to_s
+        request_path = response.http_header.request_uri.path
+        match_string = "#{response.http_header.request_method}::#{response.code}::#{request_uri}"
+      else
+        request = response.request
+        request_uri = response.request.uri
+        request_path = request.path.path
+        match_string = "#{request.http_method.to_s.split("Net::HTTP::").last.upcase}::#{response.code}::#{request_path}"
+      end
 
       if [502,503].include?(response.code)
-        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{response.request.uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from #{request_uri}", response)
       end
 
       # Check failure response code
       case response.code
       when 504
-        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from #{response.request.uri}", response)
+        raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from #{request_uri}", response)
       when 429
         raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
       when 401
         
       else
         if body.class == Hash
-          case response.request.path.path
+          case request_path
           when /^\/v1\/connections$/
             response_headers = response.headers.to_h      
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Missing cookies for authentication call", response) if response_headers['set-cookie'].blank?
@@ -602,7 +605,7 @@ module ZuoraAPI
             reason = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
             if reason.present?
               message = body.xpath('//ns2:StatusReason', 'ns2' => 'http://object.api.zuora.com/').text
-              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
+              error = message.match(/^[\w\d]{16}\: (Unexpected error.|No HTTP Response|Socket Timeout|There is an internal error, please try again later)/).present? ? 'UNEXPECTED_ERROR' : 'FATAL_ERROR'  
             else
               error = 'FATAL_ERROR'
               message = 'Export failed due to unknown reason. Consult api logs.'
@@ -624,23 +627,10 @@ module ZuoraAPI
           end
         end
 
-        if (response.code == 400 && response.headers.fetch('content-type', []).include?('text/html'))
-          raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response)
-        elsif response.code == 500  
-          if response.headers.fetch('content-type', []).include?('application/json')
-            begin
-              output_json = JSON.parse(response.body)
-              self.raise_errors(type: :JSON, body: output_json, response: response)
-            rescue JSON::ParserError => ex
-              raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response)
-            end
-          else
-            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response)
-          end
-        end
-
+        self.errors_via_content_type(response: response, type: :xml)
+        
       when :JSON
-        case request.path.path
+        case request_path
         when /^\/query\/jobs.*/  #DataQuery Paths
           return if body.class != Hash
           case match_string
@@ -660,12 +650,16 @@ module ZuoraAPI
           if reporting_message&.include?("com.zuora.rest.RestUsageException: The user does not have permissions for this API.")
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(reporting_message, response)
           elsif reporting_message&.include?("500 Internal Server Error")
-            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Internal Server Error. The Reporting API is down. Contact Support.")
+            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Internal Server Error. The Reporting API is down. Contact Support.", response)
           end
           case match_string
           when /^GET::400::\/api\/rest\/v1\/reports\/(reportlabels\/)?([a-zA-Z0-9\-_]+)\/report-details$/ # Get report, capture of the id is present if needed in future error responses.
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(reporting_message, response) if reporting_message.present?
           end
+        when /\/objects\/batch\//
+          if body['code'].present? && /61$/.match(body['code'].to_s).present? # if last 2 digits of code are 61
+            raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new(body['message'], nil, body['details'])
+          end
         end
 
         body = body.dig("results").present? ? body["results"] : body if body.class == Hash
@@ -726,7 +720,6 @@ module ZuoraAPI
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(50)
             raise ZuoraAPI::Exceptions::ZuoraAPILockCompetition.new("#{messages_array.join(', ')}", response)
           end
-
           #Internal Server Error
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(60)
             if messages_array.uniq.size == 1 
@@ -737,6 +730,11 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("#{messages_array.join(', ')}", response)
           end
 
+          #Retryiable Service Error
+          if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(61)
+            raise ZuoraAPI::Exceptions::ZuoraAPITemporaryError.new("#{messages_array.join(', ')}", response)
+          end
+
           #Request exceeded limit
           if codes_array.map{|code| code.to_s.slice(6,7).to_i}.include?(70)
             raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("#{messages_array.join(', ')}", response)
@@ -789,26 +787,56 @@ module ZuoraAPI
           end
         end
 
+        if body.class == Hash && body['message'].present?
+          raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(body['message'], response) if response.code == 500
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['message'], response) if ![200,201].include?(response.code)
+        end
+
+        self.errors_via_content_type(response: response, type: :json)
+
         #All other errors
-        if response.code == 500
-          if body.class == Hash && body['message'].present?
-            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(body['message'], response)
-          else
-            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response)
-          end
-        elsif ![200,201].include?(response.code)
-          if body['message'].present?
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['message'], response)
-          else
-            if 403 == response.code && response.body.include?("Forbidden")
-              raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response)
-            else
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new(response.body, response)
-            end
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new(response.body, response) if ![200,201].include?(response.code) 
+      end
+    end
+
+    def errors_via_content_type(response: nil, type: :xml)
+      response_content_types = response.headers.transform_keys(&:downcase).fetch('content-type', []).first || ""
+      
+      if response_content_types.include?('application/json') && type != :json
+        output_json = JSON.parse(response.body)
+        self.raise_errors(type: :JSON, body: output_json, response: response)
+      
+      elsif (response_content_types.include?('application/xml') || response_content_types.include?('text/xml')) and type != :xml
+        output_xml = Nokogiri::XML(response.body)
+        self.raise_errors(type: :SOAP, body: output_xml, response: response)
+
+      elsif response_content_types.include?('text/html')
+        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Akamai Error", response) if response.headers.fetch('server', '') == 'AkamaiGHost'
+
+        parse_body = Nokogiri::HTML(response.body)
+        error_title = parse_body.xpath('//h2').text
+        error_title = parse_body.xpath('//h1').text if error_title.blank?
+        error_message = parse_body.xpath('//p').text
+
+        error_message = error_title if error_message.blank?
+
+        if error_title.present?
+          case error_title
+          when /Service Unavailable/
+            raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new(error_message, response)
+          when /Client sent a bad request./, /Bad Request/, /403 Forbidden/
+            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(error_message, response)    
+          else 
+            raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(error_message, response)
           end
         end
+
+        raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new("Http response body is missing", response) if response.body.blank?
       end
+
+      raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response) if response.code == 500
     end
+          
 
     def get_soap_error_and_message(body)
       error   = body.xpath('//fns:FaultCode', 'fns' =>'http://fault.api.zuora.com/').text
@@ -872,9 +900,9 @@ module ZuoraAPI
       when /.*UNEXPECTED_ERROR/
         raise ZuoraAPI::Exceptions::ZuoraUnexpectedError.new(message, response, errors, success)
       when /.*soapenv:Server.*/
-        if /^Invalid value.*for type.*|^Id is invalid/.match(message).present?
+        if /^Invalid value.*for type.*|^Id is invalid|^date string can not be less than 19 charactors$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-        elsif /^Invalid white space character \(.*\) in text to output$/.match(message).present?
+        elsif /^Invalid white space character \(.*\) in text to output$|^Invalid null character in text to output$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIUnkownError.new(message, response, errors, success)
         end
         raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(message, response, errors, success)
@@ -1025,7 +1053,7 @@ module ZuoraAPI
       modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
 
       begin
-        response = HTTParty::Request.new(
+        request = HTTParty::Request.new(
           "Net::HTTP::#{method.to_s.capitalize}".constantize,
           url,
           body: body,
@@ -1033,7 +1061,9 @@ module ZuoraAPI
           timeout: timeout,
           multipart: multipart,
           stream_body: stream_body
-        ).perform(&block)
+        )
+
+        response = request.perform(&block)
 
         Rails.logger.debug("Response Code: #{response.code}") if debug
         begin
@@ -1052,10 +1082,10 @@ module ZuoraAPI
       if self.class.to_s == 'ZuoraAPI::Oauth' && ex.message.include?("Authentication type is not supported by this Login")
         session_type = :bearer
         retry
-      else
-        Rails.logger.debug("Rest Call - Session Bad Auth type")
-        raise ex
       end
+      Rails.logger.debug("Rest Call - Session Bad Auth type")
+      raise ex
+      
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
       if !tries.zero? && z_session
         tries -= 1
@@ -1068,20 +1098,17 @@ module ZuoraAPI
         end
 
         retry
-      else
-        if errors.include?(ex.class)
-          raise ex
-        else
-          return [output_json, response]
-        end
       end
+
+      raise ex if errors.include?(ex.class)
+      return [output_json, response]
+      
     rescue *ZUORA_API_ERRORS => ex
-      if errors.include?(ex.class)
-        raise ex
-      else
-        response = ex.response unless response
-        return [output_json, response]
-      end
+      raise ex if errors.include?(ex.class)
+      
+      response = ex.response unless response
+      return [output_json, response]
+  
     rescue ZuoraAPI::Exceptions::BadEntityError => ex
       raise ex
     rescue *CONNECTION_EXCEPTIONS => ex
@@ -1100,34 +1127,25 @@ module ZuoraAPI
       sleep(timeout_sleep_interval)
       retry
     rescue *CONNECTION_READ_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
+      if !tries.zero?
+        tries -= 1
+        if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
+          retry
+        elsif timeout_retry
+          sleep(timeout_sleep_interval)
+          retry
         end
-        raise ex 
       end
-
-      tries -= 1
-
-      if ex.is_a?(Errno::ECONNRESET) && ex.message.include?('SSL_connect')
-        retry
-      elsif timeout_retry
-        sleep(timeout_sleep_interval)
-        retry
-      else
-        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
+   
+      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
-        raise ex
       end
+      raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received read timeout from #{url}", nil, request) if ex.instance_of?(Net::ReadTimeout)
+      raise ex
     rescue => ex
       raise ex
     else
@@ -1183,6 +1201,8 @@ module ZuoraAPI
     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)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
+      retry_count ||= timeout_retries
+
       #Make sure directory exists
       require 'fileutils'
       FileUtils.mkdir_p(file_path) unless File.exists?(file_path)
@@ -1200,7 +1220,6 @@ module ZuoraAPI
       headers['Zuora-Track-Id'] = zuora_track_id if zuora_track_id.present?
 
       response_save = nil
-      retry_count ||= timeout_retries
       http.request_get(uri.request_uri, headers) do |response|
         response_save = response
         status_code = response.code if response
@@ -1308,75 +1327,122 @@ module ZuoraAPI
       end
     end
 
-    def getDataSourceExport(query, extract: true, encrypted: false, zip: true)
-      request = Nokogiri::XML::Builder.new do |xml|
-        xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
-          xml['SOAP-ENV'].Header do
-            xml['ns1'].SessionHeader do
-              xml['ns1'].session self.get_session(prefix: false, auth_type: :basic)
+    def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: "")
+      begin
+        tries ||= 3
+        request = Nokogiri::XML::Builder.new do |xml|
+          xml['SOAP-ENV'].Envelope('xmlns:SOAP-ENV' => "http://schemas.xmlsoap.org/soap/envelope/", 'xmlns:ns2' => "http://object.api.zuora.com/", 'xmlns:xsi' => "http://www.w3.org/2001/XMLSchema-instance", 'xmlns:ns1' => "http://api.zuora.com/") do
+            xml['SOAP-ENV'].Header do
+              xml['ns1'].SessionHeader do
+                xml['ns1'].session self.get_session(prefix: false, auth_type: :basic, zuora_track_id: z_track_id)
+              end
             end
-          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
+            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
-      end
 
-      response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8"}, :timeout => 120)
+        response_query = HTTParty.post(self.url, body: request.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
 
-      output_xml = Nokogiri::XML(response_query.body)
-      raise 'Export Creation Unsuccessful : ' + output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text if  output_xml.xpath('//ns1:Success', 'ns1' =>'http://api.zuora.com/').text != "true"
-      id = output_xml.xpath('//ns1:Id', 'ns1' =>'http://api.zuora.com/').text
+        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"
 
-      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)
+        # 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
             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}'"
+            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
         end
-      end
-      result = 'Waiting'
+        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"}, :timeout => 120)
+        while result != "Completed"
+          sleep 3
+          response_query = HTTParty.post(self.url, body: confirmRequest.to_xml(:save_with => XML_SAVE_OPTIONS).strip, headers: {'Content-Type' => "application/json; charset=utf-8", "Z-Track-Id" => z_track_id}, :timeout => 120)
 
-        output_xml = Nokogiri::XML(response_query.body)
-        result = output_xml.xpath('//ns2:Status',  'ns2' =>'http://object.api.zuora.com/').text
-        status_code = response_query.code if response_query
-        raise "Export Creation Unsuccessful : #{output_xml.xpath('//ns1:Message', 'ns1' =>'http://api.zuora.com/').text}" if result.blank? || result == "Failed"
-      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
 
-      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
+          raise_errors(type: :SOAP, body: output_xml, response: response_query) if result.blank? || result == "Failed"
+          # raise "Export Creation Unsuccessful : #{response_query.code}: #{response_query.parsed_response}" if result.blank? || result == "Failed"
+        end
+
+        file_id = output_xml.xpath('//ns2:FileId',  'ns2' =>'http://object.api.zuora.com/').text
+        export_file = get_file(:url => self.fileURL(file_id))
+        export_file_path = export_file.path
+        Rails.logger.debug("=====> Export path #{export_file.path}")
+
+        if extract && zip
+          require "zip"
+          new_path = export_file_path.partition('.zip').first
+          zipped = Zip::File.open(export_file_path)
+          file_handle = zipped.entries.first
+          file_handle.extract(new_path)
+          File.delete(export_file_path)
+          return new_path
+        else
+          return export_file_path
+        end
+      rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
+        if !(tries -= 1).zero?
+          Rails.logger.info("Export call failed - Trace ID: #{z_track_id}")
+          self.new_session
+          retry
+        else
+          raise ex
+        end
+
+      rescue ZuoraAPI::Exceptions::ZuoraUnexpectedError => ex
+        if !(tries -= 1).zero?
+          Rails.logger.info("Trace ID: #{z_track_id} UnexpectedError, will retry after 10 seconds")
+          sleep 10
+          retry
+        else
+          raise ex
+        end
+
+      rescue *ZUORA_API_ERRORS => ex
+        raise ex
+
+      rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
+        if !(tries -= 1).zero?
+          Rails.logger.info("Trace ID: #{z_track_id} Timed out will retry after 5 seconds")
+          sleep 5
+          retry
+        else
+          raise ex
+        end
+
+      rescue Errno::ECONNRESET => ex
+        if !(tries -= 1).zero? && ex.message.include?('SSL_connect')
+          retry
+        else
+          raise ex
+        end
+
+      rescue ZuoraAPI::Exceptions::BadEntityError => ex
+        raise ex
       end
     end
 

data/lib/zuora_api/logins/oauth.rb

@@ -37,7 +37,13 @@ module ZuoraAPI
       begin
         self.current_session = response.headers.to_h['set-cookie'][0].split(';')[0].split('=',2)[1].gsub('%3D', '=')
       rescue NoMethodError => ex 
-        Rails.logger.fatal("Failure Parsing Cookie Headers", response.headers.to_s)
+        Rails.logger.fatal("Failure Parsing Cookie Headers", {
+          response: {
+            status: response.code,
+            params: response.body.to_s,
+            headers: response.headers.to_s,
+          }
+        })
         raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Failure Parsing Cookie Headers")
       end 
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex
@@ -46,34 +52,28 @@ module ZuoraAPI
         Rails.logger.debug {"Session Invalid"}
         self.new_session(auth_type: :bearer)
         retry
-      else
-        if errors.include?(ex.class)
-          raise ex
-        else
-          return [output_json, response]
-        end
       end
+      raise ex if errors.include?(ex.class)
+      return [output_json, response]
+
     rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
-      if errors.include?(ex.class)
-        raise ex
-      else
-        return [output_json, response]
-      end
+      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
-        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
+        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)

data/lib/zuora_api/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.65
+  version: 1.7.66b
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -182,9 +182,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: