zuora_api 1.6.05 → 1.6.06

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c97903a1943d077f8960b00444d8cb6131e16d7
-  data.tar.gz: e87533599bb79ad30c2e40d1a5d9711b209aeaf0
+  metadata.gz: 8cb1e32a82e7c3fd01dcf3d215c3d617cec5756e
+  data.tar.gz: 1b14fa9ca4eefdb274416462e40ec7f5e63be874
 SHA512:
-  metadata.gz: 545d3bcee02805d30b61d1151e2edbdbd2dcaddcf78071e0d558f991047fdf7acc279066a9fafcc18bd066a5f8afff3561d26f3cb33547f04a7a16776c82ebd3
-  data.tar.gz: bb700beea609d36db86627eb88c5ef895662a01bdccf59e73ae9fb49395ff4d7ade82ba109f318a8c705b92d68d25688ba8cede978211e18f0664eb25da4f126
+  metadata.gz: 2a36436cb1fbf7c2ae7a5bb5ac35e701c5c4db88fadf40834054badf144a08ad40a5c6799f2834dd18ff4226315884424ae561d10aae1403689c8ee03ad196ab
+  data.tar.gz: 3973c49d3245e87bd2fa58ae80536bcbce47fa3ad8fb58d383e57984087fb8e4a286f86481db6b447bb8b6daa37381d7c524ac813bdb33236a1e0b76fa40ad89

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zuora_api (1.6.05)
+    zuora_api (1.6.06)
       httparty
       nokogiri
       railties (>= 4.1.0, < 5.2)

data/lib/zuora_api/login.rb

@@ -392,7 +392,7 @@ module ZuoraAPI
       headers = !self.entity_id.blank? ? {"entityId" => self.entity_id, 'Content-Type' => "text/xml; charset=utf-8"} : {'Content-Type' => "text/xml; charset=utf-8"}
       response = HTTParty.get(url,  headers: {"Authorization" => self.get_session(prefix: true, auth_type: :basic)}.merge(headers), :timeout => 120)
 
-      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Session Expired") if response.code.to_s == "401"
+      raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new("Session Expired") if response.code == 401
       output_xml = Nokogiri::XML(response.body)
       des_hash = Hash.new
       if object == nil
@@ -549,7 +549,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, **execute_params)
+    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, session_type: :basic, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -562,7 +562,7 @@ module ZuoraAPI
         http = Net::HTTP.new(uri.host, uri.port)
         http.read_timeout = timeout #Seconds
         http.use_ssl = true  if uri.scheme.downcase == 'https'
-        headers = headers.merge({"Authorization" => self.get_session(prefix: true)}) if z_session
+        headers = headers.merge({"Authorization" => self.get_session(prefix: true, auth_type: session_type)}) if z_session
 
         response_save = nil
         http.request_get(uri.path, headers) do |response|
@@ -575,9 +575,13 @@ module ZuoraAPI
             raise response
 
           when Net::HTTPUnauthorized
-            raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if count <= 0
             Rails.logger.fatal("Unauthorized: Retry")
-            self.new_session
+            if z_session
+              raise ZuoraAPI::Exceptions::ZuoraAPISessionError.new(self.current_error) if count <= 0
+              self.new_session
+            else
+              raise if count <= 0
+            end 
             return get_file(:url => url, :headers => headers, :count => count - 1, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries, :timeout => timeout)
 
           when Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, OpenSSL::SSL::SSLError, Errno::ECONNREFUSED, SocketError
@@ -585,7 +589,6 @@ module ZuoraAPI
             return get_file(:url => url, :headers => headers, :count => count, :z_session => z_session, :tempfile => tempfile, :file_path => file_path, :timeout_retries => timeout_retries - 1, :timeout => timeout)
 
           when Net::HTTPClientError
-            Rails.logger.fatal("Login: #{self.username} Export")
             raise response
 
           when Net::HTTPOK

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.05"
+  VERSION = "1.6.06"
 end

metadata

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