zuora_api 1.6.26 → 1.6.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e86b5da627b9f51c342da05d5e4110e3385a35a4
-  data.tar.gz: 9ccf40e8d6dfca789d16207421dc07352ad8c921
+  metadata.gz: fa6e502f281056139b4e18a986bb6d129837df06
+  data.tar.gz: 7893fb708b15af2e2931097108fa5cebc56200fd
 SHA512:
-  metadata.gz: 35a3fb0d447a8a52d11762133e0fe11cccea7e5970c74aa31bc121153dc62d3aece97adaf08fa1a8cc6562c5eee2b74c9c24144ff981d503083530b10c1e3bb3
-  data.tar.gz: ef0b5f9af4d236df06de046d3afd6e8e649a007281036c9770df4cb289d31df99f3f1ae535eae55ff28154b6f098b60e0e46f90724b894d0b1dc27a0743b3795
+  metadata.gz: 807901369ca7d585cf77f08004f13b708567ea5fc39ad0117f58d1d8ca2c498cd5666b1efbe596d6abd51dfd4b22c2d10fbf92dacadcbef32d3a7346b8db838d
+  data.tar.gz: 279127003d4cf2a0786e7d519853efe5ddb06b23f33a945ce93482bba35ce600f6b061b3c4f2634cb38a4b6bc10e5a0b112030627301b1a3faae6d65a60e7870

data/CHANGELOG.md

@@ -1,15 +1,14 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [1.6.16] - 2018-12-09
+## [1.6.28] - 2018-3-12
 ### Added
-- Example
+- Way to avoid force encoding for filedownload
 
+## [1.6.22] - 2019-01-03
 ### Changed
-- Example
-
-### Removed
-- Example
+- get_identity method - supports ZSession auth now
+- updated rspecs accordingly
 
 ## [1.6.18] - 2018-12-06
 ### Added
@@ -24,15 +23,4 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - The way environment and region are set
 
-## [1.6.22] - 2019-01-03
 
-### Changed
-- get_identity method - supports ZSession auth now
-- updated rspecs accordingly
-
-## [1.6.26] - 2019-03-04
-
-### Changed
-- fixed get_oauth_client for non-staging environments
-- fixed to use correct rest endpoint without version for oauth creation api
-- changed get_oauth_client to no longer accept client id and secret as parameters

data/lib/zuora_api/login.rb

@@ -156,11 +156,13 @@ module ZuoraAPI
     end
 
     # There are two ways to call this method. The first way is best.
-    # 1. Pass in cookies, name, and description
-    # 2. Pass in user_id, entity_ids, an existing client_id and client_secret, name, and description
+    # 1. Pass in cookies and optionally custom_authorities, name, and description
+    # 2. Pass in user_id, entity_ids, client_id, client_secret, and optionally custom_authorities, name, and description
     # https://intranet.zuora.com/confluence/display/Sunburst/Create+an+OAuth+Client+through+API+Gateway#CreateanOAuthClientthroughAPIGateway-ZSession
-    def get_oauth_client (info_name: "No Name", info_desc: "This client was created without a description.", user_id: nil, entity_ids: nil, client_id: nil, client_secret: nil, cookies: nil)
+    def get_oauth_client (custom_authorities = [], info_name: "No Name", info_desc: "This client was created without a description.", user_id: nil, entity_ids: nil, client_id: nil, client_secret: nil, new_client_id: nil, new_client_secret: nil, cookies: nil)
       authorization = ""
+      new_client_id = SecureRandom.uuid if new_client_id.blank?
+      new_client_secret = SecureRandom.hex(10) if new_client_secret.blank?
 
       if !cookies.nil?
         authorization = cookies["ZSession"]
@@ -176,18 +178,18 @@ module ZuoraAPI
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new("Zuora User ID not provided", {}, 400)
         end
       elsif !client_id.nil? && !client_secret.nil?
-        endpoint = self.rest_endpoint("oauth/token").gsub("v1/", "")
-        bearer_response = HTTParty.post(endpoint, :headers => {'Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json'}, :body => {'client_id' => client_id, 'client_secret' => URI::encode(client_secret), 'grant_type' => 'client_credentials'})
+        bearer_response = HTTParty.post("https://#{self.hostname}/oauth/token", :headers => {'Content-Type' => 'application/x-www-form-urlencoded', 'Accept' => 'application/json'}, :body => {'client_id' => client_id, 'client_secret' => URI::encode(client_secret), 'grant_type' => 'client_credentials'})
         bearer_hash = JSON.parse(bearer_response.body)
         bearer_token = bearer_hash["access_token"]
         authorization = "Bearer #{bearer_token}"
       end
 
       if !authorization.blank? && !user_id.blank? && !entity_ids.blank?
-        endpoint = self.rest_endpoint("genesis/clients").gsub("v1/", "")
-        oauth_response = HTTParty.post(endpoint, :headers => {'authorization' => authorization, 'Content-Type' => 'application/json'}, :body => {'userId' => user_id, 'entityIds' => entity_ids, 'additionalInformation' => {'description' => info_desc, 'name' => info_name}}.to_json)
+        endpoint = self.rest_endpoint("genesis/clients")
+        oauth_response = HTTParty.post(endpoint, :headers => {'authorization' => authorization, 'Content-Type' => 'application/json'}, :body => {'clientId' => new_client_id, 'clientSecret' => new_client_secret, 'userId' => user_id, 'entityIds' => entity_ids, 'customAuthorities' => custom_authorities, 'additionalInformation' => {'description' => info_desc, 'name' => info_name}}.to_json)
         output_json = JSON.parse(oauth_response.body)
         if oauth_response.code == 201
+          output_json["clientSecret"] = new_client_secret
           return output_json
         elsif oauth_response.code == 401 && !oauth_response.message.blank?
           raise ZuoraAPI::Exceptions::ZuoraAPIError.new(output_json["message"], {}, oauth_response.code)
@@ -843,7 +845,7 @@ module ZuoraAPI
       return products, catalog_map
     end
 
-    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, output_file_name: nil, add_timestamp: 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)
+    def get_file(url: nil, headers: {}, count: 3, z_session: true, tempfile: true, output_file_name: nil, add_timestamp: true, file_path: defined?(Rails.root.join('tmp')) ? Rails.root.join('tmp') : Pathname.new(Dir.pwd), timeout_retries: 2, timeout: 120, session_type: :basic, force_encoding: true, **execute_params)
       raise "file_path must be of class Pathname" if file_path.class != Pathname
 
       #Make sure directory exists
@@ -882,7 +884,7 @@ module ZuoraAPI
               end
               Rails.logger.fatal("Unauthorized: Retry")
               self.new_session if z_session
-              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)
+              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, :force_encoding => force_encoding)
 
             when Net::HTTPClientError
               raise
@@ -893,7 +895,6 @@ module ZuoraAPI
                 headers[k] = v
               end
               Rails.logger.debug("Headers: #{headers.to_s}")
-
               if output_file_name.present?
                 file_ending ||= output_file_name.end_with?(".csv.zip") ? ".csv.zip" : File.extname(output_file_name)
                 filename ||= File.basename(output_file_name, file_ending)
@@ -929,7 +930,6 @@ module ZuoraAPI
                   encoding ||= 'UTF-8'
                 end
               end
-              Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type}")
 
               if response.header["Content-Length"].present?
                 export_size = response.header["Content-Length"].to_i
@@ -937,6 +937,8 @@ module ZuoraAPI
                 export_size = response.header["ContentLength"].to_i
               end
 
+              Rails.logger.info("File: #{filename}#{file_ending}  #{encoding}  #{type} #{export_size}")
+
               file_prefix = add_timestamp ? "#{filename}_#{Time.now.to_i}" : filename
               if tempfile
                 require 'tempfile'
@@ -947,7 +949,11 @@ module ZuoraAPI
               file_handle.binmode
 
               response.read_body do |chunk|
-                file_handle << chunk.force_encoding(encoding)
+                if force_encoding
+                  file_handle << chunk.force_encoding(encoding)
+                else 
+                  file_handle << chunk
+                end
 
                 if defined?(export_size) && export_size != 0  && export_size.class == Integer
                   size += chunk.size
@@ -965,7 +971,7 @@ module ZuoraAPI
               return file_handle
             end
           end
-        rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS) => e
+        rescue *(CONNECTION_EXCEPTIONS).concat(CONNECTION_READ_EXCEPTIONS).concat([Net::HTTPBadResponse]) => e
           sleep(5)
           if (timeout_retries -= 1) >= 0
             Rails.logger.warn("Download Failed: #{e.class} : #{e.message}")

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.26"
+  VERSION = "1.6.28"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.26
+  version: 1.6.28
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler