From 5368d38e9d0dbfb03745db0de44277a9bae2a219 Mon Sep 17 00:00:00 2001
From: Heikki Hellgren <heikki.hellgren@op.fi>
Date: Fri, 8 Dec 2023 15:50:41 +0200
Subject: [PATCH] fix: add check for request path to upgrade

Signed-off-by: Heikki Hellgren <heikki.hellgren@op.fi>
---
 plugins/signals-backend/src/service/router.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/signals-backend/src/service/router.ts b/plugins/signals-backend/src/service/router.ts
index 7b0cc02a1d..8926910544 100644
--- a/plugins/signals-backend/src/service/router.ts
+++ b/plugins/signals-backend/src/service/router.ts
@@ -34,9 +34,7 @@ export async function createRouter(
   const { logger, service } = options;
   let subscribed = false;
   const upgradeMiddleware = (req: Request, _: Response, next: NextFunction) => {
-    const server: https.Server | http.Server = (
-      (req.socket ?? req.connection) as any
-    )?.server;
+    const server: https.Server | http.Server = (req.socket as any)?.server;
     if (
       !server ||
       !req.headers ||
@@ -50,7 +48,10 @@ export async function createRouter(
     if (!subscribed) {
       subscribed = true;
       server.on('upgrade', async (request, socket, head) => {
-        await service.handleUpgrade(request, socket, head);
+        // Only upgrade if request to root of the signals plugin
+        if (request.url === '/api/signals') {
+          await service.handleUpgrade(request, socket, head);
+        }
       });
     }
   };