newapi-python 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

newapi/__init__.py

@@ -72,4 +72,4 @@ __all__ = [
     "ValidationError",
 ]
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"

newapi/_client.py

@@ -218,6 +218,12 @@ class NewAPI:
     ) -> int | None:
         if access_token and session_token:
             raise ConfigurationError("pass either access_token or session_token, not both")
+        if access_token and user_id is None:
+            raise ConfigurationError(
+                "user_id is required when authenticating with an access_token; "
+                "new-api instances reject such requests with 401 "
+                "'Unauthorized, New-Api-User header not provided'"
+            )
         if not session_token or user_id is not None:
             return user_id
         try:
@@ -342,6 +348,8 @@ class NewAPI:
             return
         refresh_token = self._tokens.refresh_token
         headers: dict[str, str] = {"Origin": self._origin()}
+        if self._tokens.user_id is not None:
+            headers[_USER_ID_HEADER] = str(self._tokens.user_id)
         if self._tokens.access_token:
             headers["Authorization"] = f"{self._tokens.token_type} {self._tokens.access_token}"
         try:
@@ -508,16 +516,17 @@ class NewAPI:
         request_headers = {
             "Accept": "application/json",
             "Accept-Language": self.language,
-            "User-Agent": "newapi-python/0.2.0",
+            "User-Agent": "newapi-python/0.3.0",
         }
-        if authenticated and self._tokens.session_token:
-            request_headers["Cookie"] = f"{self._session_cookie}={self._tokens.session_token}"
+        if authenticated:
             if self._tokens.user_id is not None:
                 request_headers[_USER_ID_HEADER] = str(self._tokens.user_id)
-        elif authenticated and self._tokens.access_token:
-            request_headers["Authorization"] = (
-                f"{self._tokens.token_type} {self._tokens.access_token}"
-            )
+            if self._tokens.session_token:
+                request_headers["Cookie"] = f"{self._session_cookie}={self._tokens.session_token}"
+            elif self._tokens.access_token:
+                request_headers["Authorization"] = (
+                    f"{self._tokens.token_type} {self._tokens.access_token}"
+                )
         if refresh_cookie and not self._session_has_refresh_cookie():
             request_headers["Cookie"] = f"{_REFRESH_COOKIE}={refresh_cookie}"
         if headers:
@@ -677,12 +686,19 @@ class NewAPI:
         if isinstance(session, Mapping):
             raw_session_id = session.get("sid")
             session_id = raw_session_id if isinstance(raw_session_id, str) else None
+        user_id = self._tokens.user_id
+        user_data = auth.get("user")
+        if isinstance(user_data, Mapping):
+            raw_user_id = user_data.get("id")
+            if isinstance(raw_user_id, int) and not isinstance(raw_user_id, bool):
+                user_id = raw_user_id
         return SessionTokens(
             access_token=str(auth["access_token"]),
             refresh_token=refresh_token,
             expires_at=expires_at,
             token_type=str(token_type) if token_type else "Bearer",
             session_id=session_id,
+            user_id=user_id,
         )
 
     def _resolve_quota_per_unit(self) -> float:

{newapi_python-0.2.0.dist-info → newapi_python-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: newapi-python
-Version: 0.2.0
+Version: 0.3.0
 Summary: Python client for the user-facing dashboard API of new-api instances
 Author: Eight Labs
 License-Expression: MIT
@@ -55,10 +55,13 @@ client = NewAPI(
     "https://newapi.example.com",
     access_token=os.environ["NEWAPI_ACCESS_TOKEN"],
     refresh_token=os.environ.get("NEWAPI_REFRESH_TOKEN"),
+    user_id=int(os.environ["NEWAPI_USER_ID"]),
 )
 ```
 
-Pass either the instance origin or its full `/api` URL. Tokens are retained only in memory. If a refresh token is supplied, the client sends it as the `new_api_refresh` cookie, rotates the pair after an authenticated `401`, and refreshes proactively when `expires_at` is known. Users can also generate a long-lived system access token from the dashboard and pass it as `access_token` alone; such tokens cannot refresh browser sessions.
+Pass either the instance origin or its full `/api` URL. Tokens are retained only in memory. If a refresh token is supplied, the client sends it as the `new_api_refresh` cookie, rotates the pair after an authenticated `401`, and refreshes proactively when `expires_at` is known.
+
+Users can also generate a long-lived system access token from the dashboard and pass it as `access_token`. Access-token authentication additionally requires `user_id`: new-api instances verify the numeric `New-Api-User` header on every authenticated request and reject requests without it with `401 Unauthorized, New-Api-User header not provided`. The client sends the header automatically from `user_id`, and `login()` and `refresh()` capture the id from the instance's responses. Such tokens cannot refresh browser sessions on their own.
 
 The default browser fingerprint is Chrome. Choose another `curl_cffi` fingerprint or configure proxies by supplying your own `curl_cffi.requests.Session`:
 

{newapi_python-0.2.0.dist-info → newapi_python-0.3.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-newapi/__init__.py,sha256=akvqqEGOVw0ZIeTFAftG6azoTWbzM8iMDxj5sIJmX74,1310
-newapi/_client.py,sha256=O9IbZqqM8HV7I0zslC99M6Mk4PuK0PpLiJHAi1kmHqE,25040
+newapi/__init__.py,sha256=_BZDS3mvNV8s4ckB4x4duVPa5QxruHLHxCeuS5gYc5I,1310
+newapi/_client.py,sha256=ci7AU9R0_IA_xx-Ev01xjv8NMdxgPoJr2dgrMu85zaI,25791
 newapi/_crypto.py,sha256=ocWpBUsQoZlg_dk1Q_vLVKLGEc6I80RpgYlHmLQXZ-I,3902
 newapi/_exceptions.py,sha256=YlZVzYf6VUKSN-fVVvFHfunoNJg6LLcuR2IdHNKzaCg,2049
 newapi/_models.py,sha256=FWUDMqjroiaZLZdj8v_CKcANB6XZZMULrXWdu5mrxE0,6379
 newapi/_resources.py,sha256=IQ1B3QoufC4p8KpXg6NlU9nmUQgTYmncSIYPLoLKYUc,28476
 newapi/_session_blob.py,sha256=GIv4k2H0YrPghNGRg8iY2LZ8kgkFLrlMCpvUtIy35kw,3547
 newapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-newapi_python-0.2.0.dist-info/METADATA,sha256=Ngb5X68FhWICpNHOIq7OaNGhflKG0oHkVnj0_0PGdKE,10937
-newapi_python-0.2.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-newapi_python-0.2.0.dist-info/licenses/LICENSE,sha256=SIZvsDcR9_4_Q4IMiJNqUwZWvdAmwjRHlXIQkXFwCwE,1067
-newapi_python-0.2.0.dist-info/RECORD,,
+newapi_python-0.3.0.dist-info/METADATA,sha256=SFbWbiKQppLpy6HXcJ5uTuVVn-KGoV36wDLyjroxlro,11367
+newapi_python-0.3.0.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+newapi_python-0.3.0.dist-info/licenses/LICENSE,sha256=SIZvsDcR9_4_Q4IMiJNqUwZWvdAmwjRHlXIQkXFwCwE,1067
+newapi_python-0.3.0.dist-info/RECORD,,