π The fast, Pythonic way to build MCP servers and clients.
fixes #1398: Add JWT claims to AccessToken (#1399)
Panos Argyrakisc3f462369067
diff --git a/src/fastmcp/server/auth/auth.py b/src/fastmcp/server/auth/auth.pyindex d1e1271c5..a41d19fdb 100644--- a/src/fastmcp/server/auth/auth.py+++ b/src/fastmcp/server/auth/auth.py@@ -1,7 +1,11 @@from __future__ import annotations+from typing import Any++from mcp.server.auth.provider import (+ AccessToken as _SDKAccessToken,+)from mcp.server.auth.provider import (- AccessToken,AuthorizationCode,OAuthAuthorizationServerProvider,RefreshToken,@@ -21,6 +25,12 @@ from pydantic import AnyHttpUrlfrom starlette.routing import Route+class AccessToken(_SDKAccessToken):+ """AccessToken that includes all JWT claims."""++ claims: dict[str, Any] = {}++class AuthProvider(TokenVerifierProtocol):"""Base class for all FastMCP authentication providers.diff --git a/src/fastmcp/server/auth/providers/jwt.py b/src/fastmcp/server/auth/providers/jwt.pyindex 0a213099b..bb4470603 100644--- a/src/fastmcp/server/auth/providers/jwt.py+++ b/src/fastmcp/server/auth/providers/jwt.py@@ -11,12 +11,12 @@ from authlib.jose import JsonWebKey, JsonWebTokenfrom authlib.jose.errors import JoseErrorfrom cryptography.hazmat.primitives import serializationfrom cryptography.hazmat.primitives.asymmetric import rsa-from mcp.server.auth.provider import AccessTokenfrom pydantic import AnyHttpUrl, SecretStrfrom pydantic_settings import BaseSettings, SettingsConfigDictfrom typing_extensions import TypedDictfrom fastmcp.server.auth import TokenVerifier+from fastmcp.server.auth.auth import AccessTokenfrom fastmcp.server.auth.registry import register_providerfrom fastmcp.utilities.logging import get_loggerfrom fastmcp.utilities.types import NotSet, NotSetT@@ -448,6 +448,7 @@ class JWTVerifier(TokenVerifier):client_id=str(client_id),scopes=scopes,expires_at=int(exp) if exp else None,+ claims=claims,)except JoseError:@@ -535,4 +536,5 @@ class StaticTokenVerifier(TokenVerifier):client_id=token_data["client_id"],scopes=scopes,expires_at=expires_at,+ claims=token_data,)diff --git a/src/fastmcp/server/dependencies.py b/src/fastmcp/server/dependencies.pyindex 7b288573b..9e08622ce 100644--- a/src/fastmcp/server/dependencies.py+++ b/src/fastmcp/server/dependencies.py@@ -2,10 +2,13 @@ from __future__ import annotationsfrom typing import TYPE_CHECKING, ParamSpec, TypeVar-from mcp.server.auth.middleware.auth_context import get_access_token-from mcp.server.auth.provider import AccessToken+from mcp.server.auth.middleware.auth_context import (+ get_access_token as _sdk_get_access_token,+)from starlette.requests import Request+from fastmcp.server.auth.auth import AccessToken+if TYPE_CHECKING:from fastmcp.server.context import Context@@ -94,3 +97,30 @@ def get_http_headers(include_all: bool = False) -> dict[str, str]:return headersexcept RuntimeError:return {}+++# --- Access Token ---+++def get_access_token() -> AccessToken | None:+ """+ Get the FastMCP access token from the current context.++ Returns:+ The access token if an authenticated user is available, None otherwise.+ """+ #+ obj = _sdk_get_access_token()+ if obj is None or isinstance(obj, AccessToken):+ return obj++ # If the object is not a FastMCP AccessToken, convert it to one if the fields are compatible+ # This is a workaround for the case where the SDK returns a different type+ # If it fails, it will raise a TypeError+ try:+ return AccessToken(**obj.model_dump())+ except Exception as e:+ raise TypeError(+ f"Expected fastmcp.server.auth.auth.AccessToken, got {type(obj).__name__}. "+ "Ensure the SDK is using the correct AccessToken type."+ ) from ediff --git a/tests/server/auth/test_jwt_provider.py b/tests/server/auth/test_jwt_provider.pyindex 79d99d6b9..cf58e8288 100644--- a/tests/server/auth/test_jwt_provider.py+++ b/tests/server/auth/test_jwt_provider.py@@ -141,15 +141,25 @@ class TestBearerTokenJWKS:url="https://test.example.com/.well-known/jwks.json",json=mock_jwks_data,)++ username = "test-user"+ issuer = "https://test.example.com"+ audience = "https://api.example.com"+token = rsa_key_pair.create_token(- subject="test-user",- issuer="https://test.example.com",- audience="https://api.example.com",+ subject=username,+ issuer=issuer,+ audience=audience,)access_token = await jwks_provider.load_access_token(token)assert access_token is not None- assert access_token.client_id == "test-user"+ assert access_token.client_id == username++ # ensure the raw claims are present - #1398+ assert access_token.claims.get("sub") == username+ assert access_token.claims.get("iss") == issuer+ assert access_token.claims.get("aud") == audienceasync def test_jwks_token_validation_with_invalid_key(self,diff --git a/tests/server/auth/test_remote_auth_provider.py b/tests/server/auth/test_remote_auth_provider.pyindex f65d793dc..4e9414137 100644--- a/tests/server/auth/test_remote_auth_provider.py+++ b/tests/server/auth/test_remote_auth_provider.py@@ -1,10 +1,9 @@import httpximport pytest-from mcp.server.auth.provider import AccessTokenfrom pydantic import AnyHttpUrlfrom fastmcp import FastMCP-from fastmcp.server.auth.auth import RemoteAuthProvider, TokenVerifier+from fastmcp.server.auth.auth import AccessToken, RemoteAuthProvider, TokenVerifierclass SimpleTokenVerifier(TokenVerifier):diff --git a/tests/server/auth/test_static_token_verifier.py b/tests/server/auth/test_static_token_verifier.pyindex eadc5e896..e4f6df75a 100644--- a/tests/server/auth/test_static_token_verifier.py+++ b/tests/server/auth/test_static_token_verifier.py@@ -1,9 +1,9 @@"""Tests for StaticTokenVerifier integration with FastMCP."""import httpx-from mcp.server.auth.provider import AccessTokenfrom fastmcp.server import FastMCP+from fastmcp.server.auth.auth import AccessTokenfrom fastmcp.server.auth.providers.jwt import StaticTokenVerifierdiff --git a/tests/server/http/test_bearer_auth_backend.py b/tests/server/http/test_bearer_auth_backend.pyindex f9ac065ca..a3469733d 100644--- a/tests/server/http/test_bearer_auth_backend.py+++ b/tests/server/http/test_bearer_auth_backend.py@@ -2,9 +2,9 @@import pytestfrom mcp.server.auth.middleware.bearer_auth import BearerAuthBackend-from mcp.server.auth.provider import AccessTokenfrom starlette.requests import HTTPConnection+from fastmcp.server.auth.auth import AccessTokenfrom fastmcp.server.auth.providers.jwt import JWTVerifier, RSAKeyPair