New token arch

gateway/app/routes/notification.py

@@ -1,66 +0,0 @@
-"""
-Notification routes for gateway
-"""
-
-from fastapi import APIRouter, Request, HTTPException
-from fastapi.responses import JSONResponse
-import httpx
-import logging
-
-from app.core.config import settings
-
-logger = logging.getLogger(__name__)
-router = APIRouter()
-
-@router.post("/send")
-async def send_notification(request: Request):
-    """Proxy notification request to notification service"""
-    try:
-        body = await request.body()
-        auth_header = request.headers.get("Authorization")
-        
-        async with httpx.AsyncClient(timeout=10.0) as client:
-            response = await client.post(
-                f"{settings.NOTIFICATION_SERVICE_URL}/send",
-                content=body,
-                headers={
-                    "Content-Type": "application/json",
-                    "Authorization": auth_header
-                }
-            )
-            
-            return JSONResponse(
-                status_code=response.status_code,
-                content=response.json()
-            )
-            
-    except httpx.RequestError as e:
-        logger.error(f"Notification service unavailable: {e}")
-        raise HTTPException(
-            status_code=503,
-            detail="Notification service unavailable"
-        )
-
-@router.get("/history")
-async def get_notification_history(request: Request):
-    """Get notification history"""
-    try:
-        auth_header = request.headers.get("Authorization")
-        
-        async with httpx.AsyncClient(timeout=10.0) as client:
-            response = await client.get(
-                f"{settings.NOTIFICATION_SERVICE_URL}/history",
-                headers={"Authorization": auth_header}
-            )
-            
-            return JSONResponse(
-                status_code=response.status_code,
-                content=response.json()
-            )
-            
-    except httpx.RequestError as e:
-        logger.error(f"Notification service unavailable: {e}")
-        raise HTTPException(
-            status_code=503,
-            detail="Notification service unavailable"
-        )

gateway/app/routes/subscription.py

@@ -98,7 +98,17 @@ async def _proxy_request(request: Request, target_path: str, service_url: str):
             headers["x-user-role"] = str(user.get('role', 'user'))
             headers["x-user-full-name"] = str(user.get('full_name', ''))
             headers["x-tenant-id"] = str(user.get('tenant_id', ''))
-            logger.info(f"Forwarding subscription request to {url} with user context: user_id={user.get('user_id')}, email={user.get('email')}")
+            
+            # Add subscription context headers
+            if user.get('subscription_tier'):
+                headers["x-subscription-tier"] = str(user.get('subscription_tier', ''))
+                logger.debug(f"Forwarding subscription tier: {user.get('subscription_tier')}")
+            
+            if user.get('subscription_status'):
+                headers["x-subscription-status"] = str(user.get('subscription_status', ''))
+                logger.debug(f"Forwarding subscription status: {user.get('subscription_status')}")
+            
+            logger.info(f"Forwarding subscription request to {url} with user context: user_id={user.get('user_id')}, email={user.get('email')}, subscription_tier={user.get('subscription_tier', 'not_set')}")
         else:
             logger.warning(f"No user context available when forwarding subscription request to {url}")
 

gateway/app/routes/tenant.py

@@ -731,8 +731,18 @@ async def _proxy_request(request: Request, target_path: str, service_url: str, t
             headers["x-user-role"] = str(user.get('role', 'user'))
             headers["x-user-full-name"] = str(user.get('full_name', ''))
             headers["x-tenant-id"] = tenant_id or str(user.get('tenant_id', ''))
+            
+            # Add subscription context headers
+            if user.get('subscription_tier'):
+                headers["x-subscription-tier"] = str(user.get('subscription_tier', ''))
+                logger.debug(f"Forwarding subscription tier: {user.get('subscription_tier')}")
+            
+            if user.get('subscription_status'):
+                headers["x-subscription-status"] = str(user.get('subscription_status', ''))
+                logger.debug(f"Forwarding subscription status: {user.get('subscription_status')}")
+            
             # Debug logging
-            logger.info(f"Forwarding request to {url} with user context: user_id={user.get('user_id')}, email={user.get('email')}, tenant_id={tenant_id}")
+            logger.info(f"Forwarding request to {url} with user context: user_id={user.get('user_id')}, email={user.get('email')}, tenant_id={tenant_id}, subscription_tier={user.get('subscription_tier', 'not_set')}")
         else:
             # Debug logging when no user context available
             logger.warning(f"No user context available when forwarding request to {url}. request.state.user: {getattr(request.state, 'user', 'NOT_SET')}")