zuora_connect 3.0.2.pre.g → 3.0.2.pre.h

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3cede711b0d2e03b8af4d3b6217efff536d7a1c937622534002a7555982aae1
-  data.tar.gz: 86fb27da334cc101429209aab0a3071209cc8c58286d26ac8d9643402ef0c887
+  metadata.gz: 1daf70331d29259febac6329ca469eb0a452dbd2528b2fca8df344bf4eba70ae
+  data.tar.gz: d9a36bda5170c74140511e7e2538ad2e71c02af12c311cd57dbd9e825c970bbf
 SHA512:
-  metadata.gz: 964dd0285c9ac0202a6f60d17ce4d0c1a17054fb291ae1ff1aeed31205f4e43c4038a98afe416ce154f4b302084f078130aa2f281b998fd84a66bc755ae576cd
-  data.tar.gz: 79f01e5ecf1a176c5e8960d1646c075054effc585196decc5664dde1daa9fabbdb5ec79659156485099739a4dd336022e2a4f7af8b3263f106e7aad4fa5d6392
+  metadata.gz: a4db46ecf8fa9ef1f8aea8e1622450e95ba85e9a1f34764e5461ecaa1a4da8987704a5fd15e73946030f9592253bf099db4f4e83515ea81064216bf058dddf05
+  data.tar.gz: 8a71664252ae4b807e0bfe851cb5246de049591787da15a909bb2e67e3c4addd960c0d0fbbdce47758716722bf4c245a0b1aa2b6adbbdb70155c4a23b0770754

data/app/models/zuora_connect/app_instance_base.rb

@@ -266,7 +266,7 @@ module ZuoraConnect
 
         params = {
           name: self.task_data.dig('name'),
-          zuora_entity_ids: (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).map{|e| e['id']}.uniq,
+          zuora_entity_ids: (self.task_data.dig(LOGIN_TENANT_DESTINATION,'entities') || []).select {|entity| !entity['skip'].to_bool}.map{|e| e['id']}.uniq,
           zuora_tenant_ids: tenants.map(&:to_s).uniq,
           organizations: organizations
         }
@@ -813,7 +813,7 @@ module ZuoraConnect
       def strip_cache_data(object: {}, keys: ['applications', 'tokens','tenant_ids', 'organizations','user_settings'] )
         keys.each {|key| object.delete(key) }
         object.select {|k,v| k.include?('login') && v['tenant_type'] == 'Zuora'}.each do |login_key, login_data|
-          object[login_key]['entities'] = login_data.fetch('entities',[]).map {|entity| entity.slice('id', 'tenantId', 'entityId', 'displayName')}
+          object[login_key]['entities'] = login_data.fetch('entities',[]).map {|entity| entity.slice('id', 'tenantId', 'entityId', 'displayName', 'identifier')}
         end
         return object
       end

data/app/models/zuora_connect/login.rb

@@ -1,27 +1,29 @@
 module ZuoraConnect
   class Login
-
+    attr_accessor :clients, :identifier_to_ids, :default_entity
     def initialize (fields)
-      @clients = {}
+      self.clients = {}
+      self.identifier_to_ids = {}
       if fields["tenant_type"] == "Zuora"
         login_fields = fields.map{|k,v| [k.to_sym, v]}.to_h
         login_type = fields.dig("authentication_type").blank? ? 'Basic' : fields.dig("authentication_type").capitalize
         
         raise ZuoraConnect::Exceptions::InvalidCredentialSet.new("Cannot setup application with ZSession Login.") if login_type == "Session"
-        @clients["Default"] = "::ZuoraAPI::#{login_type}".constantize.new(**login_fields)
-        @default_entity = fields["entities"][0]["id"] if (fields.dig("entities") || []).size == 1
+        self.clients["Default"] = "::ZuoraAPI::#{login_type}".constantize.new(**login_fields)
+        self.default_entity = fields["entities"][0]["id"] if (fields.dig("entities") || []).size == 1
         if fields["entities"] && fields["entities"].size > 0
           fields["entities"].each do |entity|
-            params = {:entity_id => entity["id"]}.merge(login_fields)
-            @clients[entity["id"]] =  "::ZuoraAPI::#{login_type}".constantize.new(**params)
+            params = {:entity_id => entity["id"], :entity_identifier => entity["identifier"]}.merge(login_fields)
+            self.clients[entity["id"]] =  "::ZuoraAPI::#{login_type}".constantize.new(**params)
+            self.identifier_to_ids[entity["identifier"]] = entity["id"]
           end
         end
-        self.attr_builder("available_entities", @clients.keys) 
+        self.attr_builder("available_entities", self.clients.keys) 
       end
       fields.each do |k,v|
         self.attr_builder(k,v)
       end
-      @default_entity ||= "Default"
+      self.default_entity ||= "Default"
     end
 
     def attr_builder(field,val)
@@ -29,9 +31,19 @@ module ZuoraConnect
       send("#{field}=", val)
     end
 
-    def client(id = @default_entity)
-      return id.blank? ? @clients[@default_entity] : @clients[id]
-    end
+    def client(id = self.default_entity)
+      use_entity_name = self.identifier_to_ids.keys.include?(id)
+
+      # Translate entity name to entity id
+      id = self.identifier_to_ids[id] if use_entity_name
+
+      client = id.blank? ? self.clients[self.default_entity] : self.clients[id]
 
+      if client
+        client.entity_header_type = use_entity_name ? :entity_name : :entity_id
+      end
+
+      client
+    end
   end
 end

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = "3.0.2-g"
+  VERSION = "3.0.2-h"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.2.pre.g
+  version: 3.0.2.pre.h
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment