Drop Python 3.9 support

fastapi_users/authentication/authenticator.py

@@ -1,7 +1,7 @@
 import re
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from inspect import Parameter, Signature
-from typing import Any, Callable, Generic, Optional, cast
+from typing import Any, Generic, cast
 
 from fastapi import Depends, HTTPException, status
 from makefun import with_signature
@@ -65,9 +65,8 @@ class Authenticator(Generic[models.UP, models.ID]):
         active: bool = False,
         verified: bool = False,
         superuser: bool = False,
-        get_enabled_backends: Optional[
-            EnabledBackendsDependency[models.UP, models.ID]
-        ] = None,
+        get_enabled_backends: EnabledBackendsDependency[models.UP, models.ID]
+        | None = None,
     ):
         """
         Return a dependency callable to retrieve currently authenticated user and token.
@@ -111,9 +110,8 @@ class Authenticator(Generic[models.UP, models.ID]):
         active: bool = False,
         verified: bool = False,
         superuser: bool = False,
-        get_enabled_backends: Optional[
-            EnabledBackendsDependency[models.UP, models.ID]
-        ] = None,
+        get_enabled_backends: EnabledBackendsDependency[models.UP, models.ID]
+        | None = None,
     ):
         """
         Return a dependency callable to retrieve currently authenticated user.
@@ -161,9 +159,9 @@ class Authenticator(Generic[models.UP, models.ID]):
         verified: bool = False,
         superuser: bool = False,
         **kwargs,
-    ) -> tuple[Optional[models.UP], Optional[str]]:
-        user: Optional[models.UP] = None
-        token: Optional[str] = None
+    ) -> tuple[models.UP | None, str | None]:
+        user: models.UP | None = None
+        token: str | None = None
         enabled_backends: Sequence[AuthenticationBackend[models.UP, models.ID]] = (
             kwargs.get("enabled_backends", self.backends)
         )
@@ -193,7 +191,7 @@ class Authenticator(Generic[models.UP, models.ID]):
         return user, token
 
     def _get_dependency_signature(
-        self, get_enabled_backends: Optional[EnabledBackendsDependency] = None
+        self, get_enabled_backends: EnabledBackendsDependency | None = None
     ) -> Signature:
         """
         Generate a dynamic signature for the current_user dependency.

fastapi_users/authentication/strategy/base.py

@@ -1,4 +1,4 @@
-from typing import Generic, Optional, Protocol
+from typing import Generic, Protocol
 
 from fastapi_users import models
 from fastapi_users.manager import BaseUserManager
@@ -10,8 +10,8 @@ class StrategyDestroyNotSupportedError(Exception):
 
 class Strategy(Protocol, Generic[models.UP, models.ID]):
     async def read_token(
-        self, token: Optional[str], user_manager: BaseUserManager[models.UP, models.ID]
-    ) -> Optional[models.UP]: ...  # pragma: no cover
+        self, token: str | None, user_manager: BaseUserManager[models.UP, models.ID]
+    ) -> models.UP | None: ...  # pragma: no cover
 
     async def write_token(self, user: models.UP) -> str: ...  # pragma: no cover
 

fastapi_users/authentication/strategy/db/adapter.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Generic, Optional, Protocol
+from typing import Any, Generic, Protocol
 
 from fastapi_users.authentication.strategy.db.models import AP
 
@@ -8,8 +8,8 @@ class AccessTokenDatabase(Protocol, Generic[AP]):
     """Protocol for retrieving, creating and updating access tokens from a database."""
 
     async def get_by_token(
-        self, token: str, max_age: Optional[datetime] = None
-    ) -> Optional[AP]:
+        self, token: str, max_age: datetime | None = None
+    ) -> AP | None:
         """Get a single access token by token."""
         ...  # pragma: no cover
 

fastapi_users/authentication/strategy/db/strategy.py

@@ -1,6 +1,6 @@
 import secrets
 from datetime import datetime, timedelta, timezone
-from typing import Any, Generic, Optional
+from typing import Any, Generic
 
 from fastapi_users import exceptions, models
 from fastapi_users.authentication.strategy.base import Strategy
@@ -13,14 +13,14 @@ class DatabaseStrategy(
     Strategy[models.UP, models.ID], Generic[models.UP, models.ID, AP]
 ):
     def __init__(
-        self, database: AccessTokenDatabase[AP], lifetime_seconds: Optional[int] = None
+        self, database: AccessTokenDatabase[AP], lifetime_seconds: int | None = None
     ):
         self.database = database
         self.lifetime_seconds = lifetime_seconds
 
     async def read_token(
-        self, token: Optional[str], user_manager: BaseUserManager[models.UP, models.ID]
-    ) -> Optional[models.UP]:
+        self, token: str | None, user_manager: BaseUserManager[models.UP, models.ID]
+    ) -> models.UP | None:
         if token is None:
             return None
 

fastapi_users/authentication/strategy/jwt.py

@@ -1,4 +1,4 @@
-from typing import Generic, Optional
+from typing import Generic
 
 import jwt
 
@@ -21,10 +21,10 @@ class JWTStrategy(Strategy[models.UP, models.ID], Generic[models.UP, models.ID])
     def __init__(
         self,
         secret: SecretType,
-        lifetime_seconds: Optional[int],
+        lifetime_seconds: int | None,
         token_audience: list[str] = ["fastapi-users:auth"],
         algorithm: str = "HS256",
-        public_key: Optional[SecretType] = None,
+        public_key: SecretType | None = None,
     ):
         self.secret = secret
         self.lifetime_seconds = lifetime_seconds
@@ -41,8 +41,8 @@ class JWTStrategy(Strategy[models.UP, models.ID], Generic[models.UP, models.ID])
         return self.public_key or self.secret
 
     async def read_token(
-        self, token: Optional[str], user_manager: BaseUserManager[models.UP, models.ID]
-    ) -> Optional[models.UP]:
+        self, token: str | None, user_manager: BaseUserManager[models.UP, models.ID]
+    ) -> models.UP | None:
         if token is None:
             return None
 

fastapi_users/authentication/strategy/redis.py

@@ -1,5 +1,5 @@
 import secrets
-from typing import Generic, Optional
+from typing import Generic
 
 import redis.asyncio
 
@@ -12,7 +12,7 @@ class RedisStrategy(Strategy[models.UP, models.ID], Generic[models.UP, models.ID
     def __init__(
         self,
         redis: redis.asyncio.Redis,
-        lifetime_seconds: Optional[int] = None,
+        lifetime_seconds: int | None = None,
         *,
         key_prefix: str = "fastapi_users_token:",
     ):
@@ -21,8 +21,8 @@ class RedisStrategy(Strategy[models.UP, models.ID], Generic[models.UP, models.ID
         self.key_prefix = key_prefix
 
     async def read_token(
-        self, token: Optional[str], user_manager: BaseUserManager[models.UP, models.ID]
-    ) -> Optional[models.UP]:
+        self, token: str | None, user_manager: BaseUserManager[models.UP, models.ID]
+    ) -> models.UP | None:
         if token is None:
             return None
 

fastapi_users/authentication/transport/cookie.py

@@ -1,4 +1,4 @@
-from typing import Literal, Optional
+from typing import Literal
 
 from fastapi import Response, status
 from fastapi.security import APIKeyCookie
@@ -13,9 +13,9 @@ class CookieTransport(Transport):
     def __init__(
         self,
         cookie_name: str = "fastapiusersauth",
-        cookie_max_age: Optional[int] = None,
+        cookie_max_age: int | None = None,
         cookie_path: str = "/",
-        cookie_domain: Optional[str] = None,
+        cookie_domain: str | None = None,
         cookie_secure: bool = True,
         cookie_httponly: bool = True,
         cookie_samesite: Literal["lax", "strict", "none"] = "lax",

fastapi_users/db/base.py

@@ -1,4 +1,4 @@
-from typing import Any, Generic, Optional
+from typing import Any, Generic
 
 from fastapi_users.models import ID, OAP, UOAP, UP
 from fastapi_users.types import DependencyCallable
@@ -7,15 +7,15 @@ from fastapi_users.types import DependencyCallable
 class BaseUserDatabase(Generic[UP, ID]):
     """Base adapter for retrieving, creating and updating users from a database."""
 
-    async def get(self, id: ID) -> Optional[UP]:
+    async def get(self, id: ID) -> UP | None:
         """Get a single user by id."""
         raise NotImplementedError()
 
-    async def get_by_email(self, email: str) -> Optional[UP]:
+    async def get_by_email(self, email: str) -> UP | None:
         """Get a single user by email."""
         raise NotImplementedError()
 
-    async def get_by_oauth_account(self, oauth: str, account_id: str) -> Optional[UP]:
+    async def get_by_oauth_account(self, oauth: str, account_id: str) -> UP | None:
         """Get a single user by OAuth account id."""
         raise NotImplementedError()
 

fastapi_users/fastapi_users.py

@@ -1,5 +1,5 @@
 from collections.abc import Sequence
-from typing import Generic, Optional
+from typing import Generic
 
 from fastapi import APIRouter
 
@@ -96,7 +96,7 @@ class FastAPIUsers(Generic[models.UP, models.ID]):
         oauth_client: BaseOAuth2,
         backend: AuthenticationBackend[models.UP, models.ID],
         state_secret: SecretType,
-        redirect_url: Optional[str] = None,
+        redirect_url: str | None = None,
         associate_by_email: bool = False,
         is_verified_by_default: bool = False,
     ) -> APIRouter:
@@ -129,7 +129,7 @@ class FastAPIUsers(Generic[models.UP, models.ID]):
         oauth_client: BaseOAuth2,
         user_schema: type[schemas.U],
         state_secret: SecretType,
-        redirect_url: Optional[str] = None,
+        redirect_url: str | None = None,
         requires_verification: bool = False,
     ) -> APIRouter:
         """

fastapi_users/jwt.py

@@ -1,10 +1,10 @@
 from datetime import datetime, timedelta, timezone
-from typing import Any, Optional, Union
+from typing import Any
 
 import jwt
 from pydantic import SecretStr
 
-SecretType = Union[str, SecretStr]
+SecretType = str | SecretStr
 JWT_ALGORITHM = "HS256"
 
 
@@ -17,7 +17,7 @@ def _get_secret_value(secret: SecretType) -> str:
 def generate_jwt(
     data: dict,
     secret: SecretType,
-    lifetime_seconds: Optional[int] = None,
+    lifetime_seconds: int | None = None,
     algorithm: str = JWT_ALGORITHM,
 ) -> str:
     payload = data.copy()

fastapi_users/manager.py

@@ -1,5 +1,5 @@
 import uuid
-from typing import Any, Generic, Optional, Union
+from typing import Any, Generic
 
 import jwt
 from fastapi import Request, Response
@@ -43,7 +43,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
     def __init__(
         self,
         user_db: BaseUserDatabase[models.UP, models.ID],
-        password_helper: Optional[PasswordHelperProtocol] = None,
+        password_helper: PasswordHelperProtocol | None = None,
     ):
         self.user_db = user_db
         if password_helper is None:
@@ -111,7 +111,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         self,
         user_create: schemas.UC,
         safe: bool = False,
-        request: Optional[Request] = None,
+        request: Request | None = None,
     ) -> models.UP:
         """
         Create a user in database.
@@ -152,9 +152,9 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         access_token: str,
         account_id: str,
         account_email: str,
-        expires_at: Optional[int] = None,
-        refresh_token: Optional[str] = None,
-        request: Optional[Request] = None,
+        expires_at: int | None = None,
+        refresh_token: str | None = None,
+        request: Request | None = None,
         *,
         associate_by_email: bool = False,
         is_verified_by_default: bool = False,
@@ -237,9 +237,9 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         access_token: str,
         account_id: str,
         account_email: str,
-        expires_at: Optional[int] = None,
-        refresh_token: Optional[str] = None,
-        request: Optional[Request] = None,
+        expires_at: int | None = None,
+        refresh_token: str | None = None,
+        request: Request | None = None,
     ) -> models.UOAP:
         """
         Handle the callback after a successful OAuth association.
@@ -273,7 +273,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return user
 
     async def request_verify(
-        self, user: models.UP, request: Optional[Request] = None
+        self, user: models.UP, request: Request | None = None
     ) -> None:
         """
         Start a verification request.
@@ -303,7 +303,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         )
         await self.on_after_request_verify(user, token, request)
 
-    async def verify(self, token: str, request: Optional[Request] = None) -> models.UP:
+    async def verify(self, token: str, request: Request | None = None) -> models.UP:
         """
         Validate a verification request.
 
@@ -356,7 +356,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return verified_user
 
     async def forgot_password(
-        self, user: models.UP, request: Optional[Request] = None
+        self, user: models.UP, request: Request | None = None
     ) -> None:
         """
         Start a forgot password request.
@@ -384,7 +384,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         await self.on_after_forgot_password(user, token, request)
 
     async def reset_password(
-        self, token: str, password: str, request: Optional[Request] = None
+        self, token: str, password: str, request: Request | None = None
     ) -> models.UP:
         """
         Reset the password of a user.
@@ -442,7 +442,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         user_update: schemas.UU,
         user: models.UP,
         safe: bool = False,
-        request: Optional[Request] = None,
+        request: Request | None = None,
     ) -> models.UP:
         """
         Update a user.
@@ -469,7 +469,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
     async def delete(
         self,
         user: models.UP,
-        request: Optional[Request] = None,
+        request: Request | None = None,
     ) -> None:
         """
         Delete a user.
@@ -483,7 +483,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         await self.on_after_delete(user, request)
 
     async def validate_password(
-        self, password: str, user: Union[schemas.UC, models.UP]
+        self, password: str, user: schemas.UC | models.UP
     ) -> None:
         """
         Validate a password.
@@ -498,7 +498,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return  # pragma: no cover
 
     async def on_after_register(
-        self, user: models.UP, request: Optional[Request] = None
+        self, user: models.UP, request: Request | None = None
     ) -> None:
         """
         Perform logic after successful user registration.
@@ -515,7 +515,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         self,
         user: models.UP,
         update_dict: dict[str, Any],
-        request: Optional[Request] = None,
+        request: Request | None = None,
     ) -> None:
         """
         Perform logic after successful user update.
@@ -530,7 +530,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return  # pragma: no cover
 
     async def on_after_request_verify(
-        self, user: models.UP, token: str, request: Optional[Request] = None
+        self, user: models.UP, token: str, request: Request | None = None
     ) -> None:
         """
         Perform logic after successful verification request.
@@ -545,7 +545,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return  # pragma: no cover
 
     async def on_after_verify(
-        self, user: models.UP, request: Optional[Request] = None
+        self, user: models.UP, request: Request | None = None
     ) -> None:
         """
         Perform logic after successful user verification.
@@ -559,7 +559,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return  # pragma: no cover
 
     async def on_after_forgot_password(
-        self, user: models.UP, token: str, request: Optional[Request] = None
+        self, user: models.UP, token: str, request: Request | None = None
     ) -> None:
         """
         Perform logic after successful forgot password request.
@@ -574,7 +574,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return  # pragma: no cover
 
     async def on_after_reset_password(
-        self, user: models.UP, request: Optional[Request] = None
+        self, user: models.UP, request: Request | None = None
     ) -> None:
         """
         Perform logic after successful password reset.
@@ -590,8 +590,8 @@ class BaseUserManager(Generic[models.UP, models.ID]):
     async def on_after_login(
         self,
         user: models.UP,
-        request: Optional[Request] = None,
-        response: Optional[Response] = None,
+        request: Request | None = None,
+        response: Response | None = None,
     ) -> None:
         """
         Perform logic after user login.
@@ -606,7 +606,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return  # pragma: no cover
 
     async def on_before_delete(
-        self, user: models.UP, request: Optional[Request] = None
+        self, user: models.UP, request: Request | None = None
     ) -> None:
         """
         Perform logic before user delete.
@@ -620,7 +620,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
         return  # pragma: no cover
 
     async def on_after_delete(
-        self, user: models.UP, request: Optional[Request] = None
+        self, user: models.UP, request: Request | None = None
     ) -> None:
         """
         Perform logic before user delete.
@@ -635,7 +635,7 @@ class BaseUserManager(Generic[models.UP, models.ID]):
 
     async def authenticate(
         self, credentials: OAuth2PasswordRequestForm
-    ) -> Optional[models.UP]:
+    ) -> models.UP | None:
         """
         Authenticate and return a user following an email and a password.
 

fastapi_users/models.py

@@ -1,4 +1,4 @@
-from typing import Generic, Optional, Protocol, TypeVar
+from typing import Generic, Protocol, TypeVar
 
 ID = TypeVar("ID")
 
@@ -20,8 +20,8 @@ class OAuthAccountProtocol(Protocol[ID]):
     id: ID
     oauth_name: str
     access_token: str
-    expires_at: Optional[int]
-    refresh_token: Optional[str]
+    expires_at: int | None
+    refresh_token: str | None
     account_id: str
     account_email: str
 

fastapi_users/openapi.py

@@ -1,3 +1,3 @@
-from typing import Any, Union
+from typing import Any
 
-OpenAPIResponseType = dict[Union[int, str], dict[str, Any]]
+OpenAPIResponseType = dict[int | str, dict[str, Any]]

fastapi_users/password.py

@@ -1,5 +1,5 @@
 import secrets
-from typing import Optional, Protocol, Union
+from typing import Protocol
 
 from pwdlib import PasswordHash
 from pwdlib.hashers.argon2 import Argon2Hasher
@@ -9,7 +9,7 @@ from pwdlib.hashers.bcrypt import BcryptHasher
 class PasswordHelperProtocol(Protocol):
     def verify_and_update(
         self, plain_password: str, hashed_password: str
-    ) -> tuple[bool, Union[str, None]]: ...  # pragma: no cover
+    ) -> tuple[bool, str | None]: ...  # pragma: no cover
 
     def hash(self, password: str) -> str: ...  # pragma: no cover
 
@@ -17,7 +17,7 @@ class PasswordHelperProtocol(Protocol):
 
 
 class PasswordHelper(PasswordHelperProtocol):
-    def __init__(self, password_hash: Optional[PasswordHash] = None) -> None:
+    def __init__(self, password_hash: PasswordHash | None = None) -> None:
         if password_hash is None:
             self.password_hash = PasswordHash(
                 (
@@ -30,7 +30,7 @@ class PasswordHelper(PasswordHelperProtocol):
 
     def verify_and_update(
         self, plain_password: str, hashed_password: str
-    ) -> tuple[bool, Union[str, None]]:
+    ) -> tuple[bool, str | None]:
         return self.password_hash.verify_and_update(plain_password, hashed_password)
 
     def hash(self, password: str) -> str:

fastapi_users/router/common.py

@@ -1,11 +1,10 @@
 from enum import Enum
-from typing import Union
 
 from pydantic import BaseModel
 
 
 class ErrorModel(BaseModel):
-    detail: Union[str, dict[str, str]]
+    detail: str | dict[str, str]
 
 
 class ErrorCodeReasonModel(BaseModel):

fastapi_users/router/oauth.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import jwt
 from fastapi import APIRouter, Depends, HTTPException, Query, Request, status
 from httpx_oauth.integrations.fastapi import OAuth2AuthorizeCallback
@@ -32,7 +30,7 @@ def get_oauth_router(
     backend: AuthenticationBackend[models.UP, models.ID],
     get_user_manager: UserManagerDependency[models.UP, models.ID],
     state_secret: SecretType,
-    redirect_url: Optional[str] = None,
+    redirect_url: str | None = None,
     associate_by_email: bool = False,
     is_verified_by_default: bool = False,
 ) -> APIRouter:
@@ -160,7 +158,7 @@ def get_oauth_associate_router(
     get_user_manager: UserManagerDependency[models.UP, models.ID],
     user_schema: type[schemas.U],
     state_secret: SecretType,
-    redirect_url: Optional[str] = None,
+    redirect_url: str | None = None,
     requires_verification: bool = False,
 ) -> APIRouter:
     """Generate a router with the OAuth routes to associate an authenticated user."""

fastapi_users/schemas.py

@@ -1,4 +1,4 @@
-from typing import Any, Generic, Optional, TypeVar
+from typing import Any, Generic, TypeVar
 
 from pydantic import BaseModel, ConfigDict, EmailStr
 from pydantic.version import VERSION as PYDANTIC_VERSION
@@ -64,17 +64,17 @@ class BaseUser(CreateUpdateDictModel, Generic[models.ID]):
 class BaseUserCreate(CreateUpdateDictModel):
     email: EmailStr
     password: str
-    is_active: Optional[bool] = True
-    is_superuser: Optional[bool] = False
-    is_verified: Optional[bool] = False
+    is_active: bool | None = True
+    is_superuser: bool | None = False
+    is_verified: bool | None = False
 
 
 class BaseUserUpdate(CreateUpdateDictModel):
-    password: Optional[str] = None
-    email: Optional[EmailStr] = None
-    is_active: Optional[bool] = None
-    is_superuser: Optional[bool] = None
-    is_verified: Optional[bool] = None
+    password: str | None = None
+    email: EmailStr | None = None
+    is_active: bool | None = None
+    is_superuser: bool | None = None
+    is_verified: bool | None = None
 
 
 U = TypeVar("U", bound=BaseUser)
@@ -88,8 +88,8 @@ class BaseOAuthAccount(BaseModel, Generic[models.ID]):
     id: models.ID
     oauth_name: str
     access_token: str
-    expires_at: Optional[int] = None
-    refresh_token: Optional[str] = None
+    expires_at: int | None = None
+    refresh_token: str | None = None
     account_id: str
     account_email: str
 

fastapi_users/types.py

@@ -1,15 +1,19 @@
-from collections.abc import AsyncGenerator, AsyncIterator, Coroutine, Generator
-from typing import Callable, TypeVar, Union
+from collections.abc import (
+    AsyncGenerator,
+    AsyncIterator,
+    Callable,
+    Coroutine,
+    Generator,
+)
+from typing import TypeVar
 
 RETURN_TYPE = TypeVar("RETURN_TYPE")
 
 DependencyCallable = Callable[
     ...,
-    Union[
-        RETURN_TYPE,
-        Coroutine[None, None, RETURN_TYPE],
-        AsyncGenerator[RETURN_TYPE, None],
-        Generator[RETURN_TYPE, None, None],
-        AsyncIterator[RETURN_TYPE],
-    ],
+    RETURN_TYPE
+    | Coroutine[None, None, RETURN_TYPE]
+    | AsyncGenerator[RETURN_TYPE, None]
+    | Generator[RETURN_TYPE, None, None]
+    | AsyncIterator[RETURN_TYPE],
 ]