foreman_puppet 9.1.0 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fc8e5785dede7467f7304f44c23010d7141bb7c213a0473946eb9694de3ed73
-  data.tar.gz: d12d7661d03481c64458dfab71fff925f7793b64c818db0fca55f69b77fde6bc
+  metadata.gz: bc7813b3e70470b1ede75609466fd1f395b2b24415a6fc30dea85fcf9431c10a
+  data.tar.gz: 3f6e2c28bdb0143c86e1182b201afb8eb81a9753c0fcd8198c5bf4996a3e995f
 SHA512:
-  metadata.gz: 06f48bd2388561acc757d0227e9c29fbe3920ba40560a2cf4c72ee4f4936efa1fdb4759094451ae35e012aa89aa4312bb561d926bd80c175ee4f478055e8c2d9
-  data.tar.gz: 86ae84580f218ccb38e4a801de6e4570b570d574217ef6bea04922af22d785fe6dc769fa3488640ebf0ae5aa8f5adff81777d4cc02f323fef7086816309f0658
+  metadata.gz: 5c2df904975315458ad27f09262c0025c9240d8750b89f2325a86bcd53abbd7c9e8d4d5ded37aebe594b069b86f3e0697be806652bfba01a8a42931a2b38cbca
+  data.tar.gz: 9708de0a826955c059856924d0fd206d76b2b21f8905e450b030c8876659f7f02692520cea3888701028e330947c4e556f1741dd3f21f6397124b1dc2281b1a9

data/app/models/concerns/foreman_puppet/extensions/user.rb

@@ -9,19 +9,7 @@ module ForemanPuppet
 
       module PatchedMethods
         def visible_environments
-          authorized_scope = ForemanPuppet::Environment.unscoped.authorized(:view_environments)
-          authorized_scope = authorized_scope
-                             .joins(:taxable_taxonomies)
-                             .where('taxable_taxonomies.taxonomy_id' => taxonomy_ids[:organizations] + taxonomy_ids[:locations])
-          result = authorized_scope.distinct.pluck(:name)
-          if ::User.current.admin?
-            # Admin users can also see Environments that do not have any organization or location, even when
-            # organizations and locations are enabled.
-            untaxed_env_ids = TaxableTaxonomy.where(taxable_type: 'ForemanPuppet::Environment').distinct.select(:taxable_id)
-            untaxed_environments = ForemanPuppet::Environment.unscoped.where.not(id: untaxed_env_ids).pluck(:name)
-            result += untaxed_environments
-          end
-          result
+          ForemanPuppet::Environment.authorized(:view_environments).pluck(:name)
         end
       end
     end

data/lib/foreman_puppet/register.rb

@@ -1,5 +1,5 @@
 Foreman::Plugin.register :foreman_puppet do
-  requires_foreman '>= 3.13'
+  requires_foreman '>= 3.19'
   register_gettext
 
   # Add Global JS file for extending foreman-core components and routes

data/lib/foreman_puppet/version.rb

@@ -1,3 +1,3 @@
 module ForemanPuppet
-  VERSION = '9.1.0'.freeze
+  VERSION = '10.0.0'.freeze
 end

data/test/models/foreman_puppet/user_test.rb

@@ -24,8 +24,12 @@ module ForemanPuppet
       end
 
       test 'should show the list of environments visible as non-admin user' do
-        # Non-admin user only sees environments in a taxonomy at least
+        # Non-admin user only sees environments in the same taxonomies at least
         setup_user 'view', 'environments'
+        # The user is in the same location as the environment, but in a
+        # different org. The org mismatch would make the environment invisible
+        # to the user.
+        User.current.organizations << environment.organizations.first
         assert_equal [environment.name], ::User.current.visible_environments
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_puppet
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 10.0.0
 platform: ruby
 authors:
 - Ondřej Ezr
@@ -404,7 +404,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Add Puppet features to Foreman
 test_files: