zuora_api 1.7.63 → 1.7.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88e37565531ff8c2754161d3f80ca9a85595ba7ae8edf3b8197f5725befc380d
-  data.tar.gz: f772100edddb68b366a278b5495be155e31ca02a5bfdbbad4bd9e4c61b892f11
+  metadata.gz: 340446bc0ceb955e7c27ed8460d8752f9e1a7183b00cfce6e5c6d8bec906aa1c
+  data.tar.gz: 74f68adcdc9e0b5e83bf586149b38b66b692bdc50a9554172b3f7ba03c36c7d2
 SHA512:
-  metadata.gz: e5e6696b9959dab076dae74897fe2740e097d4000362c090b4598be754fab34bcbd07b84d1c05bdd46f2f7d2549bf5ad34538ad42bfcbb8c26f0f959c7e43a08
-  data.tar.gz: fa8b457a3dd8628cf580d29bb2181da3213ca40a2f707693ac8e5647d458766dc01e1c8c1e98cac9b548e0883f6e00c9c9feafa5a04ee930a01208f28aa957f1
+  metadata.gz: e33bb4f39c96629690aa3606e1b768af0390c484126db0828af456122b0b3dac78fc4e6d453a3f8631a3147eba89b031e00993130e355f394dfe20a655713f48
+  data.tar.gz: cf81fe9fc35668007a47bdf2c06195f409e6af0f8b60c181baea4f45db29b9860aca9827b7096c6d584ddc51328d9724ec56df2746f4aeb0496150404c0b5990

data/Gemfile.lock

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

data/lib/zuora_api/login.rb

@@ -201,7 +201,7 @@ module ZuoraAPI
                       "Production" => "https://zconnect.na.zuora.com/api/rest/v1/",
                       "Services"=> ""}
       }
-      return map[zuora_client.region][zuora_client.environment].insert(-1, path)
+      return map[self.region][self.environment].insert(-1, path)
     end
 
     # There are two ways to call this method. The first way is best.
@@ -656,14 +656,15 @@ module ZuoraAPI
             raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('message'), response) if body.dig('message').present?
           end
         when /^\/api\/rest\/v1\/reports.*/  #Reporting Paths
-          if body.dig('message') == "com.zuora.rest.RestUsageException: The user does not have permissions for this API."
-            raise ZuoraAPI::Exceptions::ZuoraAPIError.new(body.dig('message'), response)
+          reporting_message = response.parsed_response.dig("ZanResponse", "response", "message") || body.dig("message")
+          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.")
           end
           case match_string
-          when /^GET::400::\/api\/rest\/v1\/reports\/([a-zA-Z0-9\-_]+)\/report-details$/ # Get report, capture of the id is present if needed in future error responses. 
-            if response.parsed_response.dig("ZanResponse", "response", "message").present?
-              raise ZuoraAPI::Exceptions::ZuoraAPIError.new(response.parsed_response.dig("ZanResponse", "response", "message"), response)
-            end
+          when /^GET::400::\/api\/rest\/v1\/reports\/([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
         end
 
@@ -1010,14 +1011,17 @@ module ZuoraAPI
     )
       tries ||= 2
 
-      if self.entity_id.present?
-        headers["Zuora-Entity-Ids"] = self.entity_id if headers.dig("Zuora-Entity-Ids").nil?
-        headers.delete_if { |key, value| ["entityId", "entityName"].include?(key.to_s) }
-      end
-
       raise "Method not supported, supported methods include: :get, :post, :put, :delete, :patch, :head, :options" if ![:get, :post, :put, :delete, :patch, :head, :options].include?(method)
 
-      authentication_headers = z_session ? {"Authorization" =>  self.get_session(prefix: true, auth_type: session_type) } : {}
+      authentication_headers = {}
+      if z_session
+        authentication_headers = {"Authorization" => self.get_session(prefix: true, auth_type: session_type) }
+        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
+
       modified_headers = {'Content-Type' => "application/json; charset=utf-8"}.merge(authentication_headers).merge(headers)
 
       begin

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.7.63"
+  VERSION = "1.7.64"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.7.63
+  version: 1.7.64
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler