pytest-nhsd-apim 5.0.6__tar.gz → 5.0.8__tar.gz

{pytest_nhsd_apim-5.0.6 → pytest_nhsd_apim-5.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-nhsd-apim
-Version: 5.0.6
+Version: 5.0.8
 Summary: Pytest plugin accessing NHSDigital's APIM proxies
 Home-page: https://github.com/NHSDigital/pytest-nhsd-apim
 Author: Adrian Ciobanita
@@ -20,10 +20,11 @@ Requires-Dist: pyotp==2.9.0
 Requires-Dist: pytest==8.2.0
 Requires-Dist: requests==2.32.0
 Requires-Dist: toml==0.10.2
-Requires-Dist: typing-extensions==4.11.0
+Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: pydantic==2.9.2
 Requires-Dist: wheel<0.39.0,===0.37.1
 Requires-Dist: pydantic-settings==2.2.1
+Requires-Dist: setuptools==70.0.0
 
 # pytest-nhsd-apim
 

{pytest_nhsd_apim-5.0.6 → pytest_nhsd_apim-5.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pytest-nhsd-apim"
-version = "5.0.6"
+version = "5.0.8"
 description = "Pytest plugin accessing NHSDigital's APIM proxies"
 authors = ["Adrian Ciobanita <adrian.ciobanita1@nhs.net>", "Alex Carrie <alexander.carrie1@nhs.net>", "Lucas Fantini <lucas.fantini@nhs.net>"]
 maintainers = ["Alex Carrie <alexander.carrie1@nhs.net>", "Alex Hawdon <alex.hawdon1@nhs.net"]
@@ -13,19 +13,20 @@ license = "MIT"
 Authlib = "^1.3.1"
 cryptography = ">42.0.0"
 lxml = "^5.3.1"
-python = "^3.8"
+python = "^3.13"
 pycryptodome = "^3.20.0"
 PyJWT = "^2.8.0"
 pyotp = "^2.9.0"
 pytest = "^8.2.0"
 requests = "^2.32.0"
 toml = "^0.10.2"
-typing-extensions = "^4.11.0"
+typing-extensions = "^4.12.2"
 pydantic = "^2.9.2"
 wheel = ">=0.37.1,<0.39.0"
 pydantic-settings = "^2.2.1"
+setuptools = "^70.0.0"
 
-[tool.poetry.dev-dependencies]
+# [tool.poetry.group.dev.dependencies]
 
 [tool.pytest.ini_options]
 log_cli = true

{pytest_nhsd_apim-5.0.6 → pytest_nhsd_apim-5.0.8}/src/pytest_nhsd_apim/token_cache.py

@@ -20,7 +20,14 @@ class _TokenCache:
             # only present on app-restricted tokens.  we can inject
             # this ourselves. Assume 5 seconds ago, probably was more
             # recently
-            token_data["issued_at"] = time() - 5000
+            token_data["issued_at"] = (int(time()) * 1000) - 5000
+
+        if not self.is_time_in_milliseconds(token_data["issued_at"]):
+            token_data["issued_at"] = int(token_data["issued_at"]) * 1000
+
+        if not self.is_expiry_in_milliseconds(token_data["expires_in"]):
+            token_data["expires_in"] = int(token_data["expires_in"]) * 1000
+        
         self._cache[key] = token_data
 
     @log_method
@@ -33,18 +40,24 @@ class _TokenCache:
 
         old_token_data = self._cache[key]
         grace_period_seconds = 5
-        now_ish = int(time()) + grace_period_seconds
+        now_ish = (int(time()) + grace_period_seconds) * 1000
 
         # issued_at is epoch_time in milliseconds
         # but expires_in is in seconds
         # => need factor of 1000 in this sum.
-        expiry_time = int(old_token_data["issued_at"]) + 1000 * int(
-            old_token_data["expires_in"]
-        )
+        
+        expiry_time = int(old_token_data["issued_at"]) + int(old_token_data["expires_in"])
         if now_ish > expiry_time:
             self._cache.pop(key)
             return None
         return old_token_data
+    
+    def is_time_in_milliseconds(self, time_value):
+        return int(time_value) > 10**11 #Current time in secs not go over 11 digits
+    
+    def is_expiry_in_milliseconds(self, expiry_value):
+        return int(expiry_value) > 86400 #Assuming seconds not go higher than 24hrs
+        
 
 
 _CACHES = {}

{pytest_nhsd_apim-5.0.6 → pytest_nhsd_apim-5.0.8}/src/pytest_nhsd_apim.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest-nhsd-apim
-Version: 5.0.6
+Version: 5.0.8
 Summary: Pytest plugin accessing NHSDigital's APIM proxies
 Home-page: https://github.com/NHSDigital/pytest-nhsd-apim
 Author: Adrian Ciobanita
@@ -20,10 +20,11 @@ Requires-Dist: pyotp==2.9.0
 Requires-Dist: pytest==8.2.0
 Requires-Dist: requests==2.32.0
 Requires-Dist: toml==0.10.2
-Requires-Dist: typing-extensions==4.11.0
+Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: pydantic==2.9.2
 Requires-Dist: wheel<0.39.0,===0.37.1
 Requires-Dist: pydantic-settings==2.2.1
+Requires-Dist: setuptools==70.0.0
 
 # pytest-nhsd-apim
 

{pytest_nhsd_apim-5.0.6 → pytest_nhsd_apim-5.0.8}/src/pytest_nhsd_apim.egg-info/requires.txt

@@ -7,7 +7,8 @@ pyotp==2.9.0
 pytest==8.2.0
 requests==2.32.0
 toml==0.10.2
-typing-extensions==4.11.0
+typing-extensions==4.12.2
 pydantic==2.9.2
 wheel<0.39.0,===0.37.1
 pydantic-settings==2.2.1
+setuptools==70.0.0