yaylib 2.2.0__tar.gz → 2.2.1__tar.gz

{yaylib-2.2.0 → yaylib-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yaylib
-Version: 2.2.0
+Version: 2.2.1
 Summary: Yay! API client SDK
 License: MIT
 Keywords: Yay!,yay-api,Yay! API

{yaylib-2.2.0 → yaylib-2.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yaylib"
-version = "2.2.0"
+version = "2.2.1"
 description = "Yay! API client SDK"
 authors = ["ekkx"]
 license = "MIT"

{yaylib-2.2.0 → yaylib-2.2.1}/yaylib/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 
 # import apis into sdk package
 from yaylib.api.activities_api import ActivitiesApi

{yaylib-2.2.0 → yaylib-2.2.1}/yaylib/auth.py

@@ -61,6 +61,9 @@ def _activate_cached_session(client, session: Session) -> None:
     if session.device_uuid:
         client.set_device_uuid(session.device_uuid)
     client.set_login_identity(session.email, session.user_id)
+    # Restore which key refreshes this session (empty → app key) so a
+    # cached web session refreshes with the web key after a restart.
+    client.set_oauth_key(session.oauth_key)
 
 
 async def _login_with_email_web(
@@ -153,13 +156,17 @@ async def _execute_login(
             _activate_cached_session(client, cached)
             return _synthesize_login_response(cached)
 
+    login_key = api_key or client.api_key
     body = LoginEmailUserRequest(
-        api_key=api_key or client.api_key,
+        api_key=login_key,
         email=email,
         password=password,
         uuid=uuid or client.device_uuid,
         two_f_a_code=two_fa_code,
     )
+    # The key that establishes the session also refreshes its tokens;
+    # the fallback switches it to web_api_key below.
+    oauth_key = login_key
 
     try:
         resp = await client.users_api.login_with_email(
@@ -193,6 +200,9 @@ async def _execute_login(
                 extra={"event": "login_fallback", "outcome": "ok"},
             )
             resp = fallback
+            # This session was established with the web key, so its token
+            # refresh must use it too.
+            oauth_key = client.web_api_key
         else:
             raise api_err
 
@@ -201,6 +211,7 @@ async def _execute_login(
     user_id = resp.user_id or 0
     client.set_tokens(access, refresh)
     client.set_login_identity(email, user_id)
+    client.set_oauth_key(oauth_key)
 
     if client.session_store is not None:
         session = Session(
@@ -209,6 +220,7 @@ async def _execute_login(
             access_token=access,
             refresh_token=refresh,
             device_uuid=client.device_uuid,
+            oauth_key=client._session_oauth_key(),
             updated_at="",
         )
         try:

{yaylib-2.2.0 → yaylib-2.2.1}/yaylib/client.py

@@ -173,6 +173,10 @@ class Client(GeneratedFacade):
         self._tokens: Tokens = empty_tokens()
         self._user_id = 0
         self._current_email = ""
+        # API key that established the active session, used as the Basic
+        # credential for OAuth token refresh. Empty means "use api_key";
+        # becomes web_api_key for a browser-login session (§6.2).
+        self._oauth_key = ""
         self._client_ip = ""
         self._client_ip_fetching = False
         self._bg_tasks: "set[asyncio.Task]" = set()
@@ -191,6 +195,7 @@ class Client(GeneratedFacade):
                 api_key=self.api_key,
                 client_ip=lambda: self._client_ip,
                 access_token=lambda: self._tokens.access,
+                oauth_key=lambda: self._oauth_key_snapshot(),
                 cassandra_base_url=self.cassandra_base_url,
                 logger=self._logger,
             ),
@@ -259,6 +264,22 @@ class Client(GeneratedFacade):
         self._current_email = email
         self._user_id = user_id
 
+    def set_oauth_key(self, key: str) -> None:
+        """Internal — record the key that established the session (see
+        _oauth_key). Passing "" resets to the default (api_key)."""
+        self._oauth_key = key
+
+    def _oauth_key_snapshot(self) -> str:
+        """Basic credential for OAuth token refresh: the session's
+        oauth_key, or api_key when none was recorded."""
+        return self._oauth_key or self.api_key
+
+    def _session_oauth_key(self) -> str:
+        """Value to persist in Session.oauth_key: empty for a default
+        (app) session, the actual key for a web / pinned session."""
+        k = self._oauth_key_snapshot()
+        return k if k != self.api_key else ""
+
     def set_device_uuid(self, uuid: str) -> None:
         """Internal — used by auth.py when a restored session carries a
         persisted device UUID (PORTING.md §14)."""
@@ -611,7 +632,12 @@ class Client(GeneratedFacade):
         url = f"{self.base_url}/api/v1/oauth/token"
         import base64
 
-        basic = base64.b64encode(self.api_key.encode("utf-8")).decode("ascii")
+        # Basic credential is the key that established this session (app
+        # key, or web_api_key for a browser-login session) — refreshing a
+        # web session with the app key would 401.
+        basic = base64.b64encode(
+            self._oauth_key_snapshot().encode("utf-8")
+        ).decode("ascii")
         form = urlencode(
             {
                 "grant_type": "refresh_token",
@@ -672,6 +698,7 @@ class Client(GeneratedFacade):
                 access_token=self._tokens.access,
                 refresh_token=self._tokens.refresh,
                 device_uuid=self._device_uuid,
+                oauth_key=self._session_oauth_key(),
                 updated_at="",
             )
             try:

{yaylib-2.2.0 → yaylib-2.2.1}/yaylib/session.py

@@ -31,6 +31,11 @@ class Session:
     access_token: str = ""
     refresh_token: str = ""
     device_uuid: str = ""
+    # API key used to refresh this session's tokens. Empty means the
+    # default app key; set for sessions obtained via the browser-login
+    # fallback. Absent on older session files, which restore as app
+    # sessions.
+    oauth_key: str = ""
     updated_at: str = ""  # RFC3339
 
 

{yaylib-2.2.0 → yaylib-2.2.1}/yaylib/session_file.py

@@ -36,6 +36,7 @@ def _session_from_dict(email: str, raw: dict) -> Session:
         access_token=raw.get("access_token") or "",
         refresh_token=raw.get("refresh_token") or "",
         device_uuid=raw.get("device_uuid") or "",
+        oauth_key=raw.get("oauth_key") or "",
         updated_at=raw.get("updated_at") or "",
     )
 
@@ -72,9 +73,12 @@ class FileSessionStore(SessionStore):
             data = self._read_all()
             record = dataclasses.asdict(session)
             record["updated_at"] = session.updated_at or _now_rfc3339()
-            data["sessions"][session.email] = {
-                k: record[k] for k in _FIELDS
-            }
+            out = {k: record[k] for k in _FIELDS}
+            # Omit oauth_key for default (app) sessions so their files stay
+            # unchanged; write it only for web / caller-pinned sessions.
+            if session.oauth_key:
+                out["oauth_key"] = session.oauth_key
+            data["sessions"][session.email] = out
             self._write_all(data)
 
     async def delete(self, email: str) -> None:

{yaylib-2.2.0 → yaylib-2.2.1}/yaylib/transport.py

@@ -100,6 +100,10 @@ class TransportContext:
     api_key: str
     client_ip: Callable[[], str]
     access_token: Callable[[], str]
+    # Basic credential for the OAuth token endpoint: the key that
+    # established the active session (api_key, or web_api_key for a
+    # browser-login session). See PORTING.md §6.2.
+    oauth_key: Callable[[], str]
     # Auxiliary host for activity-feed operations (see
     # yaylib._host_routes). The transport rewrites the request origin to
     # this for host-routed operations; everything else stays on the
@@ -280,7 +284,7 @@ class Transport:
         if _find_header(headers, "authorization") is None:
             if _is_oauth_token_path(url):
                 token = base64.b64encode(
-                    ctx.api_key.encode("utf-8")
+                    ctx.oauth_key().encode("utf-8")
                 ).decode("ascii")
                 headers["Authorization"] = f"Basic {token}"
             else: