Remove UserDB Pydantic schema

Author: frankie567

fastapi_users/fastapi_users.py

@@ -22,7 +22,7 @@
     BaseOAuth2 = Type  # type: ignore
 
 
-class FastAPIUsers(Generic[models.UP, schemas.U, schemas.UC, schemas.UU, schemas.UD]):
+class FastAPIUsers(Generic[models.UP, schemas.U, schemas.UC, schemas.UU]):
     """
     Main object that ties together the component for users authentication.
 

fastapi_users/schemas.py

@@ -47,17 +47,9 @@ class BaseUserUpdate(CreateUpdateDictModel):
     is_verified: Optional[bool]
 
 
-class BaseUserDB(BaseUser):
-    hashed_password: str
-
-    class Config:
-        orm_mode = True
-
-
 U = TypeVar("U", bound=BaseUser)
 UC = TypeVar("UC", bound=BaseUserCreate)
 UU = TypeVar("UU", bound=BaseUserUpdate)
-UD = TypeVar("UD", bound=BaseUserDB)
 
 
 class BaseOAuthAccount(BaseModel):

tests/conftest.py

@@ -82,18 +82,10 @@ class UserUpdate(schemas.BaseUserUpdate):
     first_name: Optional[str]
 
 
-class UserDB(User, schemas.BaseUserDB):
-    pass
-
-
 class UserOAuth(User, schemas.BaseOAuthAccountMixin):
     pass
 
 
-class UserDBOAuth(UserOAuth, UserDB):
-    pass
-
-
 class BaseTestUserManager(Generic[models.UP], BaseUserManager[models.UP]):
     reset_password_token_secret = "SECRET"
     verification_token_secret = "SECRET"

tests/test_authentication_backend.py

@@ -3,7 +3,7 @@
 import pytest
 from fastapi import Response
 
-from fastapi_users import models, schemas
+from fastapi_users import models
 from fastapi_users.authentication import (
     AuthenticationBackend,
     BearerTransport,
@@ -12,23 +12,23 @@
 from fastapi_users.authentication.strategy import StrategyDestroyNotSupportedError
 from fastapi_users.authentication.transport.base import Transport
 from fastapi_users.manager import BaseUserManager
-from tests.conftest import MockStrategy, MockTransport, UserDB
+from tests.conftest import MockStrategy, MockTransport, UserModel
 
 
 class MockTransportLogoutNotSupported(BearerTransport):
     pass
 
 
-class MockStrategyDestroyNotSupported(Strategy, Generic[schemas.UC, schemas.UD]):
+class MockStrategyDestroyNotSupported(Strategy, Generic[models.UP]):
     async def read_token(
         self, token: Optional[str], user_manager: BaseUserManager[models.UP]
-    ) -> Optional[schemas.UD]:
+    ) -> Optional[models.UP]:
         return None
 
-    async def write_token(self, user: schemas.UD) -> str:
+    async def write_token(self, user: models.UP) -> str:
         return "TOKEN"
 
-    async def destroy_token(self, token: str, user: schemas.UD) -> None:
+    async def destroy_token(self, token: str, user: models.UP) -> None:
         raise StrategyDestroyNotSupportedError
 
 
@@ -55,7 +55,7 @@ def backend(
 
 @pytest.mark.asyncio
 @pytest.mark.authentication
-async def test_logout(backend: AuthenticationBackend, user: UserDB):
+async def test_logout(backend: AuthenticationBackend, user: UserModel):
     strategy = cast(Strategy, backend.get_strategy())
     result = await backend.logout(strategy, user, "TOKEN", Response())
     assert result is None

tests/test_fastapi_users.py

@@ -5,7 +5,7 @@
 from fastapi import Depends, FastAPI, status
 
 from fastapi_users import FastAPIUsers
-from tests.conftest import User, UserCreate, UserDB, UserModel, UserUpdate
+from tests.conftest import User, UserCreate, UserModel, UserUpdate
 
 
 @pytest.fixture
@@ -17,7 +17,7 @@ async def test_app_client(
     oauth_client,
     get_test_client,
 ) -> AsyncGenerator[httpx.AsyncClient, None]:
-    fastapi_users = FastAPIUsers[UserModel, User, UserCreate, UserUpdate, UserDB](
+    fastapi_users = FastAPIUsers[UserModel, User, UserCreate, UserUpdate](
         get_user_manager,
         [mock_authentication],
         User,

tests/test_manager.py

@@ -20,7 +20,6 @@
 from tests.conftest import (
     OAuthAccountModel,
     UserCreate,
-    UserDBOAuth,
     UserManagerMock,
     UserModel,
     UserOAuthModel,
@@ -106,7 +105,7 @@ async def test_not_existing_user(
             await user_manager_oauth.get_by_oauth_account("service1", "foo")
 
     async def test_existing_user(
-        self, user_manager_oauth: UserManagerMock[UserModel], user_oauth: UserDBOAuth
+        self, user_manager_oauth: UserManagerMock[UserModel], user_oauth: UserOAuthModel
     ):
         oauth_account = user_oauth.oauth_accounts[0]
         retrieved_user = await user_manager_oauth.get_by_oauth_account(
@@ -192,7 +191,7 @@ async def test_existing_user_with_oauth(
     async def test_existing_user_without_oauth(
         self,
         user_manager_oauth: UserManagerMock[UserOAuthModel],
-        superuser_oauth: UserDBOAuth,
+        superuser_oauth: UserOAuthModel,
     ):
         oauth_account = OAuthAccountModel(
             oauth_name="service1",

tests/test_openapi.py

@@ -3,12 +3,12 @@
 from fastapi import FastAPI, status
 
 from fastapi_users.fastapi_users import FastAPIUsers
-from tests.conftest import User, UserCreate, UserDB, UserModel, UserUpdate
+from tests.conftest import User, UserCreate, UserModel, UserUpdate
 
 
 @pytest.fixture
 def fastapi_users(get_user_manager, mock_authentication) -> FastAPIUsers:
-    return FastAPIUsers[UserModel, User, UserCreate, UserUpdate, UserDB](
+    return FastAPIUsers[UserModel, User, UserCreate, UserUpdate](
         get_user_manager, [mock_authentication], User, UserCreate, UserUpdate
     )