forest_liana 9.3.6 → 9.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a9c98cf78c51b1f25e5995e3cfeae5bdfaffe1d28a17593215e3a8f135b5409
-  data.tar.gz: b9122b1381ce7201393108f24cd2e6d62918f040b943e1c6e8827f8ab0c35c70
+  metadata.gz: 103afe5988f7c2264d766f270e9fe94acabafd3dff2771616406d24235e178db
+  data.tar.gz: 351d284979c39cd903b40f74149bc71a8d4cfde44ec7a9e99f6e12a69a743229
 SHA512:
-  metadata.gz: e9a78f9f0bb83fd0ae4beb63eb6a3924552059d9bbe24009cd7bf19e790c9e7fe5d398b8e5d0bddaca3aeee9402f4b9d60d788ab7d71ce81d432653a55087cc9
-  data.tar.gz: 891227c7699986d4b10c57bddcbe0af3b7867aec6e5f06868958b6f0765d67402d568687443e519ad6aa674e4bc5fd4a35420b06263635cec3884a703f87fe71
+  metadata.gz: '099ff2ca0f05fd7ce0a27aa6935ed16ee856559096b0f750b30d30bf3a3c7ea94b6572fec0823381fb17fed5adc719915de86349876b9f861c1184c56ed367cb'
+  data.tar.gz: '08c6baba0689e84bb23c7535f9748c25fdabb31ec0ada34a5f61f8c05df3e39cd58038c84cc9279d84fbbcd3b2e85681b0404c555e39bd1fdc971309ff5674dd'

data/app/services/forest_liana/ability/permission.rb

@@ -16,7 +16,8 @@ module ForestLiana
         collection_name = ForestLiana.name_for(collection)
 
         begin
-          is_allowed = collections_data[collection_name][action].include? user_data['roleId']
+          is_allowed = (collections_data.key?(collection_name) && collections_data[collection_name][action].include?(user_data['roleId']))
+
           # re-fetch if user permission is not allowed (may have been changed)
           unless is_allowed
             collections_data = get_collections_permissions_data(true)
@@ -25,7 +26,7 @@ module ForestLiana
 
           is_allowed
         rescue
-          raise ForestLiana::Errors::ExpectedError.new(409, :conflict, "The collection #{collection} doesn't exist", 'collection not found')
+          raise ForestLiana::Errors::ExpectedError.new(409, :conflict, "The collection #{collection_name} doesn't exist", 'collection not found')
         end
       end
 

data/app/services/forest_liana/query_stat_getter.rb

@@ -13,14 +13,14 @@ module ForestLiana
     end
 
     def perform
-      raw_query = @params['query'].strip
+      context_variables = Utils::ContextVariables.new(nil, nil, @params['contextVariables'])
+      raw_query = Utils::ContextVariablesInjector.inject_context_in_value(@params['query'].strip, context_variables)
 
       LiveQueryChecker.new(raw_query, 'Live Query Chart').validate()
 
       if @params['record_id']
         raw_query.gsub!('?', @params['record_id'].to_s)
       end
-
       result = ActiveRecord::Base.connection.execute(raw_query)
 
       case @params['type']

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.3.6"
+  VERSION = "9.3.8"
 end

data/spec/services/forest_liana/ability/permission_spec.rb

@@ -79,6 +79,7 @@ module ForestLiana
           end
         end
 
+
         it 'should throw an exception when the collection doesn\'t exist' do
             expect {dummy_class.is_crud_authorized?('browse', user, String)}.to raise_error(ForestLiana::Errors::ExpectedError, 'The collection String doesn\'t exist')
         end
@@ -163,6 +164,53 @@ module ForestLiana
           expect(dummy_class.is_crud_authorized?('browse', user, Island)).to equal true
         end
 
+        it 'should re-fetch the permission once when collection_name doesn\'t exist' do
+          Rails.cache.write(
+            'forest.collections',
+            {
+              "collections" => {
+                "Fake_collection_name" => {
+                  "collection" => {
+                    "browseEnabled" => { "roles" => [1] },
+                    "readEnabled" => { "roles" => [1] },
+                    "editEnabled" => { "roles" => [1] },
+                    "addEnabled" => { "roles" => [1] },
+                    "deleteEnabled" => { "roles" => [1] },
+                    "exportEnabled" => { "roles" => [1] }
+                  },
+                  "actions" => {
+
+                  }
+                }
+              }
+            }
+          )
+
+          allow_any_instance_of(ForestLiana::Ability::Fetch)
+            .to receive(:get_permissions)
+              .and_return(
+                {
+                  "collections" => {
+                    "Island" => {
+                      "collection" => {
+                        "browseEnabled" => { "roles" => [1] },
+                        "readEnabled" => { "roles" => [1] },
+                        "editEnabled" => { "roles" => [1] },
+                        "addEnabled" => { "roles" => [1] },
+                        "deleteEnabled" => { "roles" => [1] },
+                        "exportEnabled" => { "roles" => [1] }
+                      },
+                      "actions" => {
+
+                      }
+                    }
+                  }
+                }
+              )
+
+          expect(dummy_class.is_crud_authorized?('browse', user, Island)).to equal true
+        end
+
         it 'should return false when user permission is not allowed' do
           Rails.cache.delete('forest.users')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.3.6
+  version: 9.3.8
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails