forest_liana 9.3.11 → 9.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51c2f75d737577dc6cb9e113c3cfb07ea605fa43fb737f66bf192f042f15344a
-  data.tar.gz: 59b9ccf9c1bd5ec8012e0124cd3ee9dc2309214e3d83e3af2ed3c03593a4ffb5
+  metadata.gz: 71e166bf8607e91299070c9f6158460e2e997488bbc7162bc09e0c7882f0e5fa
+  data.tar.gz: 6bf47b9c89e0ac3bf20e13b03a72f36a958e8689831f4be4ebe41af505ae960f
 SHA512:
-  metadata.gz: ff6b7f73042d7e32670e1e8dbab2f79101be9761035fa54748c7f227ce471620fd5c740587a746b7969d499754040cfc05013d4c77ef081e45bd7a20efde39e0
-  data.tar.gz: 0fec0c2f5f09d7baa46703873586593428224358e417146414b956cb0bb1c5996aabc77704ee92f228d7c54edfaafcb72841d2a3ae2cddf815b8566585fd4751
+  metadata.gz: bccaf2fb14aa6dcba206670cc13ec7356bcd342ccc4a1b89ab05f726f46e484ecf7a44fc3c0f58bf0fc8d784f3bf168b1a1d0fa9ce94224b422329668ab7967c
+  data.tar.gz: f79f05328165367a3f401896a221e1e45b5f2175417cd51e1704cca69c288c1429ad23cc257621d9f099350e328e3f0d4ebd5801782e491ab7ac43e42df6596a

data/app/controllers/forest_liana/application_controller.rb

@@ -6,7 +6,8 @@ module ForestLiana
     rescue_from ForestLiana::Ability::Exceptions::AccessDenied, with: :render_error
     rescue_from ForestLiana::Errors::HTTP403Error, with: :render_error
     rescue_from ForestLiana::Errors::HTTP422Error, with: :render_error
-    rescue_from ForestLiana::Errors::ExpectedError, with: :render_error
+    rescue_from ForestLiana::Ability::Exceptions::ActionConditionError, with: :render_error
+    rescue_from ForestLiana::Ability::Exceptions::UnknownCollection, with: :render_error
 
     def self.papertrail?
       Object.const_get('PaperTrail::Version').is_a?(Class) rescue false

data/app/services/forest_liana/ability/exceptions/unknown_collection.rb

@@ -0,0 +1,16 @@
+module ForestLiana
+  module Ability
+    module Exceptions
+      class UnknownCollection < ForestLiana::Errors::ExpectedError
+        def initialize(collection_name)
+          super(
+            409,
+            :conflict,
+            "The collection #{collection_name} doesn't exist",
+            'collection not found'
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -25,8 +25,10 @@ module ForestLiana
           end
 
           is_allowed
+        rescue ForestLiana::Errors::ExpectedError => exception
+          raise exception
         rescue
-          raise ForestLiana::Errors::ExpectedError.new(409, :conflict, "The collection #{collection_name} doesn't exist", 'collection not found')
+          raise ForestLiana::Ability::Exceptions::UnknownCollection.new(collection_name)
         end
       end
 
@@ -35,13 +37,16 @@ module ForestLiana
 
         user_data = get_user_data(user['id'])
         collections_data = get_collections_permissions_data
+        collection_name = ForestLiana.name_for(collection)
         begin
-          action = find_action_from_endpoint(ForestLiana.name_for(collection), endpoint, http_method).name
+          action = find_action_from_endpoint(collection_name, endpoint, http_method).name
 
-          smart_action_approval = SmartActionChecker.new(parameters, collection, collections_data[ForestLiana.name_for(collection)][:actions][action], user_data)
+          smart_action_approval = SmartActionChecker.new(parameters, collection, collections_data[collection_name][:actions][action], user_data)
           smart_action_approval.can_execute?
+        rescue ForestLiana::Errors::ExpectedError => exception
+          raise exception
         rescue
-          raise ForestLiana::Errors::ExpectedError.new(409, :conflict, "The collection #{collection} doesn't exist", 'collection not found')
+          raise ForestLiana::Ability::Exceptions::UnknownCollection.new(collection_name)
         end
       end
 
@@ -66,7 +71,7 @@ module ForestLiana
 
       private
 
-      def get_user_data(user_id)
+      def get_user_data(user_id, force_fetch = true)
         cache = Rails.cache.fetch('forest.users', expires_in: TTL) do
           users = {}
           get_permissions('/liana/v4/permissions/users').each do |user|
@@ -76,7 +81,12 @@ module ForestLiana
           users
         end
 
-        cache[user_id.to_s]
+        if !cache.key?(user_id.to_s) && force_fetch
+          Rails.cache.delete('forest.users')
+          get_user_data(user_id, false)
+        else
+          cache[user_id.to_s]
+        end
       end
 
       def get_collections_permissions_data(force_fetch = false)

data/app/services/forest_liana/search_query_builder.rb

@@ -104,14 +104,17 @@ module ForestLiana
               end
               association_search = association_search.compact
             end
+
             if @includes.include? association.to_sym
               resource = @resource.reflect_on_association(association.to_sym)
-              resource.klass.columns.each do |column|
-                if !(column.respond_to?(:array) && column.array) && text_type?(column.type)
-                  if @collection.search_fields.nil? || (association_search &&
-                    association_search.include?(column.name))
-                    conditions << association_search_condition(resource.table_name,
-                      column.name)
+              unless (SchemaUtils.polymorphic?(resource))
+                resource.klass.columns.each do |column|
+                  if !(column.respond_to?(:array) && column.array) && text_type?(column.type)
+                    if @collection.search_fields.nil? || (association_search &&
+                      association_search.include?(column.name))
+                      conditions << association_search_condition(resource.table_name,
+                        column.name)
+                    end
                   end
                 end
               end

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "9.3.11"
+  VERSION = "9.3.13"
 end

data/spec/dummy/app/controllers/forest/islands_controller.rb

@@ -2,4 +2,8 @@ class Forest::IslandsController < ForestLiana::SmartActionsController
   def test
     render json: { success: 'You are OK.' }
   end
+
+  def unknown_action
+    render json: { success: 'unknown action' }
+  end
 end

data/spec/dummy/config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
   namespace :forest do
     post '/actions/test' => 'islands#test'
+    post '/actions/unknown_action' => 'islands#unknown_action'
     get '/Owner/count' , to: 'owners#count'
     get '/Owner/:id/relationships/trees/count' , to: 'owner_trees#count'
   end

data/spec/dummy/lib/forest_liana/collections/island.rb

@@ -26,6 +26,8 @@ class Forest::Island
     enums: %w[a b c],
   }
 
+  action 'test'
+
   action 'my_action',
     fields: [foo],
     hooks: {

data/spec/requests/actions_controller_spec.rb

@@ -261,10 +261,6 @@ describe 'Requesting Actions routes', :type => :request  do
   end
 
   describe 'calling the action' do
-    before(:each) do
-      allow_any_instance_of(ForestLiana::Ability).to receive(:forest_authorize!) { true }
-    end
-
     let(:all_records) { false }
     let(:params) {
       {
@@ -283,13 +279,119 @@ describe 'Requesting Actions routes', :type => :request  do
 
     describe 'without scopes' do
       it 'should respond 200 and perform the action' do
+        allow_any_instance_of(ForestLiana::Ability).to receive(:forest_authorize!) { true }
         post '/forest/actions/test', params: JSON.dump(params), headers: headers
         expect(response.status).to eq(200)
         expect(JSON.parse(response.body)).to eq({'success' => 'You are OK.'})
       end
+
+      let(:params) {
+        {
+          data: {
+            attributes: {
+              collection_name: 'Island',
+              ids: ['1'],
+              all_records: all_records,
+              smart_action_id: 'Island-Test'
+            },
+            type: 'custom-action-requests'
+          },
+          timezone: 'Europe/Paris'
+        }
+      }
+
+      describe 'with invalid conditions' do
+        it 'should respond a 409' do
+          Rails.cache.write('forest.has_permission', true)
+          Rails.cache.write('forest.users', {'38' => { 'id' => 38, 'roleId' => 1, 'rendering_id' => '13' }})
+          Rails.cache.write(
+            'forest.collections',
+            {
+              'Island' => {
+                :actions =>
+                  {
+                    'test' => { 'triggerEnabled' => [1],
+                      'triggerConditions' => [],
+                      'approvalRequired' => [1],
+                      'approvalRequiredConditions' =>
+                        [
+                          { 'filter' =>
+                            { 'field' => 'id',
+                              'value' => 2,
+                              'source' => 'data',
+                              'operator' => 'foo-greater-than'
+                            },
+                            'roleId' => 1
+                          }
+                        ],
+                    }
+                  }
+              }
+            }
+          )
+
+          post '/forest/actions/test', params: JSON.dump(params), headers: headers
+
+          expect(response.status).to eq(409)
+          expect(JSON.parse(response.body)).to eq(
+            {
+              "errors" => [
+                {
+                  "status" => 409,
+                  "detail" => "The conditions to trigger this action cannot be verified. Please contact an administrator.",
+                  "name" => "InvalidActionConditionError"
+                }
+              ]
+            }
+          )
+        end
+      end
+
+      describe 'with unknown action' do
+        it 'should respond a 409' do
+          Rails.cache.write('forest.has_permission', true)
+          Rails.cache.write('forest.users', {'38' => { 'id' => 38, 'roleId' => 1, 'rendering_id' => '13' }})
+          Rails.cache.write(
+            'forest.collections',
+            {
+              'Island' => {
+                :actions =>
+                  {
+                    'test' => { 'triggerEnabled' => [1],
+                      'triggerConditions' => [],
+                      'approvalRequired' => [1],
+                      'approvalRequiredConditions' =>
+                        [
+                          { 'filter' =>
+                            { 'field' => 'id',
+                              'value' => 2,
+                              'source' => 'data',
+                              'operator' => 'foo-greater-than'
+                            },
+                            'roleId' => 1
+                          }
+                        ],
+                    }
+                  }
+              }
+            }
+          )
+
+          post '/forest/actions/unknown_action', params: JSON.dump(params), headers: headers
+
+          expect(response.status).to eq(409)
+          expect(JSON.parse(response.body)).to eq(
+            {"errors"=> [{"detail" => "The collection Island doesn't exist", "name" => "collection not found", "status" => 409}]}
+          )
+        end
+      end
     end
 
     describe 'with scopes' do
+      before(:each) do
+        allow_any_instance_of(ForestLiana::Ability).to receive(:forest_authorize!) { true }
+      end
+
       describe 'when record is in scope' do
         let(:scope_filters) {
           {

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

@@ -81,7 +81,11 @@ module ForestLiana
 
 
         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')
+          allow_any_instance_of(ForestLiana::Ability::Fetch)
+            .to receive(:get_permissions)
+              .and_return({ "collections" => {} })
+            expect {dummy_class.is_crud_authorized?('browse', user, String)}
+              .to raise_error(ForestLiana::Ability::Exceptions::UnknownCollection, 'The collection String doesn\'t exist')
         end
 
         it 'should re-fetch the permission once when user permission is not allowed' do
@@ -211,6 +215,30 @@ module ForestLiana
           expect(dummy_class.is_crud_authorized?('browse', user, Island)).to equal true
         end
 
+        it 'should re-fetch the users list once when user doesn\'t exist' do
+          Rails.cache.write('forest.users', {'2' => { 'id' => 2, 'roleId' => 1, 'rendering_id' => '1' }})
+          # Rails.cache.write('forest.users', {'1' => user})
+          Rails.cache.write(
+            'forest.collections',
+            'Island' => {
+              'browse' => [1],
+              'read' => [1],
+              'edit' => [1],
+              'add' => [1],
+              'delete' => [1],
+              'export' => [1],
+            }
+          )
+
+          allow_any_instance_of(ForestLiana::Ability::Fetch)
+            .to receive(:get_permissions)
+              .and_return(
+                [user]
+              )
+
+          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')
 
@@ -372,7 +400,8 @@ module ForestLiana
         end
 
         it 'should throw an exception when the collection doesn\'t exist' do
-          expect {dummy_class.is_smart_action_authorized?(user, String, parameters, '/forest/actions/my_action', 'POST')}.to raise_error(ForestLiana::Errors::ExpectedError, 'The collection String doesn\'t exist')
+          expect {dummy_class.is_smart_action_authorized?(user, String, parameters, '/forest/actions/my_action', 'POST')}
+            .to raise_error(ForestLiana::Ability::Exceptions::UnknownCollection, 'The collection String doesn\'t exist')
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 9.3.11
+  version: 9.3.13
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-14 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -263,6 +263,7 @@ files:
 - app/services/forest_liana/ability/exceptions/action_condition_error.rb
 - app/services/forest_liana/ability/exceptions/require_approval.rb
 - app/services/forest_liana/ability/exceptions/trigger_forbidden.rb
+- app/services/forest_liana/ability/exceptions/unknown_collection.rb
 - app/services/forest_liana/ability/fetch.rb
 - app/services/forest_liana/ability/permission.rb
 - app/services/forest_liana/ability/permission/request_permission.rb