Update helper/subscriptions.py

helper/subscriptions.py

@@ -263,16 +263,24 @@ async def fetch_subscription(jwt: str):
     }
 
 
-async def resolve_token_identity(token: str):
+from fastapi import HTTPException
+
+async def resolve_token_identity(token: str | None):
+    if not token:
+        return None
+
     jwt_identity = resolve_jwt_identity(token)
     if jwt_identity is not None:
         return jwt_identity
 
-    api_key_identity = await resolve_api_key_identity(token)
-    if api_key_identity is not None:
-        return api_key_identity
+    api_identity = await resolve_api_key_identity(token)
+    if api_identity is not None:
+        if "error" in api_identity:
+            raise HTTPException(status_code=401, detail=api_identity["error"])
+        return api_identity
+
+    raise HTTPException(status_code=401, detail="Invalid API key or token")
 
-    return {"error": "Invalid or expired credentials"}
 
 
 def resolve_jwt_identity(token: str):
@@ -320,17 +328,17 @@ async def resolve_api_key_identity(token: str):
         return None
 
     if row.get("revoked_at") is not None:
-        return {"error": "API key has been revoked"}
+        raise HTTPException(status_code=401, detail="Invalid API key or token")
 
     expires_at = row.get("expires_at")
     if expires_at is not None and expires_at <= datetime.now(timezone.utc):
-        return {"error": "API key has expired"}
+        raise HTTPException(status_code=401, detail="Invalid API key or token")
 
     email = row.get("email")
     created_at = row.get("user_created_at")
     user_id = row.get("user_id")
     if not isinstance(email, str) or not email.strip():
-        return {"error": "API key is not linked to a valid user"}
+        raise HTTPException(status_code=401, detail="Invalid API key or token")
 
     await execute_query(
         """