zuora_api 1.7.04 → 1.7.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd4263c2eb83157c69a7e2602d6cf2581d16a8a9b221758f68d1812143c8b065
-  data.tar.gz: fee95cc2bb990cd82e54d788fbb45165a5c1ef1ec5d7a024a7486bb9a64ef3b2
+  metadata.gz: 9054b92f61410eb657f7649d1781b3ee3d0c29d4d58929baf02c275a3f39bb4b
+  data.tar.gz: 8f42f159769fe1230d100c0f1004e75926101b5248555b0f34990b43cb3ffd45
 SHA512:
-  metadata.gz: 3a21cd1b2f25b43289e2c6977e244a2e34d02fe2c4f0491498a48857354e1ba0af1e178a677a6a6b6725acfad6dbb3e569b167cb56a69cfc838ab3854ed90253
-  data.tar.gz: b50365fa6fec945684dcf1a22b2e5824ed192d6cbd3bc8a1e502874cec7167f417732be8df3c694ed51f17ff5fdcda205a2b3d8138d9caa3a2af2c598c996a86
+  metadata.gz: 34293864341beaf686e853925c5336ab0b67fa91034e533b4c1cfdb602d77514c52e376bba07fdef9a381812bc3073301db88cf12a2d1b411cac69cd4298876a
+  data.tar.gz: b00e9a2f3949a9e1ce1fca71076015dc4531e2185c53d3626b360b3dbcb12b2761b7a9856ae44f09cc3aa2049147c44b515625d109769971a2e69360384eb890

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (1.7.04)
+    zuora_api (1.7.05)
       httparty
       nokogiri
       railties (>= 4.1.0, < 6)

data/lib/zuora_api/exceptions.rb

@@ -133,5 +133,37 @@ module ZuoraAPI
         @message || @default_message
       end
     end
+
+    class ZuoraAPIConnectionTimeout < Net::OpenTimeout
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      def initialize(message = nil,response=nil,  *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
+        @message = message
+        @response = response
+        @default_message = "Authentication type is not supported by this Login"
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
+    class ZuoraAPIReadTimeout < Net::ReadTimeout
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      def initialize(message = nil,response=nil,  *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
+        @message = message
+        @response = response
+        @default_message = "Authentication type is not supported by this Login"
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
   end
 end

data/lib/zuora_api/login.rb

@@ -9,9 +9,29 @@ module ZuoraAPI
     REGIONS = [EU = 'EU', US = 'US', NA = 'NA' ]
     MIN_Endpoint = '96.0'
     XML_SAVE_OPTIONS = Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
-    CONNECTION_EXCEPTIONS = [Net::OpenTimeout, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError, Errno::EHOSTUNREACH, Errno::EADDRNOTAVAIL]
-    CONNECTION_READ_EXCEPTIONS = [Net::ReadTimeout, Errno::ECONNRESET, Errno::EPIPE]
-    ZUORA_API_ERRORS = [ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition, ZuoraAPI::Exceptions::ZuoraAPITemporaryError, ZuoraAPI::Exceptions::ZuoraDataIntegrity]
+
+    CONNECTION_EXCEPTIONS = [
+      Net::OpenTimeout,
+      OpenSSL::SSL::SSLError,
+      Errno::ECONNREFUSED,
+      SocketError,
+      Errno::EHOSTUNREACH,
+      Errno::EADDRNOTAVAIL
+    ].freeze
+
+    CONNECTION_READ_EXCEPTIONS = [
+      Net::ReadTimeout,
+      Errno::ECONNRESET,
+      Errno::EPIPE
+    ].freeze
+
+    ZUORA_API_ERRORS = [
+      ZuoraAPI::Exceptions::ZuoraAPIError,
+      ZuoraAPI::Exceptions::ZuoraAPIRequestLimit,
+      ZuoraAPI::Exceptions::ZuoraAPILockCompetition,
+      ZuoraAPI::Exceptions::ZuoraAPITemporaryError,
+      ZuoraAPI::Exceptions::ZuoraDataIntegrity
+    ].freeze
     
     attr_accessor :region, :url, :wsdl_number, :current_session, :bearer_token, :oauth_session_expires_at, :environment, :status, :errors, :current_error, :user_info, :tenant_id, :tenant_name, :entity_id, :timeout_sleep, :hostname, :zconnect_provider
 
@@ -565,6 +585,14 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Authentication type is not supported by this Login", response)
           end
 
+          if response.code ==502
+            raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received 502 from downstream host", response)
+          end
+
+          if response.code ==504
+            raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from downstream host", response)
+          end
+
           if body['errorMessage']
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body['errorMessage'], response)
           end
@@ -574,7 +602,7 @@ module ZuoraAPI
           end
 
           #Oauth Tokens - User deactivated
-          if body['message'] == 'Forbidden' && body['status'] == 403 && response.code == 403
+          if body['reason'] == 'Forbidden' && body['status'] == 403 && response.code == 403
             raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Forbidden", response)
           end
 
@@ -742,7 +770,7 @@ 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
-    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info("Describe - #{ex.class} Timed out will retry after 5 seconds")
         sleep(self.timeout_sleep)

data/lib/zuora_api/logins/basic.rb

@@ -94,7 +94,7 @@ module ZuoraAPI
         self.current_session = retrieved_session
       end
       return self.status
-    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex 
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)

data/lib/zuora_api/logins/oauth.rb

@@ -52,7 +52,7 @@ module ZuoraAPI
       else
         return [output_json, response]
       end
-    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)
@@ -98,7 +98,7 @@ module ZuoraAPI
       return self.status
     rescue ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition  => ex
       raise ex
-    rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => ex
+    rescue *(CONNECTION_EXCEPTIONS + CONNECTION_READ_EXCEPTIONS) => ex
       if !(tries -= 1).zero?
         Rails.logger.info {"#{ex.class} Timed out will retry after 5 seconds"}
         sleep(self.timeout_sleep)

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.04"
+  VERSION = "1.7.05"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.04
+  version: 1.7.05
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler