refactor: allow any token retriever in the rest client

src/blueapi/client/client.py

@@ -233,7 +233,7 @@ def from_config(cls, config: ApplicationConfig) -> Self:
             session_manager = SessionManager.from_cache(config.auth_token_path)
         except Exception:
             ...  # Swallow exceptions
-        rest = BlueapiRestClient(config.api, session_manager=session_manager)
+        rest = BlueapiRestClient(config.api, token_retreiver=session_manager)
         if config.stomp.enabled:
             assert config.stomp.url.host is not None, "Stomp URL missing host"
             assert config.stomp.url.port is not None, "Stomp URL missing port"

src/blueapi/client/rest.py

@@ -14,7 +14,7 @@
 
 from blueapi import __version__
 from blueapi.config import RestConfig
-from blueapi.service.authentication import JWTAuth, SessionManager
+from blueapi.service.authentication import JWTAuth, TokenRetriever
 from blueapi.service.model import (
     DeviceModel,
     DeviceResponse,
@@ -157,16 +157,16 @@ def _response_json(response: requests.Response) -> Any:
 
 class BlueapiRestClient:
     _config: RestConfig
-    _session_manager: SessionManager | None
+    _token_retreiver: TokenRetriever | None
     _pool: requests.Session
 
     def __init__(
         self,
         config: RestConfig | None = None,
-        session_manager: SessionManager | None = None,
+        token_retreiver: TokenRetriever | None = None,
     ) -> None:
         self._config = config or RestConfig()
-        self._session_manager = session_manager
+        self._token_retreiver = token_retreiver
         self._pool = requests.Session()
 
     def get_plans(self) -> PlanResponse:
@@ -283,7 +283,7 @@ def _request_and_deserialize(
                 json=data,
                 params=params,
                 headers=carr,
-                auth=JWTAuth(self._session_manager),
+                auth=JWTAuth(self._token_retreiver),
             )
         except requests.exceptions.ConnectionError as ce:
             raise ServiceUnavailableError() from ce

src/blueapi/service/authentication.py

@@ -9,7 +9,7 @@
 from functools import cached_property
 from http import HTTPStatus
 from pathlib import Path
-from typing import Any, cast
+from typing import Any, Protocol, cast
 
 import httpx
 import jwt
@@ -24,6 +24,10 @@
 SCOPES = "openid offline_access"
 
 
+class TokenRetriever(Protocol):
+    def get_valid_access_token(self) -> str: ...
+
+
 class CacheManager(ABC):
     @abstractmethod
     def can_access_cache(self) -> bool: ...
@@ -238,7 +242,7 @@ def start_device_flow(self):
 
 
 class JWTAuth(AuthBase):
-    def __init__(self, session_manager: SessionManager | None):
+    def __init__(self, session_manager: TokenRetriever | None):
         self.token: str = (
             session_manager.get_valid_access_token() if session_manager else ""
         )

tests/unit_tests/client/test_rest.py

@@ -43,7 +43,7 @@ def rest() -> BlueapiRestClient:
 @pytest.fixture
 def rest_with_auth(oidc_config: OIDCConfig, tmp_path) -> BlueapiRestClient:
     return BlueapiRestClient(
-        session_manager=SessionManager(
+        token_retreiver=SessionManager(
             server_config=oidc_config,
             cache_manager=SessionCacheManager(tmp_path / "blueapi_cache"),
         )