From d8769e8347b33b2e52900d217da8086f4998228c Mon Sep 17 00:00:00 2001 From: Rebecca Graber Date: Thu, 30 Mar 2023 12:34:00 -0400 Subject: [PATCH] feat: switch order of removal of revoked and expired tokens in dot cleanup (#32010) --- .../management/commands/edx_clear_expired_tokens.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py b/openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py index 802af2559e..60da129567 100644 --- a/openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py +++ b/openedx/core/djangoapps/oauth_dispatch/management/commands/edx_clear_expired_tokens.py @@ -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)