zuora_api 1.7.08 → 1.7.09

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 506b37beaa7dbe046f337f7ed10112f2f6a693b1ebcafa37142634d0f8e649a6
-  data.tar.gz: b2fa2c58af2f031a4f216daa7adad6bff10cd8ab6d1023a224ca44344beff6e8
+  metadata.gz: d9ce3ca49ee184deac1fb058c9e43148b4b96bc26126e84c5842a2cbd9669b1a
+  data.tar.gz: f731f1e0aa69d80a1745775050e4e98b25b23c86d19e53e7878ea29c24a96422
 SHA512:
-  metadata.gz: d1b34d7894d4a9c3211c4ce783278d0f087dba37215821c723b064a5272153c0ab806ffd0575963f99ccf8610fb2a79d8979aae78ad43a948df1fa368da96017
-  data.tar.gz: f64b564c69ec0a9da2816e1032b78b3c42e22b4fb2bcccdc62d64524871ab0c0f48902c37557249f5c629a34e4299cafd493e80737c9bb9b15c6d7d0c89b1f2f
+  metadata.gz: cd9253fbbfdd74a4bf4b32ac9fb5568ab301623a5e817d54906462354e48e717fc145306b59fbb55b4deb8c5f877484ca26cb374ce169c8d333f81724768a688
+  data.tar.gz: 025de3eb95d4c04bcdef0db1d47d7b81b6a66f6d725e6acb38abc5a7b746ad97a8a60830a4b98264e273258753196339c99a86e571e9c6c47ed9d5f4d8cf7e5e

data/README.md

@@ -1,6 +1,6 @@
 # Zuora Gem
 
-[![Gem Version](https://badge.fury.io/rb/zuora_api.svg)](https://badge.fury.io/rb/zuora_api) [![coverage report](https://gitlab.zuora.com/Connect/zuora-gem/badges/master/coverage.svg)](https://gitlab.zuora.com/Connect/zuora-gem/commits/master)
+[![Gem Version](https://badge.fury.io/rb/zuora_api.svg)](https://badge.fury.io/rb/zuora_api) [![coverage report](https://gitlab.0.ecc.auw2.zuora/extension-products/shared-libraries/zuora-gem/badges/master/coverage.svg)](https://gitlab.0.ecc.auw2.zuora/extension-products/shared-libraries/zuora-gem/commits/master)
 
 ## Installation
 Add this line to your application's Gemfile:

data/lib/zuora_api/exceptions.rb

@@ -102,6 +102,22 @@ module ZuoraAPI
       end
     end
 
+    class ZuoraUnexpectedError < Error
+      attr_reader :code, :response
+      attr_writer :default_message
+
+      def initialize(message = nil, response=nil, *args)
+        @code = response.present? && response.class.to_s == "HTTParty::Response" ? response.code : nil
+        @message = message
+        @response = response
+        @default_message = "An unexpected error occurred"
+      end
+
+      def to_s
+        @message || @default_message
+      end
+    end
+
     class ZuoraAPITemporaryError < Error
       attr_reader :code, :response
       attr_writer :default_message

data/lib/zuora_api/login.rb

@@ -316,12 +316,11 @@ module ZuoraAPI
     def update_zconnect_provider
       region = update_region
       environment = update_environment
-      mappings = {"US" => {"Sandbox" => "ZConnectSbx", "KubeSTG" => "ZConnectDev", "KubeDEV" => "ZConnectDev", "KubePROD" => "ZConnectDev", "Services" => "ZConnectQA", "Production" => "ZConnectProd", "Performance" => "ZConnectPT1", "Staging" => "ZConnectQA"},
-                  "NA" => {"Sandbox" => "ZConnectSbxNA", "Services" => "ZConnectQANA", "Production" => "ZConnectProdNA", "Performance" => "ZConnectPT1NA"},
-                  "EU" => {"Sandbox" => "ZConnectSbxEU", "Services" => "ZConnectQAEU", "Production" => "ZConnectProdEU", "Performance" => "ZConnectPT1EU"},
+      mappings = {"US" => {"Sandbox" => "ZConnectSbx", "KubeSTG" => "ZConnectDev", "KubeDEV" => "ZConnectDev", "KubePROD" => "ZConnectDev", "Services" => "ZConnectSvcUS", "Production" => "ZConnectProd", "Performance" => "ZConnectPT1", "Staging" => "ZConnectQA"},
+                  "NA" => {"Sandbox" => "ZConnectSbxNA", "Services" => "ZConnectSvcNA", "Production" => "ZConnectProdNA", "Performance" => "ZConnectPT1NA"},
+                  "EU" => {"Sandbox" => "ZConnectSbxEU", "Services" => "ZConnectSvcEU", "Production" => "ZConnectProdEU", "Performance" => "ZConnectPT1EU"},
                   "Unknown" => {"Unknown" => "Unknown"}}
       self.zconnect_provider = mappings[region][environment]
-      # raise "Can't find ZConnect Provider for #{region} region and #{environment} environment" if self.zconnect_provider.nil?
     end
 
     def aqua_endpoint(url="")
@@ -400,7 +399,7 @@ module ZuoraAPI
           when 'ZuoraAPI::Basic'
             self.new_session(auth_type: :basic)
           else
-            raise "No Zuora Login Specified"
+            self.new_session(auth_type: :basic)
           end
         end
         raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if self.status != 'Active'
@@ -413,7 +412,10 @@ module ZuoraAPI
           end
         when 'ZuoraAPI::Basic'
           raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Basic Login, does not support Authentication of Type: #{auth_type}")
+        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
@@ -508,8 +510,12 @@ module ZuoraAPI
         raise ZuoraAPI::Exceptions::ZuoraAPIConnectionTimeout.new("Received #{response.code} from downstream host", response)
       end
 
-      if response.code == 504
+      # Check failure response code
+      case response.code
+      when 504
         raise ZuoraAPI::Exceptions::ZuoraAPIReadTimeout.new("Received 504 from downstream host", 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)
       end
 
       case type
@@ -576,10 +582,6 @@ module ZuoraAPI
             end
           end
         end
-        
-        if response.code == 429
-          raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
-        end
 
       when :JSON
         body = body.dig("results").present? ? body["results"] : body if body.class == Hash
@@ -589,6 +591,10 @@ module ZuoraAPI
           codes_array =    body.fetch("reasons", []).map {|error| error['code']}.compact
           codes_array = codes_array.push(body.dig("error", 'code')).compact  if body.dig('error').class == Hash
 
+          if body['message'] == 'An unexpected error occurred'
+            raise ZuoraAPI::Exceptions::ZuoraUnexpectedError.new(body['message'], response)
+          end
+
           if body['message'] == "No bearer token" && response.code == 400
             raise ZuoraAPI::Exceptions::ZuoraAPIAuthenticationTypeError.new("Authentication type is not supported by this Login", response)
           end
@@ -684,11 +690,7 @@ module ZuoraAPI
 
         #All other errors
         if ![200,201].include?(response.code)
-          if response.code == 429
-            raise ZuoraAPI::Exceptions::ZuoraAPIRequestLimit.new("The total number of concurrent requests has exceeded the limit allowed by the system. Please resubmit your request later.", response)
-          else
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", response)
-          end
+          raise ZuoraAPI::Exceptions::ZuoraAPIError.new("#{response.message}", response)
         end
       end
     end

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.08"
+  VERSION = "1.7.09"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.08
+  version: 1.7.09
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler