fix token validation

services.py

@@ -1,5 +1,6 @@
-from fastapi import FastAPI, HTTPException
+from fastapi import FastAPI, HTTPException, Request
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import JSONResponse
 from pydantic import BaseModel
 from typing import List
 import jwt
@@ -46,9 +47,7 @@ def create_access_token(data: dict, expires_delta: datetime.timedelta = None):
     else:
         expire = datetime.datetime.utcnow() + datetime.timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
     to_encode.update({"exp": expire})
-    encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
-    print("encoded jwt", encoded_jwt)
-    return encoded_jwt
+    return jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
 
 # JWT token verification function
 def verify_access_token(token: str):
@@ -58,8 +57,11 @@ def verify_access_token(token: str):
         return payload
     except jwt.ExpiredSignatureError:
         raise HTTPException(status_code=401, detail="Token has expired")
-    except jwt.JWTError:
-        raise HTTPException(status_code=401, detail="Invalid token")
+    except jwt.DecodeError:
+        raise HTTPException(status_code=401, detail="Token is invalid")
+    except Exception as e:
+        # Catch any other exception and raise a generic HTTP 400 error
+        raise HTTPException(status_code=400, detail=f"An error occurred: {str(e)}")
 
 # Register a new user
 @app.post("/register")
@@ -78,7 +80,6 @@ async def login_user(user: User):
         raise HTTPException(status_code=401, detail="Invalid credentials")
     # Create JWT token
     access_token = create_access_token(data={"sub": user.username})
-    print("access token", access_token)
     return {"token": access_token}
 
 # API to validate the session token
@@ -97,7 +98,7 @@ async def search_users(query: str) -> List[str]:
         raise HTTPException(status_code=404, detail="No users found matching the query")
     return matching_users
 
-# New /api/ routes for CRUD operations
+# API routes for CRUD operations
 @app.get("/api/users")
 async def get_all_users() -> List[str]:
     """Get a list of all users."""
@@ -126,10 +127,26 @@ async def update_user(username: str, user: User):
     USERS[username] = user.password
     return {"message": f"User {username} password updated successfully"}
 
-# New route to check if a user exists by username
 @app.get("/api/user-exists/{username}")
 async def user_exists(username: str):
     """Check if a user exists based on the username."""
     if username in USERS:
         return {"message": f"User '{username}' exists"}
     raise HTTPException(status_code=404, detail="User not found")
+
+# Global error handling middleware
+@app.middleware("http")
+async def custom_error_handler(request: Request, call_next):
+    try:
+        response = await call_next(request)
+        return response
+    except HTTPException as exc:
+        return JSONResponse(
+            status_code=exc.status_code,
+            content={"detail": exc.detail}
+        )
+    except Exception as e:
+        return JSONResponse(
+            status_code=500,
+            content={"detail": "Internal Server Error"}
+        )