fix: 500 error when sending unauthorized requests (#2639)

* fixed uncaught null token

* added tests
This commit is contained in:
Michael Genson
2023-10-15 19:48:15 -05:00
committed by GitHub
parent 5f0a9981f3
commit eba9ff00ce
2 changed files with 12 additions and 2 deletions

View File

@@ -76,7 +76,7 @@ async def try_get_current_user(
async def get_current_user(
request: Request, token: str = Depends(oauth2_scheme_soft_fail), session=Depends(generate_session)
request: Request, token: str | None = Depends(oauth2_scheme_soft_fail), session=Depends(generate_session)
) -> PrivateUser:
credentials_exception = HTTPException(
status_code=status.HTTP_401_UNAUTHORIZED,
@@ -86,6 +86,8 @@ async def get_current_user(
if token is None and "mealie.access_token" in request.cookies:
# Try extract from cookie
token = request.cookies.get("mealie.access_token", "")
else:
token = token or ""
try:
payload = jwt.decode(token, settings.SECRET, algorithms=[ALGORITHM])