forest_liana 8.0.0.beta.2 → 8.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c3bc9feb8975c2d4bb725c5badda68b4d880fcc3a2553cc2d1d6164f5e56366
-  data.tar.gz: b1f6e70a0723450674b53944f933036fea21b4a9b6cceab806cf32cd7654896a
+  metadata.gz: 83e541b62689b763990ff3d940c44bcfd339ffa1b0447e023664b99dda8f54da
+  data.tar.gz: eea162587eafe0cc4cdd2f3f843418b3d71ac4adcab9c96deddd9b6c389de4a8
 SHA512:
-  metadata.gz: 42a2ae2c6800ea8cf501ee3896554852cd677003d2aea5353fbc2d74d5dee34ee55d02079f8a9a31949af19d7a6ecc8c97e8be3a15a9844aa2ae11ff2fb75e73
-  data.tar.gz: 2a97e185ccde89910027740ea833a8e3373f4cb2466a16c2023554534be4ddc3c2419d40015be0edbecb6283a304d4ef4b80472fcea98b99649a122b28fb9c2e
+  metadata.gz: 299125cff69b0900bee3bf03bc47cf081cd0c8ef2e1490a8e3dd3391c52beac2434f3282d9958d10beeb4929fcc47628e40a4dbc5237203a6371ff51898da809
+  data.tar.gz: 5a260f17aeb453ba495de4f02c21b6fef1b18dd05fd073e2969d2cdca2fc2eb8dc11dfef161b382e38c46285efb8185429522ddeef8ff157e814fca740d4daad

data/app/controllers/forest_liana/smart_actions_controller.rb

@@ -5,20 +5,19 @@ module ForestLiana
     rescue_from ForestLiana::Ability::Exceptions::ActionConditionError, with: :render_error
     include ForestLiana::Ability
     if Rails::VERSION::MAJOR < 4
-      before_filter :smart_action_pre_perform_checks
+      before_filter :get_smart_action_request
+      before_filter :find_resource
+      before_filter :check_permission_for_smart_route
+      before_filter :ensure_record_ids_in_scope
     else
-      before_action :smart_action_pre_perform_checks
+      before_action :get_smart_action_request
+      before_action :find_resource
+      before_action :check_permission_for_smart_route
+      before_action :ensure_record_ids_in_scope
     end
 
     private
 
-    def smart_action_pre_perform_checks
-      get_smart_action_request
-      find_resource
-      check_permission_for_smart_route
-      ensure_record_ids_in_scope
-    end
-
     def get_smart_action_request
       begin
         params[:data][:attributes]
@@ -31,18 +30,11 @@ module ForestLiana
     end
 
     def find_resource
-      begin
         @resource = SchemaUtils.find_model_from_collection_name(@parameters[:data][:attributes][:collection_name])
-        if @resource.nil? || !SchemaUtils.model_included?(@resource) ||
-          !@resource.ancestors.include?(ActiveRecord::Base)
-          render serializer: nil, json: { status: 404 }, status: :not_found
+        if @resource.nil? || !SchemaUtils.model_included?(@resource) || !@resource.ancestors.include?(ActiveRecord::Base)
+          raise ForestLiana::Errors::HTTP422Error.new('The conditional smart actions are not supported with Smart Collection. Please contact an administrator.')
         end
         @resource
-      rescue => error
-        FOREST_REPORTER.report error
-        FOREST_LOGGER.error "Find Collection error: #{error}\n#{format_stacktrace(error)}"
-        render serializer: nil, json: { status: 404 }, status: :not_found
-      end
     end
 
     def check_permission_for_smart_route

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

@@ -37,6 +37,8 @@ module ForestLiana
           elsif @smart_action['approvalRequired'].include?(@user['roleId'])
             if @smart_action['approvalRequiredConditions'].empty? || match_conditions('approvalRequiredConditions')
               raise ForestLiana::Ability::Exceptions::RequireApproval.new(@smart_action['userApprovalEnabled'])
+            else
+              return true if @smart_action['triggerConditions'].empty? || match_conditions('triggerConditions')
             end
           end
 

data/app/services/forest_liana/ability.rb

@@ -7,18 +7,27 @@ module ForestLiana
     def forest_authorize!(action, user, collection, args = {})
       case action
       when 'browse', 'read', 'edit', 'add', 'delete', 'export'
-          raise ForestLiana::Ability::Exceptions::AccessDenied.new unless is_crud_authorized?(action, user, collection)
+        raise ForestLiana::Ability::Exceptions::AccessDenied.new unless is_crud_authorized?(action, user, collection)
       when 'chart'
-          if ALLOWED_PERMISSION_LEVELS.exclude?(user['permission_level'])
-            raise ForestLiana::Errors::HTTP422Error.new('The argument parameters is missing') if args[:parameters].nil?
-            raise ForestLiana::Ability::Exceptions::AccessDenied.new unless is_chart_authorized?(user, args[:parameters])
-          end
+        if ALLOWED_PERMISSION_LEVELS.exclude?(user['permission_level'])
+          raise ForestLiana::Errors::HTTP422Error.new('The argument parameters is missing') if args[:parameters].nil?
+          raise ForestLiana::Ability::Exceptions::AccessDenied.new unless is_chart_authorized?(user, args[:parameters])
+        end
       when 'action'
-          raise ForestLiana::Errors::HTTP422Error.new('You must implement the arguments : parameters, endpoint & http_method') if args[:parameters].nil? || args[:endpoint].nil? || args[:http_method].nil?
-          is_smart_action_authorized?(user, collection, args[:parameters], args[:endpoint], args[:http_method])
+        validate_collection collection
+        raise ForestLiana::Errors::HTTP422Error.new('You must implement the arguments : parameters, endpoint & http_method') if args[:parameters].nil? || args[:endpoint].nil? || args[:http_method].nil?
+        is_smart_action_authorized?(user, collection, args[:parameters], args[:endpoint], args[:http_method])
       else
         raise ForestLiana::Ability::Exceptions::AccessDenied.new
       end
     end
+
+    private
+
+    def validate_collection(collection)
+      if collection.nil? || !SchemaUtils.model_included?(collection)
+        raise ForestLiana::Errors::HTTP422Error.new('The conditional smart actions are not supported with Smart Collection. Please contact an administrator.')
+      end
+    end
   end
 end

data/app/services/forest_liana/schema_utils.rb

@@ -32,7 +32,6 @@ module ForestLiana
 
     def self.find_model_from_collection_name(collection_name, logs = false)
       model_found = nil
-
       ForestLiana.models.each do |model|
         if model.abstract_class?
           model_found = self.find_model_from_abstract_class(model, collection_name)

data/lib/forest_liana/version.rb

@@ -1,3 +1,3 @@
 module ForestLiana
-  VERSION = "8.0.0.beta.2"
+  VERSION = "8.0.0.beta.4"
 end

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

@@ -42,6 +42,14 @@ module ForestLiana
           user['permission_level'] = 'admin'
           expect(dummy_class.forest_authorize!('chart', user, Island.first, {parameters: []})).to equal nil
         end
+
+        it 'should raise error 422 when the collection is nil on action ability' do
+          expect { dummy_class.forest_authorize!('action', :user, nil) }.to raise_error(ForestLiana::Errors::HTTP422Error, "The conditional smart actions are not supported with Smart Collection. Please contact an administrator.")
+        end
+
+        it 'should raise error 422 when the collection is not a ActiveRecord children on action ability' do
+          expect { dummy_class.forest_authorize!('action', :user, class Example; end ) }.to raise_error(ForestLiana::Errors::HTTP422Error, "The conditional smart actions are not supported with Smart Collection. Please contact an administrator.")
+        end
       end
     end
   end

data/spec/services/forest_liana/ability/permission/smart_action_checker_spec.rb

@@ -205,9 +205,67 @@ module ForestLiana
           expect{smart_action_checker.can_execute?}.to raise_error(ForestLiana::Ability::Exceptions::TriggerForbidden)
         end
 
-        it 'should raise error when triggerConditions not match' do
+        it 'should trigger action when approvalRequiredCondition not match but with triggerConditions matched' do
+          parameters = ActionController::Parameters.new(params).permit!
+          action['approvalRequired'] = [1]
+          action['triggerEnabled'] = [1]
+          action['triggerConditions'] = [
+            { 'filter' =>
+                { 'aggregator' => 'and',
+                  'conditions' =>
+                    [
+                      {
+                        'field' => 'name',
+                        'value' => 'foo',
+                        'source' => 'data',
+                        'operator' => 'equal'
+                      }
+                    ]
+                },
+              'roleId' => 1
+            }
+          ]
+          action['approvalRequiredConditions'] = [
+            { 'filter' =>
+                { 'aggregator' => 'and',
+                  'conditions' =>
+                    [
+                      {
+                        'field' => 'name',
+                        'value' => 'fake island',
+                        'source' => 'data',
+                        'operator' => 'equal'
+                      }
+                    ]
+                },
+              'roleId' => 1
+            }
+          ]
+          smart_action_checker = ForestLiana::Ability::Permission::SmartActionChecker.new(parameters, Island, action, user)
+
+          expect(smart_action_checker.can_execute?).to equal true
+        end
+
+        it 'should raise error when approvalRequiredConditions and triggerConditions not match' do
           parameters = ActionController::Parameters.new(params).permit!
           action['approvalRequired'] = [1]
+          action['triggerEnabled'] = [1]
+          action['triggerConditions'] = [
+            { 'filter' =>
+                { 'aggregator' => 'and',
+                  'conditions' =>
+                    [
+                      {
+                        'field' => 'name',
+                        'value' => 'fake island',
+                        'source' => 'data',
+                        'operator' => 'equal'
+                      }
+                    ]
+                },
+              'roleId' => 1
+            }
+          ]
           action['approvalRequiredConditions'] = [
             { 'filter' =>
                 { 'aggregator' => 'and',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forest_liana
 version: !ruby/object:Gem::Version
-  version: 8.0.0.beta.2
+  version: 8.0.0.beta.4
 platform: ruby
 authors:
 - Sandro Munda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails