zuora_connect 3.0.2.pre.g → 3.0.2.pre.k

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3cede711b0d2e03b8af4d3b6217efff536d7a1c937622534002a7555982aae1
-  data.tar.gz: 86fb27da334cc101429209aab0a3071209cc8c58286d26ac8d9643402ef0c887
+  metadata.gz: 6b4a4c2927c6b81722708d1a63d756c904baaa5a8476851bce38da0e45d6215f
+  data.tar.gz: ed4dfa6c6e9c70b6c22af27904b9688f814504ad17caf2ee6fe31ad6417b7135
 SHA512:
-  metadata.gz: 964dd0285c9ac0202a6f60d17ce4d0c1a17054fb291ae1ff1aeed31205f4e43c4038a98afe416ce154f4b302084f078130aa2f281b998fd84a66bc755ae576cd
-  data.tar.gz: 79f01e5ecf1a176c5e8960d1646c075054effc585196decc5664dde1daa9fabbdb5ec79659156485099739a4dd336022e2a4f7af8b3263f106e7aad4fa5d6392
+  metadata.gz: 8ce54ad080c6a485e5b20bedb43989646a97460891819666409fbedb0192ad36e6efeddf5a8a2259d740222137cdd51ceacc72df77de326334cd451746ceaa75
+  data.tar.gz: 3c5adcb73a7b967dd4335af2ebbb0a91202313632fdc9beebe25e58da7278646aedf48eb6178ee3ce5385549d5269f9a4f95629441cd8e144eb5432062727894

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_tenant_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
@@ -813,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/models/zuora_connect/zuora_user.rb

@@ -8,13 +8,16 @@ module ZuoraConnect
     # zuora_user_id/zuora_entity_id both come from cookie or headers
     # zuora_current_identity comes from session
     # app_instance is only needed to try to migrate :/
-    def self.update_id_response(zuora_user_id, zuora_entity_id, zuora_current_identity, app_instance)
+    def self.update_id_response(zuora_user_id, zuora_entity_id, zuora_current_identity, app_instance, permissions)
       zuora_user = find_or_create_by!(zuora_user_id: zuora_user_id) do |user|
         user.zuora_identity_response = { zuora_entity_id => zuora_current_identity }
+        user.app_permissions = permissions
       end
 
-      if zuora_user.stale_identity?
-        zuora_user.zuora_identity_response[zuora_entity_id] = zuora_current_identity
+      zuora_user.zuora_identity_response[zuora_entity_id] = zuora_current_identity
+      zuora_user.app_permissions = permissions
+
+      if zuora_user.changed?
         zuora_user.save!
       end
 
@@ -28,11 +31,5 @@ module ZuoraConnect
       app_instance.apartment_switch(nil, true)
       retry
     end
-
-    # NOTE(hartley): this value was extracted from original usage in helper,
-    # need to investigate when exactly the identity_response should be updated
-    def stale_identity?
-      updated_at < Time.now - 1.day
-    end
   end
 end

data/lib/zuora_connect/controllers/helpers.rb

@@ -64,6 +64,8 @@ module ZuoraConnect
           else
             check_instance
           end
+
+          @zuora_user = ZuoraConnect::ZuoraUser.find_by(zuora_user_id: ZuoraConnect::ZuoraUser.current_user_id)
         end
       end
 
@@ -419,7 +421,8 @@ module ZuoraConnect
             if defined?(@appinstance) && !@appinstance['zuora_logins'].nil?
               @zuora_user = ZuoraConnect::ZuoraUser.update_id_response(
                 zuora_user_id, zuora_entity_id, session["ZuoraCurrentIdentity"],
-                @appinstance
+                @appinstance,
+                session['ZuoraCurrentUserInfo']['permissions']
               )
               @zuora_user.session = session
               ZuoraConnect::ZuoraUser.current_user_id = zuora_user_id

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-k"
 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.k
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment