Merge pull request #498 from microsoft/macae-v3-fr-dev-92

Pass user_id via query param in WebSocket connection

Author: marktayl1

src/backend/v3/api/router.py

@@ -51,23 +51,13 @@
 
 
 @app_v3.websocket("/socket/{process_id}")
-async def start_comms(websocket: WebSocket, process_id: str):
+async def start_comms(websocket: WebSocket, process_id: str, user_id: str = Query(None)):
     """Web-Socket endpoint for real-time process status updates."""
 
     # Always accept the WebSocket connection first
     await websocket.accept()
 
-    user_id = None
-    try:
-        # WebSocket headers are different, try to get user info
-        headers = dict(websocket.headers)
-        authenticated_user = get_authenticated_user_details(request_headers=headers)
-        user_id = authenticated_user.get("user_principal_id")
-        if not user_id:
-            user_id = "00000000-0000-0000-0000-000000000000"
-    except Exception as e:
-        logging.warning(f"Could not extract user from WebSocket headers: {e}")
-        user_id = "00000000-0000-0000-0000-000000000000"
+    user_id = user_id or "00000000-0000-0000-0000-000000000000"
 
     current_user_id.set(user_id)
 

src/frontend/src/services/WebSocketService.tsx

@@ -1,4 +1,4 @@
-import { getApiUrl, headerBuilder } from '../api/config';
+import { getApiUrl, getUserId, headerBuilder } from '../api/config';
 import { PlanDataService } from './PlanDataService';
 import { MPlanData, ParsedPlanApprovalRequest, StreamingPlanUpdate, StreamMessage, WebsocketMessageType } from '../models';
 
@@ -25,9 +25,10 @@ class WebSocketService {
         // Leave ws/wss as-is; anything else is assumed already correct
 
         // Decide path addition
+        let userId = getUserId();
         const hasApiSegment = /\/api(\/|$)/i.test(base);
         const socketPath = hasApiSegment ? '/v3/socket' : '/api/v3/socket';
-        const url = `${base}${socketPath}${processId ? `/${processId}` : `/${planId}`}`;
+        const url = `${base}${socketPath}${processId ? `/${processId}` : `/${planId}`}?user_id=${userId || ''}`;
         console.log("Constructed WebSocket URL:", url);
         return url;
     }