Update to use Python 3.10 types

Author: praboud-ant

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

@@ -5,7 +5,7 @@
 """
 
 import logging
-from typing import Callable, Literal, Optional, Union
+from typing import Callable, Literal
 from urllib.parse import urlencode, urlparse, urlunparse
 
 from pydantic import AnyHttpUrl, AnyUrl, BaseModel, Field, RootModel, ValidationError
@@ -44,8 +44,8 @@ class AuthorizationRequest(BaseModel):
     code_challenge_method: Literal["S256"] = Field(
         "S256", description="PKCE code challenge method, must be S256"
     )
-    state: Optional[str] = Field(None, description="Optional state parameter")
-    scope: Optional[str] = Field(
+    state: str | None = Field(None, description="Optional state parameter")
+    scope: str | None = Field(
         None,
         description="Optional scope; if specified, should be "
         "a space-separated list of scope strings",
@@ -97,14 +97,14 @@ def validate_redirect_uri(
 class ErrorResponse(BaseModel):
     error: ErrorCode
     error_description: str
-    error_uri: Optional[AnyUrl] = None
+    error_uri: AnyUrl | None = None
     # must be set if provided in the request
-    state: Optional[str]
+    state: str | None = None
 
 
 def best_effort_extract_string(
     key: str, params: None | FormData | QueryParams
-) -> Optional[str]:
+) -> str | None:
     if params is None:
         return None
     value = params.get(key)
@@ -257,7 +257,7 @@ async def error_response(
 
 
 def create_error_redirect(
-    redirect_uri: AnyUrl, error: Union[Exception, ErrorResponse]
+    redirect_uri: AnyUrl, error: Exception | ErrorResponse
 ) -> str:
     parsed_uri = urlparse(str(redirect_uri))
 

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

@@ -4,13 +4,13 @@
 Corresponds to TypeScript file: src/server/auth/handlers/metadata.ts
 """
 
-from typing import Any, Callable, Dict
+from typing import Any, Callable
 
 from starlette.requests import Request
 from starlette.responses import JSONResponse, Response
 
 
-def create_metadata_handler(metadata: Dict[str, Any]) -> Callable:
+def create_metadata_handler(metadata: dict[str, Any]) -> Callable:
     """
     Create a handler for OAuth 2.0 Authorization Server Metadata.
 

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

@@ -7,7 +7,7 @@
 import base64
 import hashlib
 import time
-from typing import Annotated, Callable, Literal, Optional, Union
+from typing import Annotated, Callable, Literal
 
 from pydantic import AnyHttpUrl, Field, RootModel, ValidationError
 from starlette.requests import Request
@@ -42,12 +42,12 @@ class RefreshTokenRequest(ClientAuthRequest):
     # See https://datatracker.ietf.org/doc/html/rfc6749#section-6
     grant_type: Literal["refresh_token"]
     refresh_token: str = Field(..., description="The refresh token")
-    scope: Optional[str] = Field(None, description="Optional scope parameter")
+    scope: str | None = Field(None, description="Optional scope parameter")
 
 
 class TokenRequest(RootModel):
     root: Annotated[
-        Union[AuthorizationCodeRequest, RefreshTokenRequest],
+        AuthorizationCodeRequest | RefreshTokenRequest,
         Field(discriminator="grant_type"),
     ]
 

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

@@ -5,13 +5,10 @@
 """
 
 import time
-from typing import Optional
 
 from pydantic import BaseModel
 
-from mcp.server.auth.errors import (
-    InvalidClientError,
-)
+from mcp.server.auth.errors import InvalidClientError
 from mcp.server.auth.provider import OAuthRegisteredClientsStore
 from mcp.shared.auth import OAuthClientInformationFull
 
@@ -25,7 +22,7 @@ class ClientAuthRequest(BaseModel):
     """
 
     client_id: str
-    client_secret: Optional[str] = None
+    client_secret: str | None = None
 
 
 class ClientAuthenticator:

src/mcp/server/auth/provider.py

@@ -4,7 +4,7 @@
 Corresponds to TypeScript file: src/server/auth/provider.ts
 """
 
-from typing import List, Literal, Optional, Protocol
+from typing import Literal, Protocol
 from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
 from pydantic import AnyHttpUrl, BaseModel
@@ -23,8 +23,8 @@ class AuthorizationParams(BaseModel):
     Corresponds to AuthorizationParams in src/server/auth/provider.ts
     """
 
-    state: Optional[str] = None
-    scopes: Optional[List[str]] = None
+    state: str | None = None
+    scopes: list[str] | None = None
     code_challenge: str
     redirect_uri: AnyHttpUrl
 
@@ -41,8 +41,8 @@ class AuthorizationCode(BaseModel):
 class RefreshToken(BaseModel):
     token: str
     client_id: str
-    scopes: List[str]
-    expires_at: Optional[int] = None
+    scopes: list[str]
+    expires_at: int | None = None
 
 
 class OAuthTokenRevocationRequest(BaseModel):
@@ -51,7 +51,7 @@ class OAuthTokenRevocationRequest(BaseModel):
     """
 
     token: str
-    token_type_hint: Optional[Literal["access_token", "refresh_token"]] = None
+    token_type_hint: Literal["access_token", "refresh_token"] | None = None
 
 
 class OAuthRegisteredClientsStore(Protocol):
@@ -61,7 +61,7 @@ class OAuthRegisteredClientsStore(Protocol):
     Corresponds to OAuthRegisteredClientsStore in src/server/auth/clients.ts
     """
 
-    async def get_client(self, client_id: str) -> Optional[OAuthClientInformationFull]:
+    async def get_client(self, client_id: str) -> OAuthClientInformationFull | None:
         """
         Retrieves client information by client ID.
 
@@ -170,7 +170,7 @@ async def exchange_refresh_token(
         self,
         client: OAuthClientInformationFull,
         refresh_token: RefreshToken,
-        scopes: List[str],
+        scopes: list[str],
     ) -> TokenSuccessResponse:
         """
         Exchanges a refresh token for an access token.

src/mcp/server/auth/router.py

@@ -5,7 +5,7 @@
 """
 
 from dataclasses import dataclass
-from typing import Any, Dict, Optional
+from typing import Any
 
 from pydantic import AnyUrl
 from starlette.routing import Route, Router
@@ -23,7 +23,7 @@
 @dataclass
 class ClientRegistrationOptions:
     enabled: bool = False
-    client_secret_expiry_seconds: Optional[int] = None
+    client_secret_expiry_seconds: int | None = None
 
 
 @dataclass
@@ -143,10 +143,10 @@ def create_auth_router(
 
 def build_metadata(
     issuer_url: AnyUrl,
-    service_documentation_url: Optional[AnyUrl],
+    service_documentation_url: AnyUrl | None,
     client_registration_options: ClientRegistrationOptions,
     revocation_options: RevocationOptions,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     issuer_url_str = str(issuer_url).rstrip("/")
     # Create metadata
     metadata = {

src/mcp/server/auth/types.py

@@ -4,8 +4,6 @@
 Corresponds to TypeScript file: src/server/auth/types.ts
 """
 
-from typing import List, Optional
-
 from pydantic import BaseModel
 
 
@@ -18,5 +16,5 @@ class AuthInfo(BaseModel):
 
     token: str
     client_id: str
-    scopes: List[str]
-    expires_at: Optional[int] = None
+    scopes: list[str]
+    expires_at: int | None = None