Merge 112d286 into 326e480

uc-cdis · Nov 8, 2022 · a59ffb5 · a59ffb5
2 parents 326e480 + 112d286
commit a59ffb5
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/fence/resources/openid/idp_oauth2.py b/fence/resources/openid/idp_oauth2.py
@@ -191,10 +191,17 @@ def get_access_token(self, user, token_endpoint, db_session=None):
             refresh_token = row.refresh_token
             expires = row.expires
 
+            if time.time() > expires:
+                # reset to check for next token
+                refresh_token = None
+                expires = None
+
+                # delete expired refresh token
+                db_session.delete(row)
+                db_session.commit()
+
         if not refresh_token:
-            raise AuthError("User doesn't have a refresh token")
-        if time.time() > expires:
-            raise AuthError("Refresh token expired. Please login again.")
+            raise AuthError("User doesn't have a valid, non-expired refresh token")
 
         token_response = self.session.refresh_token(
             url=token_endpoint,