From 52a33b45044cca9d3f677cce61405a05c47f5ea8 Mon Sep 17 00:00:00 2001 From: Govardhan Chitrada Date: Fri, 12 Apr 2024 12:25:02 +0530 Subject: [PATCH 1/2] Update config.py (To support pydantic V2 ) --- fastapi_jwt_auth/config.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fastapi_jwt_auth/config.py b/fastapi_jwt_auth/config.py index c81b50c..35a478f 100644 --- a/fastapi_jwt_auth/config.py +++ b/fastapi_jwt_auth/config.py @@ -1,5 +1,5 @@ from datetime import timedelta -from typing import Optional, Union, Sequence, List +from typing import Optional, Union, List, List from pydantic import ( BaseModel, validator, @@ -9,7 +9,7 @@ ) class LoadConfig(BaseModel): - authjwt_token_location: Optional[Sequence[StrictStr]] = {'headers'} + authjwt_token_location: Optional[List[StrictStr]] = {'headers'} authjwt_secret_key: Optional[StrictStr] = None authjwt_public_key: Optional[StrictStr] = None authjwt_private_key: Optional[StrictStr] = None @@ -18,9 +18,9 @@ class LoadConfig(BaseModel): authjwt_decode_leeway: Optional[Union[StrictInt,timedelta]] = 0 authjwt_encode_issuer: Optional[StrictStr] = None authjwt_decode_issuer: Optional[StrictStr] = None - authjwt_decode_audience: Optional[Union[StrictStr,Sequence[StrictStr]]] = None + authjwt_decode_audience: Optional[Union[StrictStr,List[StrictStr]]] = None authjwt_denylist_enabled: Optional[StrictBool] = False - authjwt_denylist_token_checks: Optional[Sequence[StrictStr]] = {'access','refresh'} + authjwt_denylist_token_checks: Optional[List[StrictStr]] = {'access','refresh'} authjwt_header_name: Optional[StrictStr] = "Authorization" authjwt_header_type: Optional[StrictStr] = "Bearer" authjwt_access_token_expires: Optional[Union[StrictBool,StrictInt,timedelta]] = timedelta(minutes=15) @@ -42,7 +42,7 @@ class LoadConfig(BaseModel): authjwt_refresh_csrf_cookie_path: Optional[StrictStr] = "/" authjwt_access_csrf_header_name: Optional[StrictStr] = "X-CSRF-Token" authjwt_refresh_csrf_header_name: Optional[StrictStr] = "X-CSRF-Token" - authjwt_csrf_methods: Optional[Sequence[StrictStr]] = {'POST','PUT','PATCH','DELETE'} + authjwt_csrf_methods: Optional[List[StrictStr]] = {'POST','PUT','PATCH','DELETE'} @validator('authjwt_access_token_expires') def validate_access_token_expires(cls, v): From f85cbd1cb24b922c32f8f6edc4f6158f720ac398 Mon Sep 17 00:00:00 2001 From: Govardhan Chitrada Date: Fri, 12 Apr 2024 12:26:25 +0530 Subject: [PATCH 2/2] Removed Sequence dependency --- fastapi_jwt_auth/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastapi_jwt_auth/config.py b/fastapi_jwt_auth/config.py index 35a478f..c014d60 100644 --- a/fastapi_jwt_auth/config.py +++ b/fastapi_jwt_auth/config.py @@ -1,5 +1,5 @@ from datetime import timedelta -from typing import Optional, Union, List, List +from typing import Optional, Union, List from pydantic import ( BaseModel, validator,