Reorganize AuthInfo

Author: praboud-ant

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

@@ -10,8 +10,7 @@
 from starlette.requests import HTTPConnection
 from starlette.types import Scope
 
-from mcp.server.auth.provider import OAuthServerProvider
-from mcp.server.auth.types import AuthInfo
+from mcp.server.auth.provider import AuthInfo, OAuthServerProvider
 
 
 class AuthenticatedUser(SimpleUser):

src/mcp/server/auth/provider.py

@@ -3,7 +3,6 @@
 
 from pydantic import AnyHttpUrl, BaseModel
 
-from mcp.server.auth.types import AuthInfo
 from mcp.shared.auth import (
     OAuthClientInformationFull,
     OAuthToken,
@@ -33,6 +32,13 @@ class RefreshToken(BaseModel):
     expires_at: int | None = None
 
 
+class AuthInfo(BaseModel):
+    token: str
+    client_id: str
+    scopes: list[str]
+    expires_at: int | None = None
+
+
 class OAuthRegisteredClientsStore(Protocol):
     async def get_client(self, client_id: str) -> OAuthClientInformationFull | None:
         """

src/mcp/server/auth/types.py

@@ -20,6 +20,7 @@
 from starlette.routing import Mount
 
 from mcp.server.auth.provider import (
+    AuthInfo,
     AuthorizationCode,
     AuthorizationParams,
     OAuthRegisteredClientsStore,
@@ -32,7 +33,6 @@
     RevocationOptions,
     create_auth_router,
 )
-from mcp.server.auth.types import AuthInfo
 from mcp.server.fastmcp import FastMCP
 from mcp.shared.auth import (
     OAuthClientInformationFull,