Only expire unexpired API keys (#4975)

Avoids looping over already expired keys
rubygems · Aug 27, 2024 · 0eb3e68 · 0eb3e68
1 parent 523af17
commit 0eb3e68
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
@@ -40,7 +40,7 @@ class ScopeError < RuntimeError; end
 
   def self.expire_all!
     transaction do
-      find_each.all?(&:expire!)
+      unexpired.find_each.all?(&:expire!)
     end
   end
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -310,7 +310,7 @@ def toxic_email_domain
   end
 
   def expire_all_api_keys
-    api_keys.unexpired.expire_all!
+    api_keys.expire_all!
   end
 
   def destroy_associations_for_discard