Merge pull request #34 from Celeo/refresh_token_headers

Refresh token headers when refresh -> access tkn

preston/preston.py

@@ -70,7 +70,6 @@ def __init__(self, **kwargs: Any) -> None:
         self._kwargs = kwargs
         if not kwargs.get("no_update_token", False):
             self._try_refresh_access_token()
-            self._update_access_token_header()
 
     def copy(self) -> "Preston":
         """Creates a copy of this Preston object.
@@ -130,6 +129,8 @@ def _try_refresh_access_token(self) -> None:
         then the refresh token is in the API call to get a new access token. If
         successful, this instance is modified in-place with that new access token.
 
+        Also updates the `requests` session with the new header.
+
         Args:
             None
 
@@ -143,6 +144,9 @@ def _try_refresh_access_token(self) -> None:
                     self.access_expiration,
                 ) = self._get_access_from_refresh()
                 self.access_expiration = time.time() + self.access_expiration
+                self.session.headers.update(
+                    {"Authorization": f"Bearer {self.access_token}"}
+                )
 
     def _is_access_token_expired(self) -> bool:
         """Returns true if the stored access token has expired.
@@ -204,23 +208,6 @@ def authenticate(self, code: str) -> "Preston":
         new_kwargs["refresh_token"] = response_data["refresh_token"]
         return Preston(**new_kwargs)
 
-    def _update_access_token_header(self) -> None:
-        """Updates the requests session with the access token header.
-
-        This method does nothing if this instance does not have a
-        stored access token.
-
-        Args:
-            None
-
-        Returns:
-            None
-        """
-        if self.access_token:
-            self.session.headers.update(
-                {"Authorization": f"Bearer {self.access_token}"}
-            )
-
     def _get_spec(self) -> dict:
         """Fetches the OpenAPI spec from the server.
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "preston"
-version = "4.6.0"
+version = "4.7.0"
 description = "EVE ESI API access tool"
 authors = ["Celeo <[email protected]>"]
 license = "MIT"

tests/test_preston.py

@@ -86,11 +86,6 @@ def test_get_authorize_url(sample):
     expected_multiple_scope = "https://login.eveonline.com/oauth/authorize?response_type=code&redirect_uri=4&client_id=2&scope=scope%20scope1"
     assert sample_multiple_scopes.get_authorize_url() == expected_multiple_scope
 
-def test_update_access_token_header(sample):
-    assert "Authorization" not in sample.session.headers
-    sample._update_access_token_header()
-    assert sample.session.headers["Authorization"] == "Bearer 6"
-
 
 def test_insert_vars(empty):
     data = dict(foo="bar", bar="baz")
@@ -114,3 +109,19 @@ def test_insert_vars_missing(empty):
 
 def test_whoami_unauthorized(empty):
     assert empty.whoami() == {}
+
+
+def test_try_refresh_access_token_empty(empty):
+    empty._try_refresh_access_token()
+    assert empty.refresh_token is None
+    assert empty.access_token is None
+
+
+def test_try_refresh_access_token_has(empty):
+    empty.refresh_token = 'abc123'
+    empty.access_token = None
+    empty._is_access_token_expired = lambda: False
+    empty.access_expiration = 1.0
+    empty._get_access_from_refresh = lambda: ('def', 456)
+    empty._try_refresh_access_token()
+    assert empty.access_token == 'def'