python/fastapi-users
1
0
Fork 0
mirror of https://github.com/fastapi-users/fastapi-users.git synced 2025-08-14 18:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #515: remove calls to deprecated user callables in internal codebase

Browse Source
This commit is contained in:
François Voron
2021-03-04 17:50:19 +01:00
parent c41b4d1bd4
commit 8eb53f4744
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fastapi_users/router/auth.py
View File

@ -15,10 +15,9 @@ def get_auth_router(
) -> APIRouter: ) -> APIRouter:
"""Generate a router with login/logout routes for an authentication backend.""" """Generate a router with login/logout routes for an authentication backend."""
router = APIRouter() router = APIRouter()
if requires_verification: get_current_user = authenticator.current_user(
get_current_user = authenticator.get_current_verified_user active=True, verified=requires_verification
else: )
get_current_user = authenticator.get_current_active_user
@router.post("/login") @router.post("/login")
async def login( async def login(

12
fastapi_users/router/users.py
View File

@ -22,12 +22,12 @@ def get_users_router(
"""Generate a router with the authentication routes.""" """Generate a router with the authentication routes."""
router = APIRouter() router = APIRouter()
if requires_verification: get_current_active_user = authenticator.current_user(
get_current_active_user = authenticator.get_current_verified_user active=True, verified=requires_verification
get_current_superuser = authenticator.get_current_verified_superuser )
else: get_current_superuser = authenticator.current_user(
get_current_active_user = authenticator.get_current_active_user active=True, verified=requires_verification, superuser=True
get_current_superuser = authenticator.get_current_superuser )
async def _get_or_404(id: UUID4) -> models.BaseUserDB: async def _get_or_404(id: UUID4) -> models.BaseUserDB:
user = await user_db.get(id) user = await user_db.get(id)

8
tests/conftest.py
View File

@ -363,18 +363,20 @@ def get_test_auth_client(mock_user_db, get_test_client):
authenticator = Authenticator(backends, mock_user_db) authenticator = Authenticator(backends, mock_user_db)
@app.get("/test-current-user") @app.get("/test-current-user")
def test_current_user(user: UserDB = Depends(authenticator.get_current_user)): def test_current_user(user: UserDB = Depends(authenticator.current_user())):
return user return user
@app.get("/test-current-active-user") @app.get("/test-current-active-user")
def test_current_active_user( def test_current_active_user(
user: UserDB = Depends(authenticator.get_current_active_user), user: UserDB = Depends(authenticator.current_user(active=True)),
): ):
return user return user
@app.get("/test-current-superuser") @app.get("/test-current-superuser")
def test_current_superuser( def test_current_superuser(
user: UserDB = Depends(authenticator.get_current_superuser), user: UserDB = Depends(
authenticator.current_user(active=True, superuser=True)
),
): ):
return user return user