Rename AuthInfo to AccessToken

Author: praboud-ant

src/mcp/server/auth/handlers/revoke.py

@@ -14,7 +14,7 @@
     AuthenticationError,
     ClientAuthenticator,
 )
-from mcp.server.auth.provider import AuthInfo, OAuthServerProvider, RefreshToken
+from mcp.server.auth.provider import AccessToken, OAuthServerProvider, RefreshToken
 
 
 class RevocationRequest(BaseModel):
@@ -75,7 +75,7 @@ async def handle(self, request: Request) -> Response:
         if revocation_request.token_type_hint == "refresh_token":
             loaders = reversed(loaders)
 
-        token: None | AuthInfo | RefreshToken = None
+        token: None | AccessToken | RefreshToken = None
         for loader in loaders:
             token = await loader(revocation_request.token)
             if token is not None:

src/mcp/server/auth/middleware/auth_context.py

@@ -5,7 +5,7 @@
 from starlette.responses import Response
 
 from mcp.server.auth.middleware.bearer_auth import AuthenticatedUser
-from mcp.server.auth.provider import AuthInfo
+from mcp.server.auth.provider import AccessToken
 
 # Create a contextvar to store the authenticated user
 # The default is None, indicating no authenticated user is present
@@ -14,15 +14,15 @@
 )
 
 
-def get_current_auth_info() -> AuthInfo | None:
+def get_access_token() -> AccessToken | None:
     """
-    Get the auth info from the current context.
+    Get the access token from the current context.
 
     Returns:
-        The auth info if an authenticated user is available, None otherwise.
+        The access token if an authenticated user is available, None otherwise.
     """
     auth_user = auth_context_var.get()
-    return auth_user.auth_info if auth_user else None
+    return auth_user.access_token if auth_user else None
 
 
 class AuthContextMiddleware(BaseHTTPMiddleware):

src/mcp/server/auth/middleware/bearer_auth.py

@@ -10,15 +10,15 @@
 from starlette.requests import HTTPConnection
 from starlette.types import Scope
 
-from mcp.server.auth.provider import AuthInfo, OAuthServerProvider
+from mcp.server.auth.provider import AccessToken, OAuthServerProvider
 
 
 class AuthenticatedUser(SimpleUser):
     """User with authentication info."""
 
-    def __init__(self, auth_info: AuthInfo):
+    def __init__(self, auth_info: AccessToken):
         super().__init__(auth_info.client_id)
-        self.auth_info = auth_info
+        self.access_token = auth_info
         self.scopes = auth_info.scopes
 
 

src/mcp/server/auth/provider.py

@@ -33,7 +33,7 @@ class RefreshToken(BaseModel):
     expires_at: int | None = None
 
 
-class AuthInfo(BaseModel):
+class AccessToken(BaseModel):
     token: str
     client_id: str
     scopes: list[str]
@@ -91,7 +91,7 @@ class TokenError(Exception):
 # OK to add fields to subclasses which should not be exposed externally.
 AuthorizationCodeT = TypeVar("AuthorizationCodeT", bound=AuthorizationCode)
 RefreshTokenT = TypeVar("RefreshTokenT", bound=RefreshToken)
-AuthInfoT = TypeVar("AuthInfoT", bound=AuthInfo)
+AuthInfoT = TypeVar("AuthInfoT", bound=AccessToken)
 
 
 class OAuthServerProvider(

tests/server/fastmcp/auth/test_auth_integration.py

@@ -18,7 +18,7 @@
 from starlette.applications import Starlette
 
 from mcp.server.auth.provider import (
-    AuthInfo,
+    AccessToken,
     AuthorizationCode,
     AuthorizationParams,
     OAuthServerProvider,
@@ -88,7 +88,7 @@ async def exchange_authorization_code(
         refresh_token = f"refresh_{secrets.token_hex(32)}"
 
         # Store the tokens
-        self.tokens[access_token] = AuthInfo(
+        self.tokens[access_token] = AccessToken(
             token=access_token,
             client_id=client.client_id,
             scopes=authorization_code.scopes,
@@ -151,7 +151,7 @@ async def exchange_refresh_token(
         new_refresh_token = f"refresh_{secrets.token_hex(32)}"
 
         # Store the new tokens
-        self.tokens[new_access_token] = AuthInfo(
+        self.tokens[new_access_token] = AccessToken(
             token=new_access_token,
             client_id=client.client_id,
             scopes=scopes or token_info.scopes,
@@ -172,27 +172,27 @@ async def exchange_refresh_token(
             refresh_token=new_refresh_token,
         )
 
-    async def load_access_token(self, token: str) -> AuthInfo | None:
+    async def load_access_token(self, token: str) -> AccessToken | None:
         token_info = self.tokens.get(token)
 
         # Check if token is expired
         # if token_info.expires_at < int(time.time()):
         #     raise InvalidTokenError("Access token has expired")
 
-        return token_info and AuthInfo(
+        return token_info and AccessToken(
             token=token,
             client_id=token_info.client_id,
             scopes=token_info.scopes,
             expires_at=token_info.expires_at,
         )
 
-    async def revoke_token(self, token: AuthInfo | RefreshToken) -> None:
+    async def revoke_token(self, token: AccessToken | RefreshToken) -> None:
         match token:
             case RefreshToken():
                 # Remove the refresh token
                 del self.refresh_tokens[token.token]
 
-            case AuthInfo():
+            case AccessToken():
                 # Remove the access token
                 del self.tokens[token.token]