zuora_connect 3.0.2.pre.e → 3.0.2.pre.i

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d1be219ec34e867fe4e4b368cc47cf32331199fb75fba7b13e48b8302698899
-  data.tar.gz: 693fcb0a597f5e4430d1ea71916034f0d8bf0ba1b6af24390d6c189c79db105f
+  metadata.gz: acded16be82a4aa36090fda0248e1d62b739e6ea1bbe39a7b365c137c07c4481
+  data.tar.gz: 263c629b6b718b068f4a6dcc3b9603ab04f0c6895d928a6f1841eae2e5343149
 SHA512:
-  metadata.gz: 6e9758779261866d0bf013a3c27aafafc1e250310f43dcb4fb029b6602e54f00cfb29efcf903cd57d35a973decfbb1be33c7400ee9de148d860cd1bff4b51b77
-  data.tar.gz: 669ca1f044f2b783288c7fe15e50a2f6c322278cda00e8fba0a0fe744ec5dc10ec6b95506ff4378b4f989af43aeb48a2662296e84d2d24d554f990f0eaf3a69c
+  metadata.gz: f06d9884240c45a96f17dc2a3927a8addca134d74d96fcdc38e0905b7d1d53f54e32babc95745fb241a754fbbc56d82e835bc1162f459364917abe8295861b63
+  data.tar.gz: 14deefe69fe5b535538f93092606b228397c60ef5ae11417d9c193ec349e50786abd1155673bec58b005cb0fae244f23411850f21cf3b7e5b1f5ef6ecd9f99e8

data/app/models/zuora_connect/app_instance_base.rb

@@ -266,7 +266,8 @@ 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_global_entity_id: task_data.dig(LOGIN_TENANT_DESTINATION, 'entities', 0, 'globalEntityId').to_i, # tenant id of the global/parent entity, 0 if nil
           zuora_tenant_ids: tenants.map(&:to_s).uniq,
           organizations: organizations
         }
@@ -277,6 +278,9 @@ module ZuoraConnect
             params.merge!({zuora_domain: client.rest_domain, environment: client.environment })
           end
         end
+
+        # makes it safe to add elements to params which don't correspond to existing columns in an app's schema
+        # rejects those elements which do not correspond to model attributes for your app
         params = params.reject{|k,v| !self.attributes.keys.member?(k.to_s) || self[k] == v}
         self.update_columns(params) if params.present?
       end
@@ -397,7 +401,8 @@ module ZuoraConnect
         end
       end
     rescue => ex
-      if self['zuora_logins'].present?
+      refresh_count += 1
+      if self['zuora_logins'].present? && refresh_count < 3
         ZuoraConnect.logger.warn("REFRESH TASK - Fallback to local encrypted store", ex, self.default_ougai_items)
         skip_connect = true
         retry
@@ -812,7 +817,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/app/views/zuora_connect/static/error_handled.js.erb

@@ -1 +1 @@
-$('body').html('<%= escape_javascript render(:file=> "zuora_connect/static/error_handled", :formats => [:html], :locals => local_assigns, :layout => false) %>');
+$('body').html('<%= escape_javascript render(:template=> "zuora_connect/static/error_handled", :formats => [:html], :locals => local_assigns, :layout => false) %>');

data/app/views/zuora_connect/static/error_unhandled.js.erb

@@ -1 +1 @@
-$('body').html('<%= escape_javascript render(:file=> "zuora_connect/static/error_unhandled", :formats => [:html], :locals => local_assigns, :layout => false) %>');
+$('body').html('<%= escape_javascript render(:template=> "zuora_connect/static/error_unhandled", :formats => [:html], :locals => local_assigns, :layout => false) %>');

data/lib/zuora_connect/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZuoraConnect
-  VERSION = '3.0.2-e'
+  VERSION = "3.0.2-i"
 end

metadata

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