python3-commons 0.17.6__tar.gz → 0.17.8__tar.gz

{python3_commons-0.17.6/src/python3_commons.egg-info → python3_commons-0.17.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.17.6
+Version: 0.17.8
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

{python3_commons-0.17.6 → python3_commons-0.17.8}/src/python3_commons/auth.py

@@ -57,6 +57,8 @@ class OIDCTokenResponse(msgspec.Struct):
     refresh_token: str
     scope: str
     id_token: str
+    error: str | None = None
+    error_description: str | None = None
 
 
 async def fetch_openid_config() -> dict:
@@ -96,17 +98,18 @@ class OIDCAuthError(OIDCError):
     pass
 
 
+# TODO: use api_client
 class OIDCClient:
     def __init__(
             self,
-            token_url: str,
+            authority_url: str,
             client_id: str,
             client_secret: str | None = None,
             *,
             timeout: float = 10.0,
             session: aiohttp.ClientSession | None = None,
     ) -> None:
-        self._token_url = token_url
+        self._token_url = f'{authority_url}/protocol/openid-connect/token'  # TODO: get it from openid-configuration
         self._client_id = client_id
         self._client_secret = client_secret
         self._timeout = aiohttp.ClientTimeout(total=timeout)
@@ -151,7 +154,9 @@ class OIDCClient:
                     data=data,
                     headers={'Content-Type': 'application/x-www-form-urlencoded'},
             ) as resp:
-                payload = await resp.json(content_type=None)
+                payload = await resp.read()
+                decoder = msgspec.json.Decoder(type=OIDCTokenResponse)
+                token = decoder.decode(payload)
 
         except TimeoutError as e:
             msg = 'OIDC request timed out'
@@ -163,8 +168,8 @@ class OIDCClient:
             raise OIDCError(msg) from e
 
         if not resp.ok:
-            error = payload.get('error')
-            description = payload.get('error_description')
+            error = token.error
+            description = token.error_description
 
             if error in {'invalid_grant', 'invalid_client'}:
                 msg = f'{error}: {description}'
@@ -175,4 +180,4 @@ class OIDCClient:
 
             raise OIDCError(msg)
 
-        return payload
+        return token

{python3_commons-0.17.6 → python3_commons-0.17.8/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.17.6
+Version: 0.17.8
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0