diff options
Diffstat (limited to 'app/finders/concerns/packages/finder_helper.rb')
| -rw-r--r-- | app/finders/concerns/packages/finder_helper.rb | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/app/finders/concerns/packages/finder_helper.rb b/app/finders/concerns/packages/finder_helper.rb index 30bc0ff7909..39c018818d1 100644 --- a/app/finders/concerns/packages/finder_helper.rb +++ b/app/finders/concerns/packages/finder_helper.rb @@ -11,22 +11,26 @@ module Packages def packages_visible_to_user(user, within_group:) return ::Packages::Package.none unless within_group - return ::Packages::Package.none unless Ability.allowed?(user, :read_package, within_group) + return ::Packages::Package.none unless Ability.allowed?(user, :read_group, within_group) - projects = projects_visible_to_reporters(user, within_group.self_and_descendants.select(:id)) + projects = projects_visible_to_reporters(user, within_group: within_group) ::Packages::Package.for_projects(projects.select(:id)) end def projects_visible_to_user(user, within_group:) return ::Project.none unless within_group - return ::Project.none unless Ability.allowed?(user, :read_package, within_group) + return ::Project.none unless Ability.allowed?(user, :read_group, within_group) - projects_visible_to_reporters(user, within_group.self_and_descendants.select(:id)) + projects_visible_to_reporters(user, within_group: within_group) end - def projects_visible_to_reporters(user, namespace_ids) - ::Project.in_namespace(namespace_ids) - .public_or_visible_to_user(user, ::Gitlab::Access::REPORTER) + def projects_visible_to_reporters(user, within_group:) + if user.is_a?(DeployToken) && Feature.enabled?(:packages_finder_helper_deploy_token) + user.accessible_projects + else + within_group.all_projects + .public_or_visible_to_user(user, ::Gitlab::Access::REPORTER) + end end def package_type |