Merge pull request #5019 from tomhughes/oauth2-cleanup

Add expiry for OAuth 2 grants and tokens

diff --git a/script/cleanup b/script/cleanup
index 7601d35cf9386a276a1fabd7199a3e00a6cb9c23..e829be176b9ece957a1a36a87db9942717c27ebf 100755 (executable)
--- a/script/cleanup
+++ b/script/cleanup
@@ -6,4 +6,7 @@ OauthNonce.where("timestamp < EXTRACT(EPOCH FROM NOW() - INTERVAL '1 day')").del
 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