forest_liana 7.6.13 → 7.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b031b66a7afc9e69d6d16fdc8787ce99087abe166faa9e708bf19ad4583b464
-  data.tar.gz: a94b3ad5cc17306b53e43424e1b4317561bcd59484aa270422cb5a0a20216d7d
+  metadata.gz: 4c0be19be3d243bda2e6ed0a9b926c6e1f1b24b7ab44187698d7fa08bdd8cfbb
+  data.tar.gz: cd4076fa6837e825d545ccc0995dfef7a2326c652ab659ff615f582069b59c12
 SHA512:
-  metadata.gz: 6f29bbbed569c99ec65dc51711c98744dd4e249bc62845c3bc0b0c0eda3c734ce9fc8dd15fc23a29e83ad884430e25b5315183f0d95c00102376f8c930fcee58
-  data.tar.gz: d27f1c9eec56ddb0889552e6edcf2312866b5df5a5f11a924611b84c00f02b48ed332dac5fd884b31e3fd3000be38015ecfdc393c1c4a083b6fcef4d4baaf402
+  metadata.gz: 0c34125014fb5025c6d9bfbe4c1fc4076d876ca2a436671743c5c529ac8b8c9cbb9add104ad03f01142a31ae17c0a04f3c9e76b73b1eb4785dfe01d4cbb1d3c2
+  data.tar.gz: d189bf3ccd299236868d97c8fc32464c9c22f095c1c0a1c5f28c990b2690f63fe6f9c25f45c374b510849f3246dcd4e572b110194e0ca2ce0cc60e209d511133

data/app/controllers/forest_liana/resources_controller.rb

@@ -16,14 +16,14 @@ module ForestLiana
     def index
       begin
         if request.format == 'csv'
-          checker = ForestLiana::PermissionsChecker.new(@resource, 'exportEnabled', @rendering_id, user_id: forest_user['id'])
+          checker = ForestLiana::PermissionsChecker.new(@resource, 'exportEnabled', @rendering_id, user: forest_user)
           return head :forbidden unless checker.is_authorized?
         else
           checker = ForestLiana::PermissionsChecker.new(
             @resource,
             'browseEnabled',
             @rendering_id,
-            user_id: forest_user['id'],
+            user: forest_user,
             collection_list_parameters: get_collection_list_permission_info(forest_user, request)
           )
           return head :forbidden unless checker.is_authorized?
@@ -60,7 +60,7 @@ module ForestLiana
           @resource,
           'browseEnabled',
           @rendering_id,
-          user_id: forest_user['id'],
+          user: forest_user,
           collection_list_parameters: get_collection_list_permission_info(forest_user, request)
         )
         return head :forbidden unless checker.is_authorized?
@@ -89,7 +89,7 @@ module ForestLiana
 
     def show
       begin
-        checker = ForestLiana::PermissionsChecker.new(@resource, 'readEnabled', @rendering_id, user_id: forest_user['id'])
+        checker = ForestLiana::PermissionsChecker.new(@resource, 'readEnabled', @rendering_id, user: forest_user)
         return head :forbidden unless checker.is_authorized?
 
         getter = ForestLiana::ResourceGetter.new(@resource, params, forest_user)
@@ -107,7 +107,7 @@ module ForestLiana
 
     def create
       begin
-        checker = ForestLiana::PermissionsChecker.new(@resource, 'addEnabled', @rendering_id, user_id: forest_user['id'])
+        checker = ForestLiana::PermissionsChecker.new(@resource, 'addEnabled', @rendering_id, user: forest_user)
         return head :forbidden unless checker.is_authorized?
 
         creator = ForestLiana::ResourceCreator.new(@resource, params)
@@ -131,7 +131,7 @@ module ForestLiana
 
     def update
       begin
-        checker = ForestLiana::PermissionsChecker.new(@resource, 'editEnabled', @rendering_id, user_id: forest_user['id'])
+        checker = ForestLiana::PermissionsChecker.new(@resource, 'editEnabled', @rendering_id, user: forest_user)
         return head :forbidden unless checker.is_authorized?
 
         updater = ForestLiana::ResourceUpdater.new(@resource, params, forest_user)
@@ -154,7 +154,7 @@ module ForestLiana
     end
 
     def destroy
-      checker = ForestLiana::PermissionsChecker.new(@resource, 'deleteEnabled', @rendering_id, user_id: forest_user['id'])
+      checker = ForestLiana::PermissionsChecker.new(@resource, 'deleteEnabled', @rendering_id, user: forest_user)
       return head :forbidden unless checker.is_authorized?
 
       collection_name = ForestLiana.name_for(@resource)
@@ -174,7 +174,7 @@ module ForestLiana
     end
 
     def destroy_bulk
-      checker = ForestLiana::PermissionsChecker.new(@resource, 'deleteEnabled', @rendering_id, user_id: forest_user['id'])
+      checker = ForestLiana::PermissionsChecker.new(@resource, 'deleteEnabled', @rendering_id, user: forest_user)
       return head :forbidden unless checker.is_authorized?
 
       ids = ForestLiana::ResourcesGetter.get_ids_from_request(params, forest_user)

data/app/controllers/forest_liana/smart_actions_controller.rb

@@ -63,7 +63,7 @@ module ForestLiana
             find_resource(smart_action_request[:collection_name]),
             'actions',
             @rendering_id,
-            user_id: forest_user['id'],
+            user: forest_user,
             smart_action_request_info: get_smart_action_request_info
           )
           return head :forbidden unless checker.is_authorized?

data/app/controllers/forest_liana/stats_controller.rb

@@ -105,7 +105,7 @@ module ForestLiana
           nil,
           permission_name,
           @rendering_id,
-          user_id: forest_user['id'],
+          user: forest_user,
           query_request_info: query_request
         )
 

data/app/services/forest_liana/permissions_checker.rb

@@ -6,12 +6,14 @@ module ForestLiana
 
     @@expiration_in_seconds = (ENV['FOREST_PERMISSIONS_EXPIRATION_IN_SECONDS'] || 3600).to_i
 
-    def initialize(resource, permission_name, rendering_id, user_id: nil, smart_action_request_info: nil, collection_list_parameters: Hash.new, query_request_info: nil)
+    ALLOWED_PERMISSION_LEVELS = %w[admin editor developer]
+
+    def initialize(resource, permission_name, rendering_id, user: nil, smart_action_request_info: nil, collection_list_parameters: Hash.new, query_request_info: nil)
       @collection_name = resource.present? ? ForestLiana.name_for(resource) : nil
       @permission_name = permission_name
       @rendering_id = rendering_id
 
-      @user_id = user_id
+      @user = user
       @smart_action_request_info = smart_action_request_info
       @collection_list_parameters = collection_list_parameters
       @query_request_info = query_request_info
@@ -56,9 +58,9 @@ module ForestLiana
 
       # NOTICE: check liveQueries permissions
       if @permission_name === 'liveQueries'
-        return live_query_allowed?
+        return ALLOWED_PERMISSION_LEVELS.include?(@user['permission_level']) || live_query_allowed?
       elsif @permission_name === 'statWithParameters'
-        return stat_with_parameters_allowed?
+        return ALLOWED_PERMISSION_LEVELS.include?(@user['permission_level']) || stat_with_parameters_allowed?
       end
 
       if permissions && permissions[@collection_name] &&
@@ -146,7 +148,7 @@ module ForestLiana
     def is_user_allowed(permission_value)
       return false if permission_value.nil?
       return permission_value if permission_value.in? [true, false]
-      permission_value.include?(@user_id.to_i)
+      permission_value.include?(@user['id'].to_i)
     end
 
     def smart_action_allowed?(smart_actions_permissions)

data/app/services/forest_liana/token.rb

@@ -22,7 +22,8 @@ module ForestLiana
         role: user['role'],
         tags: user['tags'],
         rendering_id: rendering_id,
-        exp: expiration_in_seconds()
+        exp: expiration_in_seconds(),
+        permission_level: user['permission_level'],
       }, ForestLiana.auth_secret, 'HS256')
     end
   end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "7.6.13"
+  VERSION = "7.6.14"
 end

data/spec/requests/actions_controller_spec.rb

@@ -25,7 +25,8 @@ describe 'Requesting Actions routes', :type => :request  do
       last_name: 'Kelso',
       team: 'Operations',
       rendering_id: rendering_id,
-      exp: Time.now.to_i + 2.weeks.to_i
+      exp: Time.now.to_i + 2.weeks.to_i,
+      permission_level: 'admin'
     }, ForestLiana.auth_secret, 'HS256')
   }
 

data/spec/requests/count_spec.rb

@@ -29,7 +29,8 @@ describe 'Requesting Owner', :type => :request  do
                        last_name: 'Kelso',
                        team: 'Operations',
                        rendering_id: 16,
-                       exp: Time.now.to_i + 2.weeks.to_i
+                       exp: Time.now.to_i + 2.weeks.to_i,
+                       permission_level: 'admin'
                      }, ForestLiana.auth_secret, 'HS256')
 
   headers = {

data/spec/requests/resources_spec.rb

@@ -28,7 +28,8 @@ describe 'Requesting Tree resources', :type => :request  do
     last_name: 'Kelso',
     team: 'Operations',
     rendering_id: 16,
-    exp: Time.now.to_i + 2.weeks.to_i
+    exp: Time.now.to_i + 2.weeks.to_i,
+    permission_level: 'admin'
   }, ForestLiana.auth_secret, 'HS256')
 
   headers = {

data/spec/requests/stats_spec.rb

@@ -10,7 +10,8 @@ describe "Stats", type: :request do
     last_name: 'Kelso',
     team: 'Operations',
     rendering_id: 16,
-    exp: Time.now.to_i + 2.weeks.to_i
+    exp: Time.now.to_i + 2.weeks.to_i,
+    permission_level: 'admin'
   }, ForestLiana.auth_secret, 'HS256')
 
   headers = {
@@ -37,7 +38,7 @@ describe "Stats", type: :request do
     allow(ForestLiana::IpWhitelist).to receive(:retrieve) { true }
     allow(ForestLiana::IpWhitelist).to receive(:is_ip_whitelist_retrieved) { true }
     allow(ForestLiana::IpWhitelist).to receive(:is_ip_valid) { true }
-    
+
     allow_any_instance_of(ForestLiana::PermissionsChecker).to receive(:is_authorized?) { true }
 
     allow_any_instance_of(ForestLiana::ValueStatGetter).to receive(:perform) { true }
@@ -81,7 +82,7 @@ describe "Stats", type: :request do
       expect(response.status).to eq(403)
     end
   end
-  
+
   describe 'POST /stats' do
     params = { query: 'SELECT COUNT(*) AS value FROM products;' }
 
@@ -107,7 +108,7 @@ describe "Stats", type: :request do
 
     it 'should respond 422 with unprocessable query' do
       allow_any_instance_of(ForestLiana::QueryStatGetter).to receive(:perform) { raise ForestLiana::Errors::LiveQueryError.new }
-      
+
       post '/forest/stats', params: JSON.dump(params), headers: headers
       expect(response.status).to eq(422)
     end

data/spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb

@@ -4,7 +4,7 @@ module ForestLiana
       described_class.empty_cache
     end
 
-    let(:user_id) { 1 }
+    let(:user) { { 'id' => '1' } }
     let(:schema) {
       [
         ForestLiana::Model::Collection.new({
@@ -127,8 +127,8 @@ module ForestLiana
           end
 
           it 'should call the API twice' do
-            described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id).is_authorized?
-            described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id).is_authorized?
+            described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user).is_authorized?
+            described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user).is_authorized?
 
             expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).twice
           end
@@ -136,8 +136,8 @@ module ForestLiana
 
         context 'before expiration time' do
           it 'should call the API only once' do
-            described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id).is_authorized?
-            described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id).is_authorized?
+            described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user).is_authorized?
+            described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user).is_authorized?
 
             expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).once
           end
@@ -175,8 +175,8 @@ module ForestLiana
           api_permissions_rendering_2['data']['custom']['collection']['export'] = false
           api_permissions_rendering_2
         }
-        let(:authorized_to_export_rendering_1) { described_class.new(fake_ressource, 'exportEnabled', 1, user_id: user_id).is_authorized? }
-        let(:authorized_to_export_rendering_2) { described_class.new(fake_ressource, 'exportEnabled', 2, user_id: user_id).is_authorized? }
+        let(:authorized_to_export_rendering_1) { described_class.new(fake_ressource, 'exportEnabled', 1, user: user).is_authorized? }
+        let(:authorized_to_export_rendering_2) { described_class.new(fake_ressource, 'exportEnabled', 2, user: user).is_authorized? }
 
         before do
           allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering)
@@ -241,7 +241,7 @@ module ForestLiana
         context 'when checking browseEnabled' do
           context 'when expiration value is set to its default' do
             it 'should not call the API to refresh the renderings cache' do
-              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
+              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
               expect(ForestLiana::PermissionsGetter).not_to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true)
@@ -256,7 +256,7 @@ module ForestLiana
             end
 
             it 'should call the API to refresh the renderings cache' do
-              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
+              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true).once
@@ -275,7 +275,7 @@ module ForestLiana
           end
 
           it 'should NOT call the API to refresh the renderings cache' do
-            described_class.new(fake_ressource, 'exportEnabled', rendering_id, user_id: user_id).is_authorized?
+            described_class.new(fake_ressource, 'exportEnabled', rendering_id, user: user).is_authorized?
 
             expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
             expect(ForestLiana::PermissionsGetter).not_to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true)
@@ -287,8 +287,8 @@ module ForestLiana
         context 'on the same rendering' do
           context 'when renderings permission has NOT expired' do
             it 'should NOT call the API to refresh the renderings permissions' do
-              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
-              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
+              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
+              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
               expect(ForestLiana::PermissionsGetter).not_to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true)
@@ -303,8 +303,8 @@ module ForestLiana
             end
 
             it 'should call the API to refresh the renderings permissions' do
-              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
-              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
+              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
+              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).twice
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true).twice
@@ -335,8 +335,8 @@ module ForestLiana
           end
 
           it 'should not call the API to refresh the rederings permissions' do
-            described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
-            described_class.new(fake_ressource, 'browseEnabled', other_rendering_id, user_id: user_id).is_authorized?
+            described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
+            described_class.new(fake_ressource, 'browseEnabled', other_rendering_id, user: user).is_authorized?
 
             expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
             expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(other_rendering_id).once
@@ -361,7 +361,7 @@ module ForestLiana
 
       context 'when permissions does NOT have rolesACLActivated' do
         describe 'exportEnabled permission' do
-          subject { described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id) }
+          subject { described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user) }
 
           context 'when user has the required permission' do
             it 'should be authorized' do
@@ -380,7 +380,7 @@ module ForestLiana
 
         describe 'browseEnabled permission' do
           let(:collection_name) { 'custom' }
-          subject { described_class.new(fake_ressource, 'browseEnabled', default_rendering_id, user_id: user_id) }
+          subject { described_class.new(fake_ressource, 'browseEnabled', default_rendering_id, user: user) }
           let(:segments_permissions) { nil }
           let(:default_api_permissions) {
             {
@@ -463,14 +463,14 @@ module ForestLiana
                 "searchToEdit" => false
               }
             }
-            let(:collection_list_parameters) { { :user_id => "1", :filters => nil } }
+            let(:collection_list_parameters) { { :user => ["id" => "1"], :filters => nil } }
 
             subject {
               described_class.new(
                 fake_ressource,
                 'browseEnabled',
                 default_rendering_id,
-                user_id: user_id,
+                user: user,
                 collection_list_parameters: collection_list_parameters
               )
             }
@@ -483,7 +483,7 @@ module ForestLiana
 
             context 'when user has no segments and param segmentQuery is there' do
               let(:segmentQuery) { 'SELECT * FROM products;' }
-              let(:collection_list_parameters) { { :user_id => "1", :segmentQuery => segmentQuery } }
+              let(:collection_list_parameters) { { :user => ["id" => "1"], :segmentQuery => segmentQuery } }
               it 'should be authorized' do
                 expect(subject.is_authorized?).to be false
               end
@@ -491,7 +491,7 @@ module ForestLiana
 
             context 'when segments are defined' do
               let(:segments_permissions) { ['SELECT * FROM products;', 'SELECT * FROM sellers;'] }
-              let(:collection_list_parameters) { { :user_id => "1", :segmentQuery => segmentQuery } }
+              let(:collection_list_parameters) { { :user => ["id" => "1"], :segmentQuery => segmentQuery } }
 
               context 'when segments are passing validation' do
                   let(:segmentQuery) { 'SELECT * FROM products;' }
@@ -550,7 +550,7 @@ module ForestLiana
         end
 
         describe 'readEnabled permission' do
-          subject { described_class.new(fake_ressource, 'readEnabled', default_rendering_id, user_id: user_id) }
+          subject { described_class.new(fake_ressource, 'readEnabled', default_rendering_id, user: user) }
 
           context 'when user has the required permission' do
             it 'should be authorized' do
@@ -568,7 +568,7 @@ module ForestLiana
         end
 
         describe 'addEnabled permission' do
-          subject { described_class.new(fake_ressource, 'addEnabled', default_rendering_id, user_id: user_id) }
+          subject { described_class.new(fake_ressource, 'addEnabled', default_rendering_id, user: user) }
 
           context 'when user has the required permission' do
             it 'should be authorized' do
@@ -586,7 +586,7 @@ module ForestLiana
         end
 
         describe 'editEnabled permission' do
-          subject { described_class.new(fake_ressource, 'editEnabled', default_rendering_id, user_id: user_id) }
+          subject { described_class.new(fake_ressource, 'editEnabled', default_rendering_id, user: user) }
 
           context 'when user has the required permission' do
             it 'should be authorized' do
@@ -604,7 +604,7 @@ module ForestLiana
         end
 
         describe 'deleteEnabled permission' do
-          subject { described_class.new(fake_ressource, 'deleteEnabled', default_rendering_id, user_id: user_id) }
+          subject { described_class.new(fake_ressource, 'deleteEnabled', default_rendering_id, user: user) }
 
           context 'when user has the required permission' do
             it 'should be authorized' do
@@ -628,7 +628,7 @@ module ForestLiana
               fake_ressource,
               'actions',
               default_rendering_id,
-              user_id: user_id,
+              user: user,
               smart_action_request_info: smart_action_request_info
             )
           }
@@ -674,7 +674,7 @@ module ForestLiana
 
           context 'when the action permissions contains a list of user ids' do
             context 'when user id is NOT part of the authorized users' do
-              let(:user_id) { 2 }
+              let(:user) { { 'id' => '2' } }
               let(:smart_action_request_info) { { endpoint: 'forest/actions/TestRestricted', http_method: 'POST' } }
 
               it 'user should NOT be authorized' do

data/spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb

@@ -4,7 +4,7 @@ module ForestLiana
       described_class.empty_cache
     end
 
-    let(:user_id) { 1 }
+    let(:user) { { 'id' => '1' } }
     let(:schema) {
       [
         ForestLiana::Model::Collection.new({
@@ -152,8 +152,8 @@ module ForestLiana
             end
 
             it 'should call the API twice' do
-              described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id).is_authorized?
-              described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id).is_authorized?
+              described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user).is_authorized?
+              described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).twice
             end
@@ -161,8 +161,8 @@ module ForestLiana
 
           context 'before expiration time' do
             it 'should call the API only once' do
-              described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id).is_authorized?
-              described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id).is_authorized?
+              described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user).is_authorized?
+              described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).once
             end
@@ -209,8 +209,8 @@ module ForestLiana
           }
 
           context 'when the first call is authorized' do
-            let(:authorized_to_export_rendering_1) { described_class.new(fake_ressource, 'exportEnabled', 1, user_id: user_id).is_authorized? }
-            let(:authorized_to_export_rendering_2) { described_class.new(fake_ressource, 'exportEnabled', 2, user_id: user_id).is_authorized? }
+            let(:authorized_to_export_rendering_1) { described_class.new(fake_ressource, 'exportEnabled', 1, user: user).is_authorized? }
+            let(:authorized_to_export_rendering_2) { described_class.new(fake_ressource, 'exportEnabled', 2, user: user).is_authorized? }
 
             # Even if the value are different, the permissions are cross rendering thus another call
             # to the api wont be made until the permission expires
@@ -228,8 +228,8 @@ module ForestLiana
 
           # If not authorized the cached version is not used
           context 'when the first call is not authorized' do
-            let(:authorized_to_export_rendering_1) { described_class.new(fake_ressource, 'browseEnabled', 1, user_id: user_id).is_authorized? }
-            let(:authorized_to_export_rendering_2) { described_class.new(fake_ressource, 'browseEnabled', 2, user_id: user_id).is_authorized? }
+            let(:authorized_to_export_rendering_1) { described_class.new(fake_ressource, 'browseEnabled', 1, user: user).is_authorized? }
+            let(:authorized_to_export_rendering_2) { described_class.new(fake_ressource, 'browseEnabled', 2, user: user).is_authorized? }
 
             it 'should return different value' do
               expect(authorized_to_export_rendering_1).to eq false
@@ -293,7 +293,7 @@ module ForestLiana
           context 'when checking browseEnabled' do
             context 'when expiration value is set to its default' do
               it 'should not call the API to refresh the renderings cache' do
-                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
+                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
 
                 expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
                 expect(ForestLiana::PermissionsGetter).not_to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true)
@@ -308,7 +308,7 @@ module ForestLiana
               end
 
               it 'should call the API to refresh the renderings cache' do
-                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
+                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
 
                 expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
                 expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true).once
@@ -327,7 +327,7 @@ module ForestLiana
             end
 
             it 'should NOT call the API to refresh the rendering cache' do
-              described_class.new(fake_ressource, 'exportEnabled', rendering_id, user_id: user_id).is_authorized?
+              described_class.new(fake_ressource, 'exportEnabled', rendering_id, user: user).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
               expect(ForestLiana::PermissionsGetter).not_to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true)
@@ -339,8 +339,8 @@ module ForestLiana
           context 'on the same rendering' do
             context 'when rendering permission has NOT expired' do
               it 'should NOT call the API to refresh the rendering permissions' do
-                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
-                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
+                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
+                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
 
                 expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
                 expect(ForestLiana::PermissionsGetter).not_to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true)
@@ -355,8 +355,8 @@ module ForestLiana
               end
 
               it 'should call the API to refresh the rendering permissions' do
-                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
-                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
+                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
+                described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
 
                 expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).twice
                 expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true).twice
@@ -388,8 +388,8 @@ module ForestLiana
             end
 
             it 'should call the API to refresh the rendering permissions' do
-              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
-              described_class.new(fake_ressource, 'browseEnabled', other_rendering_id, user_id: user_id).is_authorized?
+              described_class.new(fake_ressource, 'browseEnabled', rendering_id, user: user).is_authorized?
+              described_class.new(fake_ressource, 'browseEnabled', other_rendering_id, user: user).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(other_rendering_id, rendering_specific_only: true).once
@@ -415,7 +415,7 @@ module ForestLiana
           let(:collection_name) { 'all_rights_collection_boolean' }
 
           describe 'exportEnabled permission' do
-            subject { described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -433,13 +433,13 @@ module ForestLiana
           end
 
           describe 'browseEnbled permission' do
-            let(:collection_list_parameters) { { :user_id => "1", :filters => nil } }
+            let(:collection_list_parameters) { { :user => ["id" => "1"], :filters => nil } }
             subject {
               described_class.new(
                 fake_ressource,
                 'browseEnabled',
                 default_rendering_id,
-                user_id: user_id,
+                user: user,
                 collection_list_parameters: collection_list_parameters
               )
             }
@@ -460,7 +460,7 @@ module ForestLiana
 
             context 'when user has no segments queries permissions and param segmentQuery is there' do
               let(:segmentQuery) { 'SELECT * FROM products;' }
-              let(:collection_list_parameters) { { :user_id => "1", :segmentQuery => segmentQuery } }
+              let(:collection_list_parameters) { { :user => ["id" => "1"], :segmentQuery => segmentQuery } }
               it 'should be authorized' do
                 expect(subject.is_authorized?).to be false
               end
@@ -477,7 +477,7 @@ module ForestLiana
                   }
                 }
               }
-              let(:collection_list_parameters) { { :user_id => "1", :segmentQuery => segmentQuery } }
+              let(:collection_list_parameters) { { :user => ["id" => "1"], :segmentQuery => segmentQuery } }
 
               context 'when segments are passing validation' do
                 let(:segmentQuery) { 'SELECT * FROM products;' }
@@ -526,7 +526,7 @@ module ForestLiana
           end
 
           describe 'readEnabled permission' do
-            subject { described_class.new(fake_ressource, 'readEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'readEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -544,7 +544,7 @@ module ForestLiana
           end
 
           describe 'addEnabled permission' do
-            subject { described_class.new(fake_ressource, 'addEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'addEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -562,7 +562,7 @@ module ForestLiana
           end
 
           describe 'editEnabled permission' do
-            subject { described_class.new(fake_ressource, 'editEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'editEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -580,7 +580,7 @@ module ForestLiana
           end
 
           describe 'deleteEnabled permission' do
-            subject { described_class.new(fake_ressource, 'deleteEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'deleteEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -604,7 +604,7 @@ module ForestLiana
                 fake_ressource,
                 'actions',
                 default_rendering_id,
-                user_id: user_id,
+                user: user,
                 smart_action_request_info: smart_action_request_info
               )
             }
@@ -653,7 +653,7 @@ module ForestLiana
           let(:collection_name) { 'all_rights_collection_user_list' }
 
           describe 'exportEnabled permission' do
-            subject { described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'exportEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -671,13 +671,13 @@ module ForestLiana
           end
 
           describe 'browseEnabled permission' do
-            let(:collection_list_parameters) { { :user_id => "1", :filters => nil } }
+            let(:collection_list_parameters) { { :user => ["id" => "1"], :filters => nil } }
             subject {
               described_class.new(
                 fake_ressource,
                 'browseEnabled',
                 default_rendering_id,
-                user_id: user_id,
+                user: user,
                 collection_list_parameters: collection_list_parameters
               )
             }
@@ -698,7 +698,7 @@ module ForestLiana
           end
 
           describe 'readEnabled permission' do
-            subject { described_class.new(fake_ressource, 'readEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'readEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -716,7 +716,7 @@ module ForestLiana
           end
 
           describe 'addEnabled permission' do
-            subject { described_class.new(fake_ressource, 'addEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'addEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -734,7 +734,7 @@ module ForestLiana
           end
 
           describe 'editEnabled permission' do
-            subject { described_class.new(fake_ressource, 'editEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'editEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -752,7 +752,7 @@ module ForestLiana
           end
 
           describe 'deleteEnabled permission' do
-            subject { described_class.new(fake_ressource, 'deleteEnabled', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'deleteEnabled', default_rendering_id, user: user) }
 
             context 'when user has the required permission' do
               it 'should be authorized' do
@@ -776,7 +776,7 @@ module ForestLiana
                 fake_ressource,
                 'actions',
                 default_rendering_id,
-                user_id: user_id,
+                user: user,
                 smart_action_request_info: smart_action_request_info
               )
             }
@@ -822,7 +822,7 @@ module ForestLiana
 
           # searchToEdit permission checker should not be called anymore once rolesAcl activated
           describe 'searchToEdit permission' do
-            subject { described_class.new(fake_ressource, 'searchToEdit', default_rendering_id, user_id: user_id) }
+            subject { described_class.new(fake_ressource, 'searchToEdit', default_rendering_id, user: user) }
 
             context 'when user has all permissions' do
               it 'should NOT be authorized' do

data/spec/services/forest_liana/permissions_checker_live_queries_spec.rb

@@ -4,7 +4,6 @@ module ForestLiana
       described_class.empty_cache
     end
 
-    let(:user_id) { 1 }
     let(:schema) {
       [
         ForestLiana::Model::Collection.new({
@@ -50,7 +49,7 @@ module ForestLiana
         "stats" => {
           "queries" => [
           'SELECT COUNT(*) AS value FROM products;',
-          'SELECT COUNT(*) AS value FROM sometings;'
+          'SELECT COUNT(*) AS value FROM somethings;'
           ],
           "values" => [
             {
@@ -79,35 +78,79 @@ module ForestLiana
       end
 
       context 'when permissions liveQueries' do
+        let(:user) { { 'id' => '1', 'permission_level' => 'basic' } }
         context 'contains the query' do
+          subject { described_class.new(fake_ressource, 'liveQueries', default_rendering_id, user: user, query_request_info: 'SELECT COUNT(*) AS value FROM somethings;') }
+
+          it 'should be authorized' do
+            expect(subject.is_authorized?).to be true
+          end
+        end
+
+        context 'does not contains the query' do
+          subject { described_class.new(fake_ressource, 'liveQueries', default_rendering_id, user: user, query_request_info: 'SELECT * FROM products WHERE category = Gifts OR 1=1-- AND released = 1') }
+          it 'should NOT be authorized' do
+            expect(subject.is_authorized?).to be false
+          end
+        end
+      end
+
+      context 'exectute liveQueries when user' do
+        context 'has correct permission_level' do
+          let(:user) { { 'id' => '1', 'permission_level' => 'admin' } }
+          subject { described_class.new(fake_ressource, 'liveQueries', default_rendering_id, user: user, query_request_info: 'SELECT COUNT(*) AS value FROM somethings;') }
+
+          it 'should be authorized' do
+            expect(subject.is_authorized?).to be true
+          end
+        end
+
+        context 'does not have the correct permission_level' do
+          let(:user) { { 'id' => '1', 'permission_level' => 'basic' } }
+          subject { described_class.new(fake_ressource, 'liveQueries', default_rendering_id, user: user, query_request_info: 'SELECT * FROM products WHERE category = Gifts OR 1=1-- AND released = 1') }
+          it 'should NOT be authorized' do
+            expect(subject.is_authorized?).to be false
+          end
+        end
+      end
+
+      context 'when permissions statWithParameters' do
+        let(:user) { { 'id' => '1', 'permission_level' => 'basic' } }
+        context 'contains the stat with the same parameters' do
           request_info = {
             "type" => "Value",
             "collection" => "Product",
             "aggregate" => "Count"
           };
-          subject { described_class.new(fake_ressource, 'liveQueries', default_rendering_id, user_id: user_id, query_request_info: 'SELECT COUNT(*) AS value FROM sometings;') }
+          subject { described_class.new(fake_ressource, 'statWithParameters', default_rendering_id, user: user, query_request_info: request_info) }
 
           it 'should be authorized' do
             expect(subject.is_authorized?).to be true
           end
         end
 
-        context 'does not contains the query' do
-          subject { described_class.new(fake_ressource, 'liveQueries', default_rendering_id, user_id: user_id, query_request_info: 'SELECT * FROM products WHERE category = Gifts OR 1=1-- AND released = 1') }
+        context 'does not contains the stat with the same parameters' do
+          other_request_info = {
+            "type" => "Leaderboard",
+            "collection" => "Product",
+            "aggregate" => "Sum"
+          };
+          subject { described_class.new(fake_ressource, 'statWithParameters', default_rendering_id, user: user, query_request_info: other_request_info) }
           it 'should NOT be authorized' do
             expect(subject.is_authorized?).to be false
           end
         end
       end
 
-      context 'when permissions statWithParameters' do
-        context 'contains the stat with the same parameters' do
+      context 'execute statWithParameters when user' do
+        context 'has correct permission_level' do
+          let(:user) { { 'id' => '1', 'permission_level' => 'admin' } }
           request_info = {
             "type" => "Value",
             "collection" => "Product",
             "aggregate" => "Count"
           };
-          subject { described_class.new(fake_ressource, 'statWithParameters', default_rendering_id, user_id: user_id, query_request_info: request_info) }
+          subject { described_class.new(fake_ressource, 'statWithParameters', default_rendering_id, user: user, query_request_info: request_info) }
 
           it 'should be authorized' do
             expect(subject.is_authorized?).to be true
@@ -115,12 +158,13 @@ module ForestLiana
         end
 
         context 'does not contains the stat with the same parameters' do
+          let(:user) { { 'id' => '1', 'permission_level' => 'basic' } }
           other_request_info = {
             "type" => "Leaderboard",
             "collection" => "Product",
             "aggregate" => "Sum"
           };
-          subject { described_class.new(fake_ressource, 'statWithParameters', default_rendering_id, user_id: user_id, query_request_info: other_request_info) }
+          subject { described_class.new(fake_ressource, 'statWithParameters', default_rendering_id, user: user, query_request_info: other_request_info) }
           it 'should NOT be authorized' do
             expect(subject.is_authorized?).to be false
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 7.6.13
+  version: 7.6.14
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails