Merge pull request #698 from FlorentinD/fix-token-refresh-logic

Fix token refresh logic

Author: FlorentinD

graphdatascience/session/aura_api.py

@@ -285,7 +285,7 @@ def __init__(self, json: Dict[str, Any]) -> None:
                 self.refresh_at = int(time.time()) + refresh_in
 
             def should_refresh(self) -> bool:
-                return self.refresh_at >= int(time.time())
+                return self.refresh_at <= int(time.time())
 
         def __init__(self, oauth_url: str, credentials: Tuple[str, str]) -> None:
             self._token: Optional[AuraApi.Auth.Token] = None

graphdatascience/tests/unit/test_aura_api.py

@@ -392,7 +392,7 @@ def test_auth_token(requests_mock: Mocker) -> None:
 
     requests_mock.post(
         "https://api.neo4j.io/oauth/token",
-        json={"access_token": "very_short_token", "expires_in": 1, "token_type": "Bearer"},
+        json={"access_token": "very_short_token", "expires_in": 0, "token_type": "Bearer"},
     )
 
     assert api._auth._auth_token() == "very_short_token"
@@ -414,6 +414,13 @@ def test_auth_token_reused(requests_mock: Mocker) -> None:
     )
 
     assert api._auth._auth_token() == "one_token"
+
+    requests_mock.post(
+        "https://api.neo4j.io/oauth/token",
+        json={"access_token": "new_token", "expires_in": 3600, "token_type": "Bearer"},
+    )
+
+    # no new token requested
     assert api._auth._auth_token() == "one_token"