separate checking for onwnership and permissions into separate methods

rubygems · Sep 6, 2024 · a4b0999 · a4b0999
1 parent bf2d936
commit a4b0999
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
@@ -76,7 +76,11 @@ def current_user?(record_user)
     user && user == record_user
   end
 
-  def rubygem_owned_by?(user, minimum_required_role: :maintainer)
+  def rubygem_owned_by?(user)
+    rubygem.owned_by?(user) || deny(t(:forbidden))
+  end
+
+  def rubygem_owned_by_with_role?(user, minimum_required_role:)
     rubygem.owned_by_with_role?(user, minimum_required_role) || deny(t(:forbidden))
   end
 

diff --git a/app/policies/rubygem_policy.rb b/app/policies/rubygem_policy.rb
@@ -55,18 +55,18 @@ def close_ownership_requests?
   end
 
   def show_unconfirmed_ownerships?
-    rubygem_owned_by?(user, minimum_required_role: :owner)
+    rubygem_owned_by_with_role?(user, minimum_required_role: :owner)
   end
 
   def add_owner?
-    rubygem_owned_by?(user, minimum_required_role: :owner)
+    rubygem_owned_by_with_role?(user, minimum_required_role: :owner)
   end
 
   def update_owner?
-    rubygem_owned_by?(user, minimum_required_role: :owner)
+    rubygem_owned_by_with_role?(user, minimum_required_role: :owner)
   end
 
   def remove_owner?
-    rubygem_owned_by?(user, minimum_required_role: :owner)
+    rubygem_owned_by_with_role?(user, minimum_required_role: :owner)
   end
 end