Merge pull request #886 from snyk/fix/ha-mode-regression-post-refacto…

…ring fix: restore ha mode by adding serverId again post refactoring
snyk · Dec 2, 2024 · 17d84c5 · 17d84c5
2 parents 7f22ddf + 7095c12
commit 17d84c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/client/socket.ts b/lib/client/socket.ts
@@ -151,11 +151,11 @@ export const createWebSocket = (
     websocket.identifier = identifyingMetadata.identifier;
     websocket.supportedIntegrationType =
       identifyingMetadata.supportedIntegrationType || '';
-    websocket.serverId = serverId || '';
     websocket.friendlyName = identifyingMetadata.friendlyName || '';
   } else {
     websocket.identifier = maskToken(identifyingMetadata.identifier);
   }
+  websocket.serverId = serverId || '';
   websocket.clientConfig = identifyingMetadata.clientConfig;
   websocket.role = identifyingMetadata.role;
 

diff --git a/lib/hybrid-sdk/responseSenders.ts b/lib/hybrid-sdk/responseSenders.ts
@@ -112,9 +112,7 @@ export class HybridResponseHandler {
         this.logContext,
         this.options,
         this.connectionIdentifier,
-        this.options.universalBrokerEnabled
-          ? this.websocketConnectionHandler?.serverId
-          : this.options.serverId,
+        this.websocketConnectionHandler?.serverId ?? '',
         this.requestMetadata.requestId,
         this.websocketConnectionHandler.role,
       );