don't logout if access token not expired

mlcommons · Aug 15, 2024 · 4030032 · 4030032
1 parent bf9fdb3
commit 4030032
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/cli/medperf/comms/auth/auth0.py b/cli/medperf/comms/auth/auth0.py
@@ -204,6 +204,12 @@ def _access_token(self):
             - config.refresh_token_expiration_leeway
         )
         current_time = time.time()
+
+        if current_time < sliding_expiration_time:
+            # Access token not expired. No need to refresh.
+            return access_token
+
+        # So we need to refresh.
         if current_time > absolute_expiration_time:
             # Expired refresh token. Force logout and ask the user to re-authenticate
             logging.debug(
@@ -212,9 +218,8 @@ def _access_token(self):
             self.logout()
             raise AuthenticationError("Token expired. Please re-authenticate")
 
-        if current_time > sliding_expiration_time:
-            # Expired access token. Refresh it.
-            access_token = self.__refresh_access_token(refresh_token)
+        # Expired access token and not expired refresh token. Refresh.
+        access_token = self.__refresh_access_token(refresh_token)
 
         return access_token
 

diff --git a/cli/medperf/tests/comms/test_auth0.py b/cli/medperf/tests/comms/test_auth0.py
@@ -38,6 +38,7 @@ def test_token_is_not_refreshed_if_not_expired(mocker, setup):
         "access_token": "",
         "token_expires_in": 900,
         "token_issued_at": time.time(),
+        "logged_in_at": time.time(),
     }
     mocker.patch(PATCH_AUTH.format("read_credentials"), return_value=creds)
     spy = mocker.patch(PATCH_AUTH.format("Auth0._Auth0__refresh_access_token"))
@@ -58,6 +59,7 @@ def test_token_is_refreshed_if_expired(mocker, setup):
         "access_token": "",
         "token_expires_in": expiration_time,
         "token_issued_at": mocked_issued_at,
+        "logged_in_at": time.time(),
     }
     mocker.patch(PATCH_AUTH.format("read_credentials"), return_value=creds)
     spy = mocker.patch(PATCH_AUTH.format("Auth0._Auth0__refresh_access_token"))
@@ -73,12 +75,14 @@ def test_logs_out_if_session_reaches_token_absolute_expiration_time(mocker, setu
     # Arrange
     expiration_time = 900
     absolute_expiration_time = config.token_absolute_expiry
-    mocked_issued_at = time.time() - absolute_expiration_time
+    mocked_logged_in_at = time.time() - absolute_expiration_time
+    mocked_issued_at = time.time() - expiration_time
     creds = {
         "refresh_token": "",
         "access_token": "",
         "token_expires_in": expiration_time,
         "token_issued_at": mocked_issued_at,
+        "logged_in_at": mocked_logged_in_at,
     }
     mocker.patch(PATCH_AUTH.format("read_credentials"), return_value=creds)
     spy = mocker.patch(PATCH_AUTH.format("Auth0.logout"))