mirror of
https://github.com/fastapi-users/fastapi-users.git
synced 2025-11-01 10:25:45 +08:00
Put exceptions in a dedicated module to avoid circular imports
This commit is contained in:
@ -22,18 +22,12 @@ from httpx_oauth.oauth2 import OAuth2
|
||||
from pydantic import UUID4, SecretStr
|
||||
from pytest_mock import MockerFixture
|
||||
|
||||
from fastapi_users import models, schemas
|
||||
from fastapi_users import exceptions, models, schemas
|
||||
from fastapi_users.authentication import AuthenticationBackend, BearerTransport
|
||||
from fastapi_users.authentication.strategy import Strategy
|
||||
from fastapi_users.db import BaseUserDatabase
|
||||
from fastapi_users.jwt import SecretType
|
||||
from fastapi_users.manager import (
|
||||
BaseUserManager,
|
||||
InvalidID,
|
||||
InvalidPasswordException,
|
||||
UserNotExists,
|
||||
UUIDIDMixin,
|
||||
)
|
||||
from fastapi_users.manager import BaseUserManager, UUIDIDMixin
|
||||
from fastapi_users.openapi import OpenAPIResponseType
|
||||
from fastapi_users.password import PasswordHelper
|
||||
|
||||
@ -101,7 +95,7 @@ class BaseTestUserManager(
|
||||
self, password: str, user: Union[schemas.UC, models.UP]
|
||||
) -> None:
|
||||
if len(password) < 3:
|
||||
raise InvalidPasswordException(
|
||||
raise exceptions.InvalidPasswordException(
|
||||
reason="Password should be at least 3 characters"
|
||||
)
|
||||
|
||||
@ -533,7 +527,7 @@ class MockStrategy(Strategy[UserModel, IDType]):
|
||||
try:
|
||||
parsed_id = user_manager.parse_id(token)
|
||||
return await user_manager.get(parsed_id)
|
||||
except (InvalidID, UserNotExists):
|
||||
except (exceptions.InvalidID, exceptions.UserNotExists):
|
||||
return None
|
||||
return None
|
||||
|
||||
|
||||
@ -5,9 +5,7 @@ from fastapi.security import OAuth2PasswordRequestForm
|
||||
from pydantic import UUID4
|
||||
from pytest_mock import MockerFixture
|
||||
|
||||
from fastapi_users.jwt import decode_jwt, generate_jwt
|
||||
from fastapi_users.manager import (
|
||||
IntegerIDMixin,
|
||||
from fastapi_users.exceptions import (
|
||||
InvalidID,
|
||||
InvalidPasswordException,
|
||||
InvalidResetPasswordToken,
|
||||
@ -17,6 +15,8 @@ from fastapi_users.manager import (
|
||||
UserInactive,
|
||||
UserNotExists,
|
||||
)
|
||||
from fastapi_users.jwt import decode_jwt, generate_jwt
|
||||
from fastapi_users.manager import IntegerIDMixin
|
||||
from tests.conftest import (
|
||||
UserCreate,
|
||||
UserManagerMock,
|
||||
|
||||
@ -4,7 +4,7 @@ import httpx
|
||||
import pytest
|
||||
from fastapi import FastAPI, status
|
||||
|
||||
from fastapi_users.manager import (
|
||||
from fastapi_users.exceptions import (
|
||||
InvalidPasswordException,
|
||||
InvalidResetPasswordToken,
|
||||
UserInactive,
|
||||
|
||||
@ -4,7 +4,7 @@ import httpx
|
||||
import pytest
|
||||
from fastapi import FastAPI, status
|
||||
|
||||
from fastapi_users.manager import (
|
||||
from fastapi_users.exceptions import (
|
||||
InvalidVerifyToken,
|
||||
UserAlreadyVerified,
|
||||
UserInactive,
|
||||
|
||||
Reference in New Issue
Block a user