From 55bf3c703660044e35dcecc0f8245ee4743d8f7d Mon Sep 17 00:00:00 2001
From: Taha Yassine Kraiem <tahayk2@gmail.com>
Date: Wed, 16 Mar 2022 15:24:16 +0100
Subject: [PATCH] feat(utilities): EE assist-standalone fixed extract userId

---
 ee/utilities/servers/websocket.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ee/utilities/servers/websocket.js b/ee/utilities/servers/websocket.js
index 4aa048b1f..7e5f062fa 100644
--- a/ee/utilities/servers/websocket.js
+++ b/ee/utilities/servers/websocket.js
@@ -42,7 +42,12 @@ const createSocketIOServer = function (server) {
 }
 
 const extractUserIdFromRequest = function (req) {
-    if (req.query.userId) {
+    if (process.env.uws === "true") {
+        if (req.getQuery("userId")) {
+            debug && console.log(`[WS]where userId=${req.getQuery("userId")}`);
+            return req.getQuery("userId");
+        }
+    } else if (req.query.userId) {
         debug && console.log(`[WS]where userId=${req.query.userId}`);
         return req.query.userId;
     }
@@ -51,8 +56,10 @@ const extractUserIdFromRequest = function (req) {
 
 const extractProjectKeyFromRequest = function (req) {
     if (process.env.uws === "true") {
-        debug && console.log(`[WS]where projectKey=${req.getParameter(0)}`);
-        return req.getParameter(0);
+        if (req.getParameter(0)) {
+            debug && console.log(`[WS]where projectKey=${req.getParameter(0)}`);
+            return req.getParameter(0);
+        }
     } else if (req.params.projectKey) {
         debug && console.log(`[WS]where projectKey=${req.params.projectKey}`);
         return req.params.projectKey;