From ff17a9db0681b2ac1c15a14d97c71ef5199873a6 Mon Sep 17 00:00:00 2001
From: yassinedorbozgithub <yassine.dorboz.2022@gmail.com>
Date: Fri, 11 Oct 2024 16:56:57 +0100
Subject: [PATCH] fix(api): unit tests

---
 api/package.json                            |  1 +
 api/src/websocket/websocket.gateway.spec.ts |  2 ++
 api/src/websocket/websocket.gateway.ts      | 34 +++++++++------------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/api/package.json b/api/package.json
index 1ef51c5e..39b2bbbc 100644
--- a/api/package.json
+++ b/api/package.json
@@ -24,6 +24,7 @@
     "test:cov": "jest --coverage --runInBand --detectOpenHandles --forceExit",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
+    "test:clear": "jest --clearCache",
     "typecheck": "tsc --noEmit",
     "reset": "npm install && npm run containers:restart",
     "reset:hard": "npm clean-install && npm run containers:rebuild",
diff --git a/api/src/websocket/websocket.gateway.spec.ts b/api/src/websocket/websocket.gateway.spec.ts
index bde00124..1f255b30 100644
--- a/api/src/websocket/websocket.gateway.spec.ts
+++ b/api/src/websocket/websocket.gateway.spec.ts
@@ -49,6 +49,8 @@ describe('WebsocketGateway', () => {
     ioClient = io('http://localhost:3000', {
       autoConnect: false,
       transports: ['websocket', 'polling'],
+      // path: '/socket.io/?EIO=4&transport=websocket&channel=offline',
+      query: { EIO: '4', transport: 'websocket', channel: 'offline' },
     });
 
     app.listen(3000);
diff --git a/api/src/websocket/websocket.gateway.ts b/api/src/websocket/websocket.gateway.ts
index cb903177..2d4b69c9 100644
--- a/api/src/websocket/websocket.gateway.ts
+++ b/api/src/websocket/websocket.gateway.ts
@@ -251,30 +251,26 @@ export class WebsocketGateway
 
   handleConnection(client: Socket, ..._args: any[]): void {
     const { sockets } = this.io.sockets;
-    const handshake = client.handshake;
-    const { channel } = handshake.query;
     this.logger.log(`Client id: ${client.id} connected`);
     this.logger.debug(`Number of connected clients: ${sockets?.size}`);
 
     this.eventEmitter.emit(`hook:websocket:connection`, client);
     // @TODO : Revisit once we don't use anymore in frontend
-    if (!channel) {
-      const response = new SocketResponse();
-      client.send(
-        response
-          .setHeaders({
-            'access-control-allow-origin':
-              config.security.cors.allowOrigins.join(','),
-            vary: 'Origin',
-            'access-control-allow-credentials':
-              config.security.cors.allowCredentials.toString(),
-          })
-          .status(200)
-          .json({
-            success: true,
-          }),
-      );
-    }
+    const response = new SocketResponse();
+    client.send(
+      response
+        .setHeaders({
+          'access-control-allow-origin':
+            config.security.cors.allowOrigins.join(','),
+          vary: 'Origin',
+          'access-control-allow-credentials':
+            config.security.cors.allowCredentials.toString(),
+        })
+        .status(200)
+        .json({
+          success: true,
+        }),
+    );
   }
 
   async handleDisconnect(client: Socket): Promise<void> {