fastapi-multiauth 0.2.0__tar.gz → 0.3.0__tar.gz

{fastapi_multiauth-0.2.0 → fastapi_multiauth-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-multiauth
-Version: 0.2.0
+Version: 0.3.0
 Summary: Composable authentication sources for FastAPI: bring your own validator, combine multiple schemes, correct OpenAPI by construction
 Keywords: fastapi,authentication,security,oauth,api-key,bearer,cookie
 Author: d3vyce

fastapi_multiauth-0.3.0/pyproject.toml

@@ -0,0 +1,106 @@
+[project]
+name = "fastapi-multiauth"
+version = "0.3.0"
+description = "Composable authentication sources for FastAPI: bring your own validator, combine multiple schemes, correct OpenAPI by construction"
+readme = "README.md"
+license = "MIT"
+license-files = ["LICENSE"]
+requires-python = ">=3.10"
+keywords = [
+    "fastapi",
+    "authentication",
+    "security",
+    "oauth",
+    "api-key",
+    "bearer",
+    "cookie",
+]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Framework :: AsyncIO",
+    "Framework :: FastAPI",
+    "Intended Audience :: Developers",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Internet :: WWW/HTTP :: Session",
+    "Topic :: Security",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Software Development :: Libraries",
+    "Typing :: Typed",
+]
+dependencies = [
+    "anyio>=3.7",
+    "async-lru>=2.0",
+    "fastapi>=0.100.0",
+    "httpx>=0.25.0",
+    "itsdangerous>=2.1",
+]
+
+[[project.authors]]
+name = "d3vyce"
+email = "contact@d3vyce.fr"
+
+[project.urls]
+Homepage = "https://github.com/d3vyce/fastapi-multiauth"
+Documentation = "https://fastapi-multiauth.d3vyce.fr/"
+Repository = "https://github.com/d3vyce/fastapi-multiauth"
+Issues = "https://github.com/d3vyce/fastapi-multiauth/issues"
+
+[project.optional-dependencies]
+jwt = ["pyjwt[crypto]>=2.13.0"]
+oauth = ["httpx-oauth>=0.16"]
+
+[dependency-groups]
+dev = [
+    { include-group = "tests" },
+    { include-group = "docs" },
+    "fastapi_multiauth[jwt,oauth]",
+    "prek>=0.3.8",
+    "ruff>=0.1.0",
+    "ty>=0.0.34",
+]
+tests = [
+    "coverage>=7.0.0",
+    "pytest-anyio>=0.0.0",
+    "pytest-cov>=4.0.0",
+    "pytest>=8.0.0",
+    "respx>=0.22",
+]
+docs = [
+    "mkdocstrings-python>=2.0.2",
+    "zensical>=0.0.30",
+]
+
+[build-system]
+requires = ["uv_build>=0.11.21,<0.13.0"]
+build-backend = "uv_build"
+
+[tool.ruff.lint]
+extend-select = ["S"]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/**" = [
+    "S",
+    "B008",
+]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+anyio_mode = "auto"
+filterwarnings = ["ignore::DeprecationWarning"]
+
+[tool.coverage.run]
+source = ["src/fastapi_multiauth"]
+branch = true
+
+[tool.coverage.report]
+exclude_lines = [
+    "pragma: no cover",
+    "if TYPE_CHECKING:",
+    "raise NotImplementedError",
+]

fastapi_multiauth-0.2.0/pyproject.toml → fastapi_multiauth-0.3.0/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "fastapi-multiauth"
-version = "0.2.0"
+version = "0.3.0"
 description = "Composable authentication sources for FastAPI: bring your own validator, combine multiple schemes, correct OpenAPI by construction"
 readme = "README.md"
 license = "MIT"
@@ -72,7 +72,7 @@ docs = [
 ]
 
 [build-system]
-requires = ["uv_build>=0.11.21,<0.12.0"]
+requires = ["uv_build>=0.11.21,<0.13.0"]
 build-backend = "uv_build"
 
 [tool.ruff.lint]

{fastapi_multiauth-0.2.0 → fastapi_multiauth-0.3.0}/src/fastapi_multiauth/__init__.py

@@ -23,7 +23,7 @@ from .sources import (
 )
 from .utils import hash_token, verify_token_hash
 
-__version__ = "0.2.0"
+__version__ = "0.3.0"
 
 __all__ = [
     "APIKeyCookieAuth",

{fastapi_multiauth-0.2.0 → fastapi_multiauth-0.3.0}/src/fastapi_multiauth/_http.py

@@ -1,5 +1,6 @@
 """Shared HTTP transport hygiene for the OAuth and JWT modules."""
 
+import contextlib
 import json
 from typing import Any
 from urllib.parse import urlsplit
@@ -31,11 +32,16 @@ async def _get_json(
     error_cls: type[Exception],
     description: str,
     headers: dict[str, str] | None = None,
+    client: httpx.AsyncClient | None = None,
 ) -> Any:
     """GET *url* and decode the JSON body, mapping failures to *error_cls*."""
-    async with httpx.AsyncClient(timeout=timeout) as client:
+    async with (
+        contextlib.nullcontext(client)
+        if client is not None
+        else httpx.AsyncClient(timeout=timeout)
+    ) as http:
         try:
-            resp = await client.get(url, headers=headers)
+            resp = await http.get(url, headers=headers)
             resp.raise_for_status()
             return resp.json()
         except httpx.HTTPError as exc:

{fastapi_multiauth-0.2.0 → fastapi_multiauth-0.3.0}/src/fastapi_multiauth/jwt.py

@@ -149,7 +149,7 @@ class JWTValidator:
                 leeway=self._leeway,
                 options=self._decode_options,
             )
-        except self._jwt.InvalidTokenError:
+        except (self._jwt.exceptions.PyJWTError, TypeError, ValueError):
             raise UnauthorizedError() from None
         if scopes:
             missing = set(scopes) - self._granted_scopes(claims)

{fastapi_multiauth-0.2.0 → fastapi_multiauth-0.3.0}/src/fastapi_multiauth/oauth/client.py

@@ -1,5 +1,6 @@
 """OAuth 2.0 / OIDC network operations: discovery, code exchange, userinfo."""
 
+import contextlib
 import functools
 from typing import Any, Literal, NamedTuple
 
@@ -74,6 +75,7 @@ def _oauth2_client_class() -> type:
             access_token_endpoint: str,
             timeout: float,
             token_endpoint_auth_method: TokenEndpointAuthMethod,
+            client: httpx.AsyncClient | None,
         ) -> None:
             super().__init__(
                 client_id,
@@ -85,8 +87,13 @@ def _oauth2_client_class() -> type:
                 token_endpoint_auth_method=token_endpoint_auth_method,
             )
             self._timeout = timeout
+            self._client = client
 
-        def get_httpx_client(self) -> httpx.AsyncClient:
+        def get_httpx_client(self) -> Any:
+            # httpx-oauth only uses the return value as an async context
+            # manager, so a borrowed client is wrapped to survive the exit.
+            if self._client is not None:
+                return contextlib.nullcontext(self._client)
             return httpx.AsyncClient(timeout=self._timeout)
 
     return _TimeoutOAuth2
@@ -159,6 +166,7 @@ async def oauth_exchange_code(
     code_verifier: str | None = None,
     token_endpoint_auth_method: TokenEndpointAuthMethod = "client_secret_post",  # noqa: S107 — method name, not a secret
     timeout: float = DEFAULT_TIMEOUT,
+    client: httpx.AsyncClient | None = None,
 ) -> dict[str, Any]:
     """Exchange an authorization code for tokens and return the token response.
 
@@ -176,7 +184,11 @@ async def oauth_exchange_code(
             (from :func:`~fastapi_multiauth.oauth.oauth_generate_pkce_pair`).
         token_endpoint_auth_method: How credentials are sent — in the POST body
             (``client_secret_post``, default) or as a Basic header.
-        timeout: Timeout in seconds for the token request.
+        timeout: Timeout in seconds for the token request. Ignored when
+            *client* is provided.
+        client: Optional ``httpx.AsyncClient`` to reuse (connection pooling
+            across the login flow). Borrowed, not closed; its own configuration
+            (timeouts included) governs the request.
 
     Returns:
         The full token response as a ``dict`` (``access_token`` plus whatever
@@ -190,7 +202,7 @@ async def oauth_exchange_code(
     _require_https(token_url, "OAuth token_url")
 
     oauth_client = _oauth2_client_class()(
-        client_id, client_secret, token_url, timeout, token_endpoint_auth_method
+        client_id, client_secret, token_url, timeout, token_endpoint_auth_method, client
     )
     try:
         token_data = await oauth_client.get_access_token(
@@ -221,13 +233,18 @@ async def oauth_fetch_userinfo(
     userinfo_url: str,
     access_token: str,
     timeout: float = DEFAULT_TIMEOUT,
+    client: httpx.AsyncClient | None = None,
 ) -> dict[str, Any]:
     """Fetch the userinfo payload with a bearer access token.
 
     Args:
         userinfo_url: Provider's userinfo endpoint.
         access_token: Access token from :func:`oauth_exchange_code`.
-        timeout: Timeout in seconds for the userinfo request.
+        timeout: Timeout in seconds for the userinfo request. Ignored when
+            *client* is provided.
+        client: Optional ``httpx.AsyncClient`` to reuse (connection pooling
+            across the login flow). Borrowed, not closed; its own configuration
+            (timeouts included) governs the request.
 
     Returns:
         The JSON payload returned by the userinfo endpoint as a plain ``dict``.
@@ -243,4 +260,5 @@ async def oauth_fetch_userinfo(
         error_cls=OAuthUserinfoError,
         description="userinfo",
         headers={"Authorization": f"Bearer {access_token}"},
+        client=client,
     )