iaptoolkit 0.3.7a2__tar.gz → 0.3.7a4__tar.gz

{iaptoolkit-0.3.7a2 → iaptoolkit-0.3.7a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: iaptoolkit
-Version: 0.3.7a2
+Version: 0.3.7a4
 Summary: Library of common utils for interacting with Identity-Aware Proxies
 Author: Rob Voigt
 Author-email: code@ravoigt.com

{iaptoolkit-0.3.7a2 → iaptoolkit-0.3.7a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iaptoolkit"
-version = "0.3.7-a2"
+version = "0.3.7-a4"
 description = "Library of common utils for interacting with Identity-Aware Proxies"
 authors = [
     {name = "Rob Voigt", email = "code@ravoigt.com"}

{iaptoolkit-0.3.7a2 → iaptoolkit-0.3.7a4}/src/iaptoolkit/jwt/verify.py

@@ -52,7 +52,7 @@ class GoogleIAPKeys:
 
     @property
     def should_refresh(self) -> bool:
-        if self._retrieved_timestamp > datetime.datetime.now() - datetime.timedelta(
+        if self._retrieved_timestamp > datetime.datetime.now(tz=datetime.UTC) - datetime.timedelta(
             seconds=self._key_ttl_seconds
         ):
             return False

{iaptoolkit-0.3.7a2 → iaptoolkit-0.3.7a4}/src/iaptoolkit/jwt/verify_async.py

@@ -24,9 +24,8 @@ class GoogleIAPKeys_Async(GoogleIAPKeys):
     _key_ttl_seconds: int = 300  # 5 mins
     _certs: dict
 
-    async def __init__(self, key_ttl_seconds: int = 300) -> None:
+    def __init__(self, key_ttl_seconds: int = 300) -> None:
         self._key_ttl_seconds = key_ttl_seconds
-        await self.refresh_async()
 
     async def refresh_async(self):
         await asyncio.to_thread(self.refresh)
@@ -40,13 +39,19 @@ class GoogleIAPKeys_Async(GoogleIAPKeys):
 
 google_public_keys_async: GoogleIAPKeys_Async | None = None
 
+async def get_google_public_keys() -> GoogleIAPKeys_Async:
+    global google_public_keys_async  # Use as singleton
+    if not google_public_keys_async:
+        google_public_keys_async = GoogleIAPKeys_Async()
+        await google_public_keys_async.refresh_async()
+    return google_public_keys_async
+
+
 
 async def verify_iap_jwt_async(iap_jwt: str, expected_audience: str|None) -> str:
     # Rudimentary async wrapper func for verify_iap_jwt using asyncio threads until google.auth.jwt_async is public
 
-    global google_public_keys_async  # Use as singleton
-    if not google_public_keys_async:
-        google_public_keys_async = GoogleIAPKeys_Async()
+    google_public_keys_async = await get_google_public_keys()
 
     try:
         decoded_jwt = await asyncio.to_thread(