chore: Replace python-jose with PyJWT

mealie/core/dependencies/dependencies.py

@@ -5,9 +5,10 @@
 from uuid import uuid4
 
 import fastapi
+import jwt
 from fastapi import BackgroundTasks, Depends, HTTPException, Request, status
 from fastapi.security import OAuth2PasswordBearer
-from jose import JWTError, jwt
+from jwt.exceptions import PyJWTError
 from sqlalchemy.orm.session import Session
 
 from mealie.core import root_logger
@@ -96,8 +97,8 @@ async def get_current_user(
 
     try:
         payload = jwt.decode(token, settings.SECRET, algorithms=[ALGORITHM])
-        user_id: str = payload.get("sub")
-        long_token: str = payload.get("long_token")
+        user_id: str | None = payload.get("sub")
+        long_token: str | None = payload.get("long_token")
 
         if long_token is not None:
             return validate_long_live_token(session, token, payload.get("id"))
@@ -106,7 +107,7 @@ async def get_current_user(
             raise credentials_exception
 
         token_data = TokenData(user_id=user_id)
-    except JWTError as e:
+    except PyJWTError as e:
         raise credentials_exception from e
 
     repos = get_repositories(session)
@@ -126,7 +127,7 @@ async def get_integration_id(token: str = Depends(oauth2_scheme)) -> str:
         decoded_token = jwt.decode(token, settings.SECRET, algorithms=[ALGORITHM])
         return decoded_token.get("integration_id", DEFAULT_INTEGRATION_ID)
 
-    except JWTError as e:
+    except PyJWTError as e:
         raise credentials_exception from e
 
 
@@ -162,7 +163,7 @@ def validate_file_token(token: str | None = None) -> Path:
     try:
         payload = jwt.decode(token, settings.SECRET, algorithms=[ALGORITHM])
         file_path = Path(payload.get("file"))
-    except JWTError as e:
+    except PyJWTError as e:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="could not validate file token",
@@ -181,7 +182,7 @@ def validate_recipe_token(token: str | None = None) -> str:
 
     Raises:
         HTTPException: 400 Bad Request when no token or the recipe doesn't exist
-        HTTPException: 401 JWTError when token is invalid
+        HTTPException: 401 PyJWTError when token is invalid
 
     Returns:
         str: token data
@@ -192,7 +193,7 @@ def validate_recipe_token(token: str | None = None) -> str:
     try:
         payload = jwt.decode(token, settings.SECRET, algorithms=[ALGORITHM])
         slug: str | None = payload.get("slug")
-    except JWTError as e:
+    except PyJWTError as e:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="could not validate file token",

mealie/core/security/providers/auth_provider.py

@@ -2,7 +2,7 @@
 from datetime import datetime, timedelta, timezone
 from typing import Generic, TypeVar
 
-from jose import jwt
+import jwt
 from sqlalchemy.orm.session import Session
 
 from mealie.core.config import get_app_settings

mealie/core/security/security.py

@@ -2,8 +2,8 @@
 from datetime import datetime, timedelta, timezone
 from pathlib import Path
 
+import jwt
 from fastapi import Request
-from jose import jwt
 from sqlalchemy.orm.session import Session
 
 from mealie.core import root_logger

pyproject.toml

@@ -31,7 +31,6 @@ pyhumps = "^3.5.3"
 python = "^3.10"
 python-dateutil = "^2.8.2"
 python-dotenv = "^1.0.0"
-python-jose = "^3.3.0"
 python-ldap = "^3.3.1"
 python-multipart = "^0.0.9"
 python-slugify = "^8.0.0"
@@ -48,6 +47,7 @@ html2text = "^2024.0.0"
 paho-mqtt = "^1.6.1"
 pydantic-settings = "^2.1.0"
 pillow-heif = "^0.16.0"
+pyjwt = "^2.8.0"
 
 [tool.poetry.group.postgres.dependencies]
 psycopg2-binary = { version = "^2.9.1" }