zuora_api 1.6.13 → 1.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da08f80d742b03a45b22fe84857980e2fb5ea2d7
-  data.tar.gz: 80272875b0d22ecccd0c7eb043b65901978cc4dc
+  metadata.gz: eb1f443e04878b031dbbe67b84f50469a7d3beaa
+  data.tar.gz: 9b30ebd31682149f9b1942dfdb91ed6f2ec86dff
 SHA512:
-  metadata.gz: 2ad860b5226a2c423e2663e5ffc0a75d8496467998fd5ad521b7745db7d5fe3a1cf1cdfe6d87cf9bcfb4f8d4d8252690802c26d76ec2f3ca12a83d8004f5b56b
-  data.tar.gz: 73bd63442c49eda3056ff1cfbf245ba018c185e191860d4a13d136d5bf3764012f1be5795aa1a4f106d5a610c601d42ea34e3f76650fbb34ae26e1cd1aa9d6ea
+  metadata.gz: eb1ded3eff4c69170246fcc97e47bf8ebea328fb0955e1451e097732829b846f87fdea3c7ae61d0257f2a35825e25f179cff557447c1fedb36fb818b2374b18e
+  data.tar.gz: 29679e0b2db46c700fa44ceb9f2e9f47b544ee258310d2043e913117ae6e3558dc5d1544af9c0e3e44f248ed8a4171c99369522c74f930bf5b891cca8ce59ba1

data/Gemfile.lock

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

data/lib/zuora_api/login.rb

@@ -12,7 +12,7 @@ module ZuoraAPI
 
     def initialize(url: nil, entity_id: nil, session: nil, status: nil, **keyword_args)
       @url = url.gsub(/(\d{2}\.\d)$/, MIN_Endpoint)
-      @entity_id = entity_id
+      @entity_id = get_entity_id(entity_id: entity_id)
       @errors = Hash.new
       @current_session = session
       @status = status.blank? ? "Active" : status
@@ -46,6 +46,18 @@ module ZuoraAPI
             }
     end
 
+    def get_entity_id(entity_id: nil)
+      if entity_id.present?
+        entity_match = /[a-zA-Z0-9]{8}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{4}-[a-zA-Z0-9]{12}$/.match(entity_id)
+        if entity_match.blank?
+          raise "Entity length is wrong." if entity_id.length != 32
+          part_one, part_two, part_three, part_four, part_five = [entity_id[0..7], entity_id[8..11], entity_id[12..15], entity_id[16..19], entity_id[20..31]]
+          entity_id = "#{part_one}-#{part_two}-#{part_three}-#{part_four}-#{part_five}"
+        end
+      end
+      return entity_id
+    end
+
     def update_environment
       if !self.url.blank?
         env_path = self.url.split('https://').last.split('.zuora.com').first
@@ -392,7 +404,7 @@ module ZuoraAPI
 
       base = self.url.include?(".com") ? self.url.split(".com")[0].concat(".com") : self.url.split(".eu")[0].concat(".eu")
       url = object ? "#{base}/apps/api/describe/#{object}" : "#{base}/apps/api/describe/"
-      headers = !self.entity_id.blank? ? {"entityId" => self.entity_id, 'Content-Type' => "text/xml; charset=utf-8"} : {'Content-Type' => "text/xml; charset=utf-8"}
+      headers = self.entity_id.present? ? {"Zuora-Entity-Ids" => 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 == 401
@@ -447,12 +459,12 @@ module ZuoraAPI
       return des_hash
     end
 
-    def rest_call(method: :get, body: nil,headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, session_type: :basic, timeout_retry: false, timeout: 120, **keyword_args)
+    def rest_call(method: :get, body: nil, headers: {}, url: rest_endpoint("catalog/products?pageSize=4"), debug: false, errors: [ZuoraAPI::Exceptions::ZuoraAPISessionError, ZuoraAPI::Exceptions::ZuoraAPIError, ZuoraAPI::Exceptions::ZuoraAPIRequestLimit, ZuoraAPI::Exceptions::ZuoraAPILockCompetition], z_session: true, session_type: :basic, timeout_retry: false, timeout: 120, **keyword_args)
       tries ||= 2
 
       if self.entity_id.present?
-        headers["entityId"] = self.entity_id
-        headers["Zuora-Entity-Ids"] = self.entity_id if !url.end_with?("/oauth/token")
+        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)
@@ -572,7 +584,7 @@ module ZuoraAPI
         http.use_ssl = true  if uri.scheme.downcase == 'https'
         if z_session
           headers = headers.merge({"Authorization" => self.get_session(prefix: true)})
-          headers = headers.merge({"entityId" => self.entity_id}) if !self.entity_id.blank?
+          headers = headers.merge({"Zuora-Entity-Ids" => self.entity_id}) if !self.entity_id.blank?
         end
 
         response_save = nil

data/lib/zuora_api/logins/oauth.rb

@@ -31,7 +31,7 @@ module ZuoraAPI
     
     def get_z_session(debug: false)
       tries ||= 2
-      headers = self.entity_id.present? ? {:entityId => self.entity_id } : {}    
+      headers = self.entity_id.present? ? {"Zuora-Entity-Ids" => self.entity_id } : {}    
       output_json, response = self.rest_call(:url => self.rest_endpoint("connections"), :session_type => :bearer, :headers => headers)
       self.current_session = response.headers.to_h['set-cookie'][0].split(';')[0].split('=',2)[1].gsub('%3D', '=')
     rescue ZuoraAPI::Exceptions::ZuoraAPISessionError => ex

data/lib/zuora_api/version.rb

@@ -1,3 +1,3 @@
 module ZuoraAPI
-  VERSION = "1.6.13"
+  VERSION = "1.6.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_api
 version: !ruby/object:Gem::Version
-  version: 1.6.13
+  version: 1.6.14
 platform: ruby
 authors:
 - Zuora Strategic Solutions Group
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler