From a6f52edece11f0d49a88c204e30d7142485d8584 Mon Sep 17 00:00:00 2001 From: Pavel Shebalkou Date: Sat, 10 Feb 2024 15:35:27 +0300 Subject: [PATCH 1/2] Consider expires_in when clear expired tokens with StaleRecordsCleaner --- lib/doorkeeper/orm/active_record/stale_records_cleaner.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/doorkeeper/orm/active_record/stale_records_cleaner.rb b/lib/doorkeeper/orm/active_record/stale_records_cleaner.rb index 3ba6bd590..275e0bc16 100644 --- a/lib/doorkeeper/orm/active_record/stale_records_cleaner.rb +++ b/lib/doorkeeper/orm/active_record/stale_records_cleaner.rb @@ -28,6 +28,7 @@ def clean_expired(ttl) @base_scope .where.not(expires_in: nil) .where(table[:created_at].lt(Time.current - ttl)) + .where(table[:created_at] + table[:expires_in].lt(Time.current)) .in_batches(&:delete_all) end end From 19d7e41c07d75400273df7650cbcfc5b5a4da028 Mon Sep 17 00:00:00 2001 From: Pavel Shebalkou Date: Sat, 10 Feb 2024 15:40:57 +0300 Subject: [PATCH 2/2] add pr to changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe6cbd949..2e905fdaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ User-visible changes worth mentioning. ## main -- [#PR ID] Add your changelog here. +- [#1690] Consider expires_in when clear expired tokens with StaleRecordsCleaner. ## 5.6.8