fixup!

lnbits/decorators.py

@@ -20,6 +20,7 @@ from lnbits.core.crud import (
 )
 from lnbits.core.models import (
     AccessTokenPayload,
+    Account,
     KeyType,
     SimpleStatus,
     User,
@@ -144,7 +145,10 @@ async def check_user_exists(
     else:
         raise HTTPException(HTTPStatus.UNAUTHORIZED, "Missing user ID or access token.")
 
-    if not account or not settings.is_user_allowed(account.id):
+    if not account:
+        raise HTTPException(HTTPStatus.UNAUTHORIZED, "User not found.")
+
+    if not settings.is_user_allowed(account.id):
         raise HTTPException(HTTPStatus.UNAUTHORIZED, "User not allowed.")
 
     user = await get_user(account)
@@ -258,7 +262,7 @@ async def _check_user_extension_access(user_id: str, current_path: str):
         )
 
 
-async def _get_account_from_token(access_token) -> Optional[User]:
+async def _get_account_from_token(access_token) -> Optional[Account]:
     try:
         payload: dict = jwt.decode(access_token, settings.auth_secret_key, ["HS256"])
         user = await _get_user_from_jwt_payload(payload)
@@ -278,7 +282,7 @@ async def _get_account_from_token(access_token) -> Optional[User]:
         raise HTTPException(HTTPStatus.UNAUTHORIZED, "Invalid access token.") from exc
 
 
-async def _get_user_from_jwt_payload(payload) -> Optional[User]:
+async def _get_user_from_jwt_payload(payload) -> Optional[Account]:
     if "sub" in payload and payload.get("sub"):
         return await get_account_by_username(str(payload.get("sub")))
     if "usr" in payload and payload.get("usr"):