Fixes #39106 - Fix taxonomy creation for unprivileged users

app/models/taxonomy.rb

@@ -1,15 +1,14 @@
 class Taxonomy < ApplicationRecord
   validates_lengths_from_database
 
-  after_create :assign_taxonomy_to_user
-
   include Authorizable
   include NestedAncestryCommon
   include TopbarCacheExpiry
 
   serialize :ignore_types, Array
 
   before_create :assign_default_templates
+  after_create :assign_taxonomy_to_user
   before_validation :sanitize_ignored_types
 
   has_many :taxable_taxonomies, :dependent => :destroy
@@ -246,7 +245,10 @@ def hash_key_to_class(key)
 
   def assign_taxonomy_to_user
     return if User.current.nil? || User.current.admin
+
     User.current.public_send(self.class.to_s.downcase.pluralize) << self
+    User.current.reload
+    User.current.invalidate_cache
   end
 
   def parent_id_does_not_escalate

test/integration/location_test.rb

@@ -52,6 +52,32 @@ def setup
     assert page.has_link? "Raleigh"
   end
 
+  test "create a location with an unprivileged user with admin usergroup" do
+    ug = FactoryBot.create(:usergroup, :admin => true)
+    user = FactoryBot.create(:user, :usergroups => [ug])
+
+    set_request_user(user)
+    assert_new_button(locations_path, "New Location", new_location_path)
+    fill_in "location_name", :with => "Raleigh"
+    click_button "Submit"
+    assert_current_path step2_location_path(Location.unscoped.order(:id).last)
+  end
+
+  test "create a location with an unprivileged user with create_locations permission" do
+    user = setup_user('view', 'locations')
+    setup_user('create', 'locations', 'name ~ "R*"')
+    set_request_user(user)
+    assert_new_button(locations_path, "New Location", new_location_path)
+    fill_in "location_name", :with => "aleigh2"
+    click_button "Submit"
+    error = find('div.alert')
+    assert_match "You don't have permission create_locations", error.text
+
+    fill_in "location_name", :with => "Raleigh2"
+    click_button "Submit"
+    assert_current_path edit_location_path(Location.unscoped.order(:id).last)
+  end
+
   # PENDING
   # test "mismatches report" do
   # end