Merge pull request #5019 from tomhughes/oauth2-cleanup

[rails.git] / script / cleanup

diff --git a/script/cleanup b/script/cleanup
index 67cc0705efa1e21ba8d42ef72eff1170b98853c8..e829be176b9ece957a1a36a87db9942717c27ebf 100755 (executable)
--- a/script/cleanup
+++ b/script/cleanup
@@ -2,9 +2,11 @@
 
 require File.join(File.dirname(__FILE__), "..", "config", "environment")
 
 
 require File.join(File.dirname(__FILE__), "..", "config", "environment")
 

-UserToken.where("expiry < NOW()").delete_all

 OauthNonce.where("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')").delete_all
 OauthToken.where("invalidated_at < NOW() - INTERVAL '28 days'").delete_all
 RequestToken.where("authorized_at IS NULL AND created_at < NOW() - INTERVAL '28 days'").delete_all
 
 OauthNonce.where("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')").delete_all
 OauthToken.where("invalidated_at < NOW() - INTERVAL '28 days'").delete_all
 RequestToken.where("authorized_at IS NULL AND created_at < NOW() - INTERVAL '28 days'").delete_all
 

+Doorkeeper::AccessGrant.where("revoked_at < NOW() - INTERVAL '28 days' OR (created_at + expires_in * INTERVAL '1 second') < NOW() - INTERVAL '28 days'").delete_all
+Doorkeeper::AccessToken.where("revoked_at < NOW() - INTERVAL '28 days' OR (created_at + expires_in * INTERVAL '1 second') < NOW() - INTERVAL '28 days'").delete_all
+

 exit 0
 exit 0