Fix bug in refresh access token

Author: maxachis

manual_tests/README.md

@@ -0,0 +1 @@
+These tests are designed to be run manually against the API.

manual_tests/__init__.py

@@ -0,0 +1,23 @@
+from aiohttp import ClientSession
+from environs import Env
+
+from pdap_access_manager.AccessManager import AccessManager, RequestInfo, RequestType, Namespaces
+
+
+async def test_access_manager_refresh_access_token():
+    env = Env()
+    env.read_env()
+
+    async with ClientSession() as session:
+        access_manager = AccessManager(
+            email=env.str("PDAP_EMAIL"),
+            password=env.str("PDAP_PASSWORD"),
+            session=session,
+        )
+        url = access_manager.build_url(
+            namespace=Namespaces.PERMISSIONS,
+        )
+        jwt_header_pre_refresh = await access_manager.jwt_header()
+        await access_manager.refresh_access_token()
+        jwt_header_post_refresh = await access_manager.jwt_header()
+        assert jwt_header_pre_refresh != jwt_header_post_refresh

manual_tests/test_manual_access_manager.py

@@ -23,6 +23,7 @@ class RequestType(Enum):
 class Namespaces(Enum):
     AUTH = "auth"
     LOCATIONS = "locations"
+    PERMISSIONS = "permissions"
 
 
 class CustomHTTPException(Exception):
@@ -60,6 +61,10 @@ def url_with_query_params(self) -> str:
         url.query_params.update(self.params)
         return url.to_text()
 
+def authorization_from_token(token: str) -> dict:
+    return {
+        "Authorization": f"Bearer {token}"
+    }
 
 DEFAULT_PDAP_API_URL = "https://data-sources.pdap.io/api"
 
@@ -147,12 +152,10 @@ async def refresh_access_token(self):
             namespace=Namespaces.AUTH,
             subdomains=["refresh-session"],
         )
-        refresh_token = await self.refresh_token
         rqi = RequestInfo(
             type_=RequestType.POST,
             url=url,
-            json_={"refresh_token": refresh_token},
-            headers=await self.jwt_header()
+            headers=await self.refresh_jwt_header()
         )
         rsi = await self.make_request(rqi, allow_retry=False)
         data = rsi.data
@@ -176,6 +179,7 @@ async def make_request(self, ri: RequestInfo, allow_retry: bool = True) -> Respo
                 )
         except ClientResponseError as e:
             if e.status == 401 and allow_retry:  # Unauthorized, token expired?
+                print("401 error, refreshing access token...")
                 await self.refresh_access_token()
                 return await self.make_request(ri, allow_retry=False)
             else:
@@ -213,9 +217,15 @@ async def jwt_header(self) -> dict:
         Returns: Dictionary of Bearer Authorization with JWT key
         """
         access_token = await self.access_token
-        return {
-            "Authorization": f"Bearer {access_token}"
-        }
+        return authorization_from_token(access_token)
+
+    async def refresh_jwt_header(self) -> dict:
+        """
+        Retrieve JWT header
+        Returns: Dictionary of Bearer Authorization with JWT key
+        """
+        refresh_token = await self.refresh_token
+        return authorization_from_token(refresh_token)
 
     async def api_key_header(self) -> dict:
         """

pdap_access_manager/AccessManager.py

@@ -25,6 +25,7 @@ boltons = "^25.0.0"
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.5"
 pytest-asyncio = "^0.26.0"
+environs = "^14.1.1"
 
 [build-system]
 requires = ["poetry-core"]