Add improvements 2

gateway/app/routes/tenant.py

@@ -10,6 +10,7 @@ import logging
 from typing import Optional
 
 from app.core.config import settings
+from app.core.header_manager import header_manager
 
 logger = logging.getLogger(__name__)
 router = APIRouter()
@@ -715,36 +716,18 @@ async def _proxy_request(request: Request, target_path: str, service_url: str, t
     try:
         url = f"{service_url}{target_path}"
 
-        # Forward headers and add user/tenant context
-        headers = dict(request.headers)
-        headers.pop("host", None)
-
-        # Add tenant ID header if provided
+        # Use unified HeaderManager for consistent header forwarding
+        headers = header_manager.get_all_headers_for_proxy(request)
+        
+        # Add tenant ID header if provided (override if needed)
         if tenant_id:
-            headers["X-Tenant-ID"] = tenant_id
-
-        # Add user context headers if available
-        if hasattr(request.state, 'user') and request.state.user:
-            user = request.state.user
-            headers["x-user-id"] = str(user.get('user_id', ''))
-            headers["x-user-email"] = str(user.get('email', ''))
-            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}, subscription_tier={user.get('subscription_tier', 'not_set')}")
+            headers["x-tenant-id"] = tenant_id
+        
+        # Debug logging
+        user_context = getattr(request.state, 'user', None)
+        if user_context:
+            logger.info(f"Forwarding request to {url} with user context: user_id={user_context.get('user_id')}, email={user_context.get('email')}, tenant_id={tenant_id}, subscription_tier={user_context.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')}")
         
         # Get request body if present
@@ -782,9 +765,10 @@ async def _proxy_request(request: Request, target_path: str, service_url: str, t
 
                 logger.info(f"Forwarding multipart request with files={list(files.keys()) if files else None}, data={list(data.keys()) if data else None}")
 
-                # Remove content-type from headers - httpx will set it with new boundary
-                headers.pop("content-type", None)
-                headers.pop("content-length", None)
+                # For multipart requests, we need to get fresh headers since httpx will set content-type
+                # Get all headers again to ensure we have the complete set
+                headers = header_manager.get_all_headers_for_proxy(request)
+                # httpx will automatically set content-type for multipart, so we don't need to remove it
             else:
                 # For other content types, use body as before
                 body = await request.body()