Use a generic Protocol model for User instead of Pydantic

This commit is contained in:
François Voron
2022-04-29 13:49:21 +02:00
parent e29633204d
commit 923aeb970e
29 changed files with 702 additions and 553 deletions

View File

@ -2,7 +2,7 @@ from typing import Generic, Sequence, Type
from fastapi import APIRouter
from fastapi_users import models
from fastapi_users import models, schemas
from fastapi_users.authentication import AuthenticationBackend, Authenticator
from fastapi_users.jwt import SecretType
from fastapi_users.manager import UserManagerDependency
@ -22,43 +22,39 @@ except ModuleNotFoundError: # pragma: no cover
BaseOAuth2 = Type # type: ignore
class FastAPIUsers(Generic[models.U, models.UC, models.UU, models.UD]):
class FastAPIUsers(Generic[models.UP, schemas.U, schemas.UC, schemas.UU, schemas.UD]):
"""
Main object that ties together the component for users authentication.
:param get_user_manager: Dependency callable getter to inject the
user manager class instance.
:param auth_backends: List of authentication backends.
:param user_model: Pydantic model of a user.
:param user_create_model: Pydantic model for creating a user.
:param user_update_model: Pydantic model for updating a user.
:param user_db_model: Pydantic model of a DB representation of a user.
:param user_schema: Pydantic schema of a public user.
:param user_create_schema: Pydantic schema for creating a user.
:param user_update_schema: Pydantic schema for updating a user.
:attribute current_user: Dependency callable getter to inject authenticated user
with a specific set of parameters.
"""
authenticator: Authenticator
_user_model: Type[models.U]
_user_create_model: Type[models.UC]
_user_update_model: Type[models.UU]
_user_db_model: Type[models.UD]
_user_schema: Type[schemas.U]
_user_create_schema: Type[schemas.UC]
_user_update_schema: Type[schemas.UU]
def __init__(
self,
get_user_manager: UserManagerDependency[models.UC, models.UD],
get_user_manager: UserManagerDependency[models.UP],
auth_backends: Sequence[AuthenticationBackend],
user_model: Type[models.U],
user_create_model: Type[models.UC],
user_update_model: Type[models.UU],
user_db_model: Type[models.UD],
user_schema: Type[schemas.U],
user_create_schema: Type[schemas.UC],
user_update_model: Type[schemas.UU],
):
self.authenticator = Authenticator(auth_backends, get_user_manager)
self._user_model = user_model
self._user_db_model = user_db_model
self._user_create_model = user_create_model
self._user_update_model = user_update_model
self._user_schema = user_schema
self._user_create_schema = user_create_schema
self._user_update_schema = user_update_model
self.get_user_manager = get_user_manager
self.current_user = self.authenticator.current_user
@ -67,13 +63,13 @@ class FastAPIUsers(Generic[models.U, models.UC, models.UU, models.UD]):
"""Return a router with a register route."""
return get_register_router(
self.get_user_manager,
self._user_model,
self._user_create_model,
self._user_schema,
self._user_create_schema,
)
def get_verify_router(self) -> APIRouter:
"""Return a router with e-mail verification routes."""
return get_verify_router(self.get_user_manager, self._user_model)
return get_verify_router(self.get_user_manager, self._user_schema)
def get_reset_password_router(self) -> APIRouter:
"""Return a reset password process router."""
@ -132,9 +128,8 @@ class FastAPIUsers(Generic[models.U, models.UC, models.UU, models.UD]):
"""
return get_users_router(
self.get_user_manager,
self._user_model,
self._user_update_model,
self._user_db_model,
self._user_schema,
self._user_update_schema,
self.authenticator,
requires_verification,
)