Add improvements 2

gateway/app/routes/user.py

@@ -13,6 +13,7 @@ from typing import Dict, Any
 import json
 
 from app.core.config import settings
+from app.core.header_manager import header_manager
 from app.core.service_discovery import ServiceDiscovery
 from shared.monitoring.metrics import MetricsCollector
 
@@ -136,64 +137,28 @@ class UserProxy:
         return AUTH_SERVICE_URL
     
     def _prepare_headers(self, headers, request=None) -> Dict[str, str]:
-        """Prepare headers for forwarding (remove hop-by-hop headers)"""
-        # Remove hop-by-hop headers
-        hop_by_hop_headers = {
-            'connection', 'keep-alive', 'proxy-authenticate',
-            'proxy-authorization', 'te', 'trailers', 'upgrade'
-        }
-
-        # Convert headers to dict if it's a Headers object
-        # This ensures we get ALL headers including those added by middleware
-        if hasattr(headers, '_list'):
-            # Get headers from the _list where middleware adds them
-            all_headers_list = headers.__dict__.get('_list', [])
-            
-            # Convert to dict for easier processing
-            all_headers = {}
-            for k, v in all_headers_list:
-                key = k.decode() if isinstance(k, bytes) else k
-                value = v.decode() if isinstance(v, bytes) else v
-                all_headers[key] = value
-            
-            # Check if headers are missing and try to get them from request.state
-            if request and hasattr(request, 'state') and hasattr(request.state, 'injected_headers'):
-                # Add missing headers from request.state
-                if 'x-user-id' not in all_headers and 'x-user-id' in request.state.injected_headers:
-                    all_headers['x-user-id'] = request.state.injected_headers['x-user-id']
-                if 'x-user-email' not in all_headers and 'x-user-email' in request.state.injected_headers:
-                    all_headers['x-user-email'] = request.state.injected_headers['x-user-email']
-                if 'x-user-role' not in all_headers and 'x-user-role' in request.state.injected_headers:
-                    all_headers['x-user-role'] = request.state.injected_headers['x-user-role']
-                
-                # Add is_demo flag if this is a demo session
-                if hasattr(request.state, 'is_demo_session') and request.state.is_demo_session:
-                    all_headers['x-is-demo'] = 'true'
-            
-            # Filter out hop-by-hop headers
-            filtered_headers = {
-                k: v for k, v in all_headers.items()
-                if k.lower() not in hop_by_hop_headers
-            }
-        elif hasattr(headers, 'raw'):
-            # FastAPI/Starlette Headers object - use raw to get all headers
-            filtered_headers = {
-                k.decode() if isinstance(k, bytes) else k: v.decode() if isinstance(v, bytes) else v
-                for k, v in headers.raw
-                if (k.decode() if isinstance(k, bytes) else k).lower() not in hop_by_hop_headers
-            }
+        """Prepare headers for forwarding using unified HeaderManager"""
+        # Use unified HeaderManager to get all headers
+        if request:
+            all_headers = header_manager.get_all_headers_for_proxy(request)
         else:
-            # Already a dict
-            filtered_headers = {
-                k: v for k, v in headers.items()
-                if k.lower() not in hop_by_hop_headers
-            }
-
-        # Add gateway identifier
-        filtered_headers['X-Forwarded-By'] = 'bakery-gateway'
-        filtered_headers['X-Gateway-Version'] = '1.0.0'
-
-        return filtered_headers
+            # Fallback: convert headers to dict manually
+            all_headers = {}
+            if hasattr(headers, '_list'):
+                for k, v in headers.__dict__.get('_list', []):
+                    key = k.decode() if isinstance(k, bytes) else k
+                    value = v.decode() if isinstance(v, bytes) else v
+                    all_headers[key] = value
+            elif hasattr(headers, 'raw'):
+                for k, v in headers.raw:
+                    key = k.decode() if isinstance(k, bytes) else k
+                    value = v.decode() if isinstance(v, bytes) else v
+                    all_headers[key] = value
+            else:
+                # Headers is already a dict
+                all_headers = dict(headers)
+        
+        return all_headers
     
     def _prepare_response_headers(self, headers: Dict[str, str]) -> Dict[str, str]:
         """Prepare response headers"""