python-daynest 0.1.2__tar.gz → 0.1.3__tar.gz

{python_daynest-0.1.2 → python_daynest-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-daynest
-Version: 0.1.2
+Version: 0.1.3
 Summary: Python client library for the Daynest API
 License: MIT
 Requires-Python: >=3.12

{python_daynest-0.1.2 → python_daynest-0.1.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-daynest"
-version = "0.1.2"
+version = "0.1.3"
 description = "Python client library for the Daynest API"
 requires-python = ">=3.12"
 license = { text = "MIT" }

{python_daynest-0.1.2 → python_daynest-0.1.3}/src/daynest/client.py

@@ -3,8 +3,9 @@
 from __future__ import annotations
 
 import logging
+import inspect
 import time
-from collections.abc import Callable, Mapping
+from collections.abc import Awaitable, Callable, Mapping
 from datetime import date
 from typing import Any, TypeVar
 from urllib.parse import urljoin
@@ -56,6 +57,7 @@ class DaynestClient:
         client_id: str | None = None,
         client_secret: str | None = None,
         token_url: str | None = None,
+        access_token_getter: Callable[[], str | None | Awaitable[str | None]] | None = None,
     ) -> None:
         if base_url is not None and not base_url.strip():
             msg = "A base URL is required to initialize DaynestClient"
@@ -65,6 +67,7 @@ class DaynestClient:
         self._client_id = client_id
         self._client_secret = client_secret
         self._token_url = token_url
+        self._access_token_getter = access_token_getter
         self._cached_token: str | None = None
         self._token_expires_at: float = 0.0
         self._session = session
@@ -93,6 +96,17 @@ class DaynestClient:
         """Return whether the client has OAuth client credentials configured."""
         return bool(self._client_id and self._client_secret and self._token_url)
 
+    async def _get_external_access_token(self) -> str | None:
+        """Return an externally managed OAuth access token, if configured."""
+        if self._access_token_getter is None:
+            return None
+        token = self._access_token_getter()
+        if inspect.isawaitable(token):
+            token = await token
+        if not token:
+            return None
+        return token
+
     async def _fetch_oauth_token(self) -> str:
         """Exchange client credentials for an access token."""
         session = self._session_or_raise()
@@ -136,6 +150,8 @@ class DaynestClient:
 
     async def _get_auth_headers(self) -> dict[str, str]:
         """Return auth headers for an API request."""
+        if external_token := await self._get_external_access_token():
+            return {"Authorization": f"Bearer {external_token}"}
         if self.has_oauth_credentials:
             if not self._cached_token or time.monotonic() >= self._token_expires_at:
                 await self._fetch_oauth_token()

{python_daynest-0.1.2 → python_daynest-0.1.3}/tests/test_client.py

@@ -298,6 +298,36 @@ class TestDaynestClientRequests:
 
         assert await client._get_auth_headers() == {"Authorization": "Bearer access-token"}
 
+    async def test_external_access_token_getter_is_used_before_other_auth_modes(self) -> None:
+        response = _make_mock_response(200, {"access_token": "ignored-token", "expires_in": "300"})
+        session = MagicMock(spec=aiohttp.ClientSession)
+        session.post = MagicMock(return_value=response)
+        client = DaynestClient(
+            base_url="https://api.example",
+            integration_key="legacy-key",
+            client_id="integration-client",
+            client_secret="client-secret",
+            token_url="https://auth.example/token",
+            access_token_getter=lambda: "oidc-access-token",
+            session=session,
+        )
+
+        assert await client._get_auth_headers() == {"Authorization": "Bearer oidc-access-token"}
+        session.post.assert_not_called()
+
+    async def test_external_access_token_getter_supports_async_callback(self) -> None:
+        async def _token() -> str:
+            return "async-token"
+
+        session = MagicMock(spec=aiohttp.ClientSession)
+        client = DaynestClient(
+            base_url="https://api.example",
+            access_token_getter=_token,
+            session=session,
+        )
+
+        assert await client._get_auth_headers() == {"Authorization": "Bearer async-token"}
+
     async def test_client_error_raises_communication_error(self) -> None:
         session = MagicMock(spec=aiohttp.ClientSession)
         mock_ctx = MagicMock()