python/fastapi-users
1
0
Fork 0
mirror of https://github.com/fastapi-users/fastapi-users.git synced 2026-03-13 07:49:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated dependency callables

Browse Source
This commit is contained in:
François Voron
2021-09-09 12:14:50 +02:00
parent 7ae2042500
commit 370194ff6e
5 changed files with 21 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
fastapi_users/authentication/__init__.py
View File

@@ -1,8 +1,7 @@
import re
from inspect import Parameter, Signature, signature
from inspect import Parameter, Signature
from typing import Optional, Sequence
from deprecated import deprecated
from fastapi import Depends, HTTPException, status
from makefun import with_signature
@@ -48,45 +47,6 @@ class Authenticator:
self.backends = backends
self.user_db = user_db
self.get_current_user = self._deprecated_current_user("get_current_user")
self.get_current_active_user = self._deprecated_current_user(
"get_current_active_user", active=True
)
self.get_current_verified_user = self._deprecated_current_user(
"get_current_verified_user", active=True, verified=True
)
self.get_current_superuser = self._deprecated_current_user(
"get_current_superuser", active=True, superuser=True
)
self.get_current_verified_superuser = self._deprecated_current_user(
"get_current_verified_superuser",
active=True,
verified=True,
superuser=True,
)
self.get_optional_current_user = self._deprecated_current_user(
"get_optional_current_user", optional=True
)
self.get_optional_current_active_user = self._deprecated_current_user(
"get_optional_current_active_user", optional=True, active=True
)
self.get_optional_current_verified_user = self._deprecated_current_user(
"get_optional_current_verified_user",
optional=True,
active=True,
verified=True,
)
self.get_optional_current_superuser = self._deprecated_current_user(
"get_optional_current_superuser", optional=True, active=True, superuser=True
)
self.get_optional_current_verified_superuser = self._deprecated_current_user(
"get_optional_current_verified_superuser",
optional=True,
active=True,
verified=True,
superuser=True,
)
def current_user(
self,
optional: bool = False,
@@ -138,32 +98,6 @@ class Authenticator:
return current_user_dependency
def _deprecated_current_user(
self,
func_name: str,
optional: bool = False,
active: bool = False,
verified: bool = False,
superuser: bool = False,
):
current_user_dependency = self.current_user(
optional, active, verified, superuser
)
@deprecated(
version="5.1.0",
reason=(
"You should call `current_user` with your own set of parameters. "
"See: "
"https://fastapi-users.github.io/fastapi-users/usage/dependency-callables/"
),
)
@with_signature(signature(current_user_dependency), func_name=func_name)
async def deprecated_current_user_dependency(*args, **kwargs):
return await current_user_dependency(*args, **kwargs)
return deprecated_current_user_dependency
async def _authenticate(
self,
*args,

26
fastapi_users/fastapi_users.py
View File

@@ -47,12 +47,6 @@ class FastAPIUsers:
:attribute create_user: Helper function to create a user programmatically.
:attribute current_user: Dependency callable getter to inject authenticated user
with a specific set of parameters.
:attribute get_current_user: Dependency callable to inject authenticated user.
:attribute get_current_active_user: Dependency callable to inject active user.
:attribute get_current_verified_user: Dependency callable to inject verified user.
:attribute get_current_superuser: Dependency callable to inject superuser.
:attribute get_current_verified_superuser: Dependency callable to inject
verified superuser.
"""
db: BaseUserDatabase
@@ -92,26 +86,6 @@ class FastAPIUsers:
self.validate_password = validate_password
self.current_user = self.authenticator.current_user
self.get_current_user = self.authenticator.get_current_user
self.get_current_active_user = self.authenticator.get_current_active_user
self.get_current_verified_user = self.authenticator.get_current_verified_user
self.get_current_superuser = self.authenticator.get_current_superuser
self.get_current_verified_superuser = (
self.authenticator.get_current_verified_superuser
)
self.get_optional_current_user = self.authenticator.get_optional_current_user
self.get_optional_current_active_user = (
self.authenticator.get_optional_current_active_user
)
self.get_optional_current_verified_user = (
self.authenticator.get_optional_current_verified_user
)
self.get_optional_current_superuser = (
self.authenticator.get_optional_current_superuser
)
self.get_optional_current_verified_superuser = (
self.authenticator.get_optional_current_verified_superuser
)
def get_register_router(
self,

1
pyproject.toml
View File

@@ -29,7 +29,6 @@ requires = [
"python-multipart ==0.0.5",
"makefun >=1.9.2,<1.12",
"typing-extensions >=3.7.4.3; python_version < '3.8'",
"Deprecated >=1.2.10,<2.0.0"
]
[tool.flit.metadata.requires-extra]

1
requirements.txt
View File

@@ -5,4 +5,3 @@ pyjwt ==2.1.0
python-multipart ==0.0.5
makefun >=1.11.2,<1.12
typing-extensions >=3.7.4.3; python_version < '3.8'
Deprecated >=1.2.12,<2.0.0

30
tests/test_fastapi_users.py
View File

@@ -41,52 +41,62 @@ async def test_app_client(
return None
@app.get("/current-user")
def current_user(user=Depends(fastapi_users.get_current_user)):
def current_user(user=Depends(fastapi_users.current_user())):
return user
@app.get("/current-active-user")
def current_active_user(user=Depends(fastapi_users.get_current_active_user)):
def current_active_user(user=Depends(fastapi_users.current_user(active=True))):
return user
@app.get("/current-verified-user")
def current_verified_user(user=Depends(fastapi_users.get_current_verified_user)):
def current_verified_user(user=Depends(fastapi_users.current_user(verified=True))):
return user
@app.get("/current-superuser")
def current_superuser(user=Depends(fastapi_users.get_current_superuser)):
def current_superuser(
user=Depends(fastapi_users.current_user(active=True, superuser=True))
):
return user
@app.get("/current-verified-superuser")
def current_verified_superuser(
user=Depends(fastapi_users.get_current_verified_superuser),
user=Depends(
fastapi_users.current_user(active=True, verified=True, superuser=True)
),
):
return user
@app.get("/optional-current-user")
def optional_current_user(user=Depends(fastapi_users.get_optional_current_user)):
def optional_current_user(user=Depends(fastapi_users.current_user(optional=True))):
return user
@app.get("/optional-current-active-user")
def optional_current_active_user(
user=Depends(fastapi_users.get_optional_current_active_user),
user=Depends(fastapi_users.current_user(optional=True, active=True)),
):
return user
@app.get("/optional-current-verified-user")
def optional_current_verified_user(
user=Depends(fastapi_users.get_optional_current_verified_user),
user=Depends(fastapi_users.current_user(optional=True, verified=True)),
):
return user
@app.get("/optional-current-superuser")
def optional_current_superuser(
user=Depends(fastapi_users.get_optional_current_superuser),
user=Depends(
fastapi_users.current_user(optional=True, active=True, superuser=True)
),
):
return user
@app.get("/optional-current-verified-superuser")
def optional_current_verified_superuser(
user=Depends(fastapi_users.get_optional_current_verified_superuser),
user=Depends(
fastapi_users.current_user(
optional=True, active=True, verified=True, superuser=True
)
),
):
return user