zuora_connect 3.0.2.pre.h → 3.0.2.pre.l

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1daf70331d29259febac6329ca469eb0a452dbd2528b2fca8df344bf4eba70ae
-  data.tar.gz: d9a36bda5170c74140511e7e2538ad2e71c02af12c311cd57dbd9e825c970bbf
+  metadata.gz: 39316ba478576ec6b9a8686b172a335ee14e91780af31761330599f1010df069
+  data.tar.gz: 8612977375f206da41b17f9f5ca732791cc0e84076613af28a17f1f1ada9a02f
 SHA512:
-  metadata.gz: a4db46ecf8fa9ef1f8aea8e1622450e95ba85e9a1f34764e5461ecaa1a4da8987704a5fd15e73946030f9592253bf099db4f4e83515ea81064216bf058dddf05
-  data.tar.gz: 8a71664252ae4b807e0bfe851cb5246de049591787da15a909bb2e67e3c4addd960c0d0fbbdce47758716722bf4c245a0b1aa2b6adbbdb70155c4a23b0770754
+  metadata.gz: c53a4986aa08336e6ce4be91b7dd329bf84c6b4eda1aa6b3e2f8c8573cb4a5fc5c205f1d0f3b1d4a3abf2dfe09dad8c02e4ed2a93c5f6b653ac80b81a3e48f86
+  data.tar.gz: 70094dc8bae6ceaa40a7d1a8e49476d3e80127d9416a224c55e242983d0539d7b76384cf45ad2cf5bf2df631aab40c1a8f20ef3fd377811b3f0bad5edfaa54aa

data/app/models/concerns/zuora_connect/auditable.rb

@@ -12,6 +12,9 @@ module ZuoraConnect
       before_update :set_updated_by_id
       before_destroy :set_updated_by_id
 
+      belongs_to :updated_by, class_name: 'ZuoraConnect::ZuoraUser', foreign_key: 'updated_by_id', primary_key: "zuora_user_id", optional: true
+      belongs_to :created_by, class_name: 'ZuoraConnect::ZuoraUser', foreign_key: 'created_by_id', primary_key: "zuora_user_id", optional: true
+
       private
 
       def set_created_by_id

data/app/models/zuora_connect/app_instance_base.rb

@@ -128,7 +128,7 @@ module ZuoraConnect
             raise
           end
         end
-        if migrate && ActiveRecord::Migrator.needs_migration?
+        if migrate
           Apartment::Migrator.migrate(self.id)
         end
       end
@@ -267,6 +267,7 @@ module ZuoraConnect
         params = {
           name: self.task_data.dig('name'),
           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

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-h"
+  VERSION = "3.0.2-l"
 end

metadata

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