Add Token model and update endpoints to use it

Refactor token validation and saving endpoints to accept a Token model
instead of a raw string. Set default values for token generation request
fields. Update TokenService cleanup to use datetime.now().

microservices/token-service/main.py

@@ -14,8 +14,8 @@ import logging
 from typing import List, Optional
 
 from models import (
-    TokenGenerateRequest, TokenResponse, TokenValidationResponse, 
-    TokenListResponse, HealthResponse
+    TokenGenerateRequest, TokenResponse, TokenValidationResponse,
+    TokenListResponse, HealthResponse, Token
 )
 from database import connect_to_mongo, close_mongo_connection, get_database
 from token_service import TokenService
@@ -32,9 +32,9 @@ async def lifespan(app: FastAPI):
     logger.info("Token Service starting up...")
     await connect_to_mongo()
     logger.info("Token Service startup complete")
-    
+
     yield
-    
+
     logger.info("Token Service shutting down...")
     await close_mongo_connection()
     logger.info("Token Service shutdown complete")
@@ -64,7 +64,7 @@ async def health_check():
     try:
         db = await get_database()
         await db.command("ping")
-        
+
         return HealthResponse(
             service="token-service",
             status="healthy",
@@ -81,7 +81,7 @@ async def get_tokens(db=Depends(get_db)):
     try:
         token_service = TokenService(db)
         tokens = await token_service.get_tokens()
-        
+
         return TokenListResponse(
             tokens=tokens,
             count=len(tokens)
@@ -95,6 +95,16 @@ async def generate_token(request: TokenGenerateRequest, db=Depends(get_db)):
     """Generate a new JWT token"""
     try:
         token_service = TokenService(db)
+
+        if not request.data_aggregation:
+            request.data_aggregation = False
+        if not request.time_aggregation:
+            request.time_aggregation = False
+        if not request.embargo:
+            request.embargo = False
+        if not request.exp_hours:
+            request.exp_hours = 24
+
         token = token_service.generate_token(
             name=request.name,
             list_of_resources=request.list_of_resources,
@@ -103,23 +113,23 @@ async def generate_token(request: TokenGenerateRequest, db=Depends(get_db)):
             embargo=request.embargo,
             exp_hours=request.exp_hours
         )
-        
+
         return TokenResponse(token=token)
     except Exception as e:
         logger.error(f"Error generating token: {e}")
         raise HTTPException(status_code=500, detail="Internal server error")
 
 @app.post("/tokens/validate", response_model=TokenValidationResponse)
-async def validate_token(token: str, db=Depends(get_db)):
+async def validate_token(token: Token, db=Depends(get_db)):
     """Validate and decode a JWT token"""
     try:
         token_service = TokenService(db)
-        is_valid = await token_service.is_token_valid(token)
-        decoded = token_service.decode_token(token) if is_valid else None
-        
+        is_valid = await token_service.is_token_valid(token.token)
+        decoded = token_service.decode_token(token.token) if is_valid else None
+
         return TokenValidationResponse(
             valid=is_valid,
-            token=token,
+            token=token.token,
             decoded=decoded if is_valid and "error" not in (decoded or {}) else None,
             error=decoded.get("error") if decoded and "error" in decoded else None
         )
@@ -128,11 +138,11 @@ async def validate_token(token: str, db=Depends(get_db)):
         raise HTTPException(status_code=500, detail="Internal server error")
 
 @app.post("/tokens/save")
-async def save_token(token: str, db=Depends(get_db)):
+async def save_token(token: Token, db=Depends(get_db)):
     """Save a token to database"""
     try:
         token_service = TokenService(db)
-        result = await token_service.insert_token(token)
+        result = await token_service.insert_token(token.token)
         return result
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
@@ -159,7 +169,7 @@ async def get_token_permissions(token: str, db=Depends(get_db)):
     try:
         token_service = TokenService(db)
         permissions = await token_service.get_token_permissions(token)
-        
+
         if permissions:
             return {"permissions": permissions}
         else:
@@ -176,7 +186,7 @@ async def cleanup_expired_tokens(db=Depends(get_db)):
     try:
         token_service = TokenService(db)
         expired_count = await token_service.cleanup_expired_tokens()
-        
+
         return {
             "message": "Expired tokens cleaned up",
             "expired_tokens_removed": expired_count
@@ -187,4 +197,4 @@ async def cleanup_expired_tokens(db=Depends(get_db)):
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8001)
+    uvicorn.run(app, host="0.0.0.0", port=8001)