zuora_api 1.7.65g → 1.7.65i

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844d4f29e48548bf298907952d760386687b8d9f0cc4b6f1ce26defe42d9ce30
-  data.tar.gz: 38661f9da6c4032fe418941f1dddb1581680df7297e6eb8164deab377f82c54a
+  metadata.gz: 2d3a5ce233d3d4b441e52a9d4342db32d616d2bcd23e650ad0e5c09208b5904e
+  data.tar.gz: 5c1acb4964d32582cb84a05b0b120bde86d3d572fbeb663dff5ad2a58e228448
 SHA512:
-  metadata.gz: 7c149b5fbb73d911e7b55dd10bf3f2d2149695a2d42866936dc43eeb1916191b54d3f666e187c08db69d84467f6e90e13750ab8f5c127b7d3610cc0484b07853
-  data.tar.gz: ab1ecee455a237c5b2077a8e331b25d9aa2fbc82ec46ad5be9579898d1b8c4c879f8c213efe2dd494c3941f9376557af1ee5d698ec093f60729b8f198ac8b174
+  metadata.gz: 45f208500da4b73e03a91fd9381fb5408f2007d62f698b97c74a46c5e71616e5b312fd0beaf00a19b977aab868850b83c03e4f8910fa1f2292666e13204e8598
+  data.tar.gz: '06791a0a95a2031edb03efa889d35f7721f129d3e8318565e7b6a86fef6a2539b361f1ca1fe27e8470b7a43e5d6d29c463de1b0710451f539353b51e599b5903'

data/lib/zuora_api/login.rb

@@ -629,21 +629,8 @@ 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
         when /^\/query\/jobs.*/  #DataQuery Paths
@@ -731,7 +718,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 
@@ -742,6 +728,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)
@@ -794,32 +785,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
-            response_content_types = response.headers.transform_keys(&:downcase).fetch('content-type', []).first || ''
+        raise ZuoraAPI::Exceptions::ZuoraAPIError.new(response.body, response) if ![200,201].include?(response.code) 
+      end
+    end
 
-            if response_content_types.include?('application/xml') || response_content_types.include?('text/xml')
-              self.raise_errors(type: :SOAP, body: Nokogiri::XML(response.body), response: response)
-            else
-              raise ZuoraAPI::Exceptions::ZuoraAPIInternalServerError.new(response.body, response)
-            end
-          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
+    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
@@ -885,7 +900,7 @@ module ZuoraAPI
       when /.*soapenv:Server.*/
         if /^Invalid value.*for type.*|^Id is invalid|^date string can not be less than 19 charactors$/.match(message).present?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(message, response, errors, success)
-        elsif /^Invalid white space character \(.*\) in text to output$/.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)
@@ -1313,7 +1328,7 @@ module ZuoraAPI
       end
     end
 
-    def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: nil)
+    def getDataSourceExport(query, extract: true, encrypted: false, zip: true, z_track_id: "")
       begin
         tries ||= 3
         request = Nokogiri::XML::Builder.new do |xml|
@@ -1399,6 +1414,15 @@ module ZuoraAPI
           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
 

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.65g"
+  VERSION = "1.7.65i"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.65g
+  version: 1.7.65i
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler