Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: switch order of removal of revoked and expired tokens in dot cleanup (#32010)

Browse Source
This commit is contained in:
Rebecca Graber
2023-03-30 12:34:00 -04:00
committed by GitHub
parent 2f64020259
commit d8769e8347
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py
View File

@@ -91,6 +91,12 @@ class Command(BaseCommand): # lint-amnesty, pylint: disable=missing-class-docst
now = timezone.now()
refresh_expire_at = self.get_expiration_time(now)
if options['refresh-tokens']:
logger.info("Removing expired RefreshTokens")
query_set = RefreshToken.objects.filter(access_token__expires__lt=refresh_expire_at).exclude(
application_id__in=excluded_application_ids)
self.clear_table_data(query_set, batch_size, RefreshToken, sleep_time)
if options['revoked-tokens']:
logger.info("Removing revoked RefreshTokens")
# remove revoked, as opposed to expired, RefreshTokens
@@ -98,12 +104,6 @@ class Command(BaseCommand): # lint-amnesty, pylint: disable=missing-class-docst
application_id__in=excluded_application_ids)
self.clear_table_data(revoked, batch_size, RefreshToken, sleep_time)
if options['refresh-tokens']:
logger.info("Removing expired RefreshTokens")
query_set = RefreshToken.objects.filter(access_token__expires__lt=refresh_expire_at).exclude(
application_id__in=excluded_application_ids)
self.clear_table_data(query_set, batch_size, RefreshToken, sleep_time)
if options['access-tokens']:
logger.info("Removing expired AccessTokens")
query_set = AccessToken.objects.filter(refresh_token__isnull=True, expires__lt=now)