reauthenticated if refresh token is expired when trying to refresh

Author: tamirse

datacrunch/authentication/authentication.py

@@ -78,7 +78,12 @@ def refresh(self) -> dict:
 
         response = requests.post(
             url, json=payload, headers=self._generate_headers())
-        handle_error(response)
+
+        # if refresh token is also expired, authenticate again:
+        if response.status_code == 400:
+            return self.authenticate()
+        else:
+            handle_error(response)
 
         auth_data = response.json()
 
@@ -104,4 +109,4 @@ def is_expired(self) -> bool:
         :return: True if the access token is expired, otherwise False.
         :rtype: bool
         """
-        return time.time() > self._expires_at
+        return time.time() >= self._expires_at

datacrunch/http_client/http_client.py

@@ -147,7 +147,7 @@ def _refresh_token_if_expired(self) -> None:
 
         :raises APIException: an api exception with message and error type code
         """
-        if(self._auth_service.is_expired()):
+        if (self._auth_service.is_expired()):
             # try to refresh. if refresh token has expired, reauthenticate
             try:
                 self._auth_service.refresh()
@@ -182,7 +182,7 @@ def _generate_user_agent(self) -> str:
         :rtype: str
         """
         # get the first 10 chars of the client id
-        client_id_truncated = self._auth_service._client_id[:10]  
+        client_id_truncated = self._auth_service._client_id[:10]
 
         return f'datacrunch-python-v{self._version}-{client_id_truncated}'