Set no_attribute_check on additional_collection with strong_parameters

gemfiles/ruby_2.6.6_rails5.2.6_grape1.3.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 2.1"
+gem "mocha", "~> 1.0", require: false
+gem "sprockets", "< 4"
+gem "rails-controller-testing"
+gem "rails", "5.2.6"
+gem "grape", "1.3.0"
+gem "sqlite3", "~> 1.3.0"
+
+gemspec path: "../"

gemfiles/ruby_2.7.2_rails6.0.2.1_grape1.3.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 2.1"
+gem "mocha", "~> 1.0", require: false
+gem "sprockets", "< 4"
+gem "rails-controller-testing"
+gem "rails", "6.0.2.1"
+gem "grape", "1.3.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"

lib/declarative_authorization/controller/rails.rb

@@ -200,7 +200,7 @@ def filter_resource_access(options = {})
           collections = actions_from_option(options[:collection]).merge(
               actions_from_option(options[:additional_collection]))
 
-          no_attribute_check_actions = options[:strong_parameters] ? actions_from_option(options[:collection]).merge(actions_from_option([:create])) : collections
+          no_attribute_check_actions = options[:strong_parameters] ? collections.merge(actions_from_option([:create])) : collections
 
           options[:no_attribute_check] ||= no_attribute_check_actions.keys unless options[:nested_in]
 

test/controller_filter_resource_access_test.rb

@@ -441,6 +441,90 @@ def test_additional_members_filter_other_new
   end
 end
 
+class AdditionalMembersCollectionsStrongParamsController < MocksController
+  def self.controller_name
+    "basic_resources"
+  end
+  filter_resource_access :additional_member => :other_show,
+      :additional_collection => [:search], :additional_new => {:other_new => :new}, :strong_parameters => true
+  define_resource_actions
+  define_action_methods :other_new, :search, :other_show
+end
+class AdditionalMembersCollectionsStrongParamsControllerTest < ActionController::TestCase
+  def test_additional_members_filter_search_index
+    reader = Authorization::Reader::DSLReader.new
+    reader.parse %{
+      authorization do
+        role :allowed_role do
+          has_permission_on :basic_resources, :to => [:search, :index] do
+            if_attribute :id => is {"1"}
+          end
+        end
+      end
+    }
+
+    request!(MockUser.new(:another_role), :search, reader)
+    assert [email protected]?
+    request!(MockUser.new(:another_role), :index, reader)
+    assert [email protected]?
+    request!(MockUser.new(:allowed_role), :search, reader)
+    assert @controller.authorized?
+    request!(MockUser.new(:allowed_role), :index, reader)
+    assert @controller.authorized?
+  end
+
+  def test_additional_members_filter_other_show
+    reader = Authorization::Reader::DSLReader.new
+    reader.parse %{
+      authorization do
+        role :allowed_role do
+          has_permission_on :basic_resources, :to => [:show, :other_show] do
+            if_attribute :id => is {"1"}
+          end
+        end
+      end
+    }
+
+    allowed_user = MockUser.new(:allowed_role)
+    request!(allowed_user, :other_show, reader, :id => "2")
+    assert [email protected]?
+    request!(allowed_user, :show, reader, :id => "2", :clear => [:@basic_resource])
+    assert [email protected]?
+    request!(allowed_user, :other_show, reader, :id => "1", :clear => [:@basic_resource])
+    assert @controller.authorized?
+    request!(allowed_user, :show, reader, :id => "1", :clear => [:@basic_resource])
+    assert @controller.authorized?
+  end
+
+  def test_additional_members_filter_other_new
+    reader = Authorization::Reader::DSLReader.new
+    reader.parse %{
+      authorization do
+        role :allowed_role do
+          has_permission_on :basic_resources, :to => :new do
+            if_attribute :id => is {"1"}
+          end
+        end
+      end
+    }
+
+    allowed_user = MockUser.new(:allowed_role)
+    request!(allowed_user, :other_new, reader, :basic_resource => {:id => "2"})
+    assert [email protected]?
+    request!(allowed_user, :new, reader, :basic_resource => {:id => "2"},
+        :clear => [:@basic_resource])
+    assert [email protected]?
+
+    # strong_parameters (as mocked) never set parameters on new object, so attribute condition is never met
+    request!(allowed_user, :other_new, reader, :basic_resource => {:id => "1"},
+        :clear => [:@basic_resource])
+    assert [email protected]?
+    request!(allowed_user, :new, reader, :basic_resource => {:id => "1"},
+        clear: [:@basic_resource])
+    assert [email protected]?
+  end
+end
+
 
 class CustomMethodsResourceController < MocksController
   # not implemented yet