more fixes

Author: tamirse

datacrunch/authentication/authentication.py

@@ -80,7 +80,7 @@ def refresh(self) -> dict:
             url, json=payload, headers=self._generate_headers())
 
         # if refresh token is also expired, authenticate again:
-        if response.status_code == 400:
+        if response.status_code == 401 or response.status_code == 400:
             return self.authenticate()
         else:
             handle_error(response)

datacrunch/http_client/http_client.py

@@ -49,11 +49,11 @@ def post(self, url: str, json: dict = None, **kwargs) -> requests.Response:
         :return: Response object
         :rtype: requests.Response
         """
+        self._refresh_token_if_expired()
+
         url = self._add_base_url(url)
         headers = self._generate_headers()
 
-        self._refresh_token_if_expired()
-
         response = requests.post(url, json=json, headers=headers, **kwargs)
         handle_error(response)
 
@@ -76,11 +76,11 @@ def put(self, url: str, json: dict = None, **kwargs) -> requests.Response:
         :return: Response object
         :rtype: requests.Response
         """
+        self._refresh_token_if_expired()
+
         url = self._add_base_url(url)
         headers = self._generate_headers()
 
-        self._refresh_token_if_expired()
-
         response = requests.put(url, json=json, headers=headers, **kwargs)
         handle_error(response)
 
@@ -103,11 +103,11 @@ def get(self, url: str, params: dict = None, **kwargs) -> requests.Response:
         :return: Response object
         :rtype: requests.Response
         """
+        self._refresh_token_if_expired()
+
         url = self._add_base_url(url)
         headers = self._generate_headers()
 
-        self._refresh_token_if_expired()
-
         response = requests.get(url, params=params, headers=headers, **kwargs)
         handle_error(response)
 
@@ -130,11 +130,11 @@ def delete(self, url: str, json: dict = None, **kwargs) -> requests.Response:
         :return: Response object
         :rtype: requests.Response
         """
+        self._refresh_token_if_expired()
+
         url = self._add_base_url(url)
         headers = self._generate_headers()
 
-        self._refresh_token_if_expired()
-
         response = requests.delete(url, headers=headers, json=json, **kwargs)
         handle_error(response)