From 386ff5afa695fde40eebd6021c14b373f45d5340 Mon Sep 17 00:00:00 2001
From: Shahana Farooqui <rtl_app@protonmail.com>
Date: Sat, 5 Mar 2022 12:13:02 -0500
Subject: [PATCH] Typescript types fix

Typescript types fix
---
 backend/utils/cors.js            | 2 +-
 backend/utils/webSocketServer.js | 1 -
 server/utils/app.ts              | 2 +-
 server/utils/cors.ts             | 2 +-
 server/utils/webSocketServer.ts  | 3 +--
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/backend/utils/cors.js b/backend/utils/cors.js
index 331f981e..4137b13d 100644
--- a/backend/utils/cors.js
+++ b/backend/utils/cors.js
@@ -12,7 +12,7 @@ class CORS {
             res.setHeader('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization, filePath');
             res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, DELETE, OPTIONS');
             if (process.env.NODE_ENV === 'development') {
-                res.setHeader('Access-Control-Allow-Credentials', true);
+                res.setHeader('Access-Control-Allow-Credentials', 'true');
                 res.setHeader('Access-Control-Allow-Origin', req.headers.origin ? req.headers.origin : req.headers.host ? req.headers.host : '');
             }
             next();
diff --git a/backend/utils/webSocketServer.js b/backend/utils/webSocketServer.js
index def55a69..2ef75a0f 100644
--- a/backend/utils/webSocketServer.js
+++ b/backend/utils/webSocketServer.js
@@ -42,7 +42,6 @@ export class WebSocketServer {
                 if (protocols.includes('json')) {
                     responseHeaders.push('Sec-WebSocket-Protocol: json');
                 }
-                // socket.write(responseHeaders.join('\r\n') + '\r\n\r\n');
                 this.webSocketServer.handleUpgrade(request, socket, head, this.upgradeCallback);
             });
             this.webSocketServer.on('connection', this.mountEventsOnConnection);
diff --git a/server/utils/app.ts b/server/utils/app.ts
index 5c0f28e6..61f63d07 100644
--- a/server/utils/app.ts
+++ b/server/utils/app.ts
@@ -62,7 +62,7 @@ export class ExpressApplication {
     this.app.use(this.common.baseHref + '/api/cl', clRoutes);
     this.app.use(this.common.baseHref + '/api/ecl', eclRoutes);
     this.app.use(this.common.baseHref, express.static(join(this.directoryName, '../..', 'frontend')));
-    this.app.use((req, res, next) => {
+    this.app.use((req: any, res, next) => {
       res.cookie('XSRF-TOKEN', req.csrfToken ? req.csrfToken() : '');
       res.sendFile(join(this.directoryName, '../..', 'frontend', 'index.html'));
     });
diff --git a/server/utils/cors.ts b/server/utils/cors.ts
index 96b376b6..57bec2d7 100644
--- a/server/utils/cors.ts
+++ b/server/utils/cors.ts
@@ -14,7 +14,7 @@ class CORS {
       res.setHeader('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization, filePath');
       res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, DELETE, OPTIONS');
       if (process.env.NODE_ENV === 'development') {
-        res.setHeader('Access-Control-Allow-Credentials', true);
+        res.setHeader('Access-Control-Allow-Credentials', 'true');
         res.setHeader('Access-Control-Allow-Origin', req.headers.origin ? req.headers.origin : req.headers.host ? req.headers.host : '');
       }
       next();
diff --git a/server/utils/webSocketServer.ts b/server/utils/webSocketServer.ts
index 64e10b12..1a4ab99b 100644
--- a/server/utils/webSocketServer.ts
+++ b/server/utils/webSocketServer.ts
@@ -32,7 +32,7 @@ export class WebSocketServer {
     }
   }, 1000 * 60 * 60); // Terminate broken connections every hour
 
-  public mount = (httpServer: Application): Application => {
+  public mount = (httpServer) => {
     this.logger.log({ selectedNode: this.common.initSelectedNode, level: 'INFO', fileName: 'WebSocketServer', msg: 'Connecting Websocket Server..' });
     this.webSocketServer = new WebSocket.Server({ noServer: true, path: this.common.baseHref + '/api/ws', verifyClient: (process.env.NODE_ENV === 'development') ? null : verifyWSUser });
     httpServer.on('upgrade', (request, socket, head) => {
@@ -45,7 +45,6 @@ export class WebSocketServer {
       const responseHeaders = ['HTTP/1.1 101 Web Socket Protocol Handshake', 'Upgrade: WebSocket', 'Connection: Upgrade', 'Sec-WebSocket-Accept: ' + hash];
       const protocols = !request.headers['sec-websocket-protocol'] ? [] : request.headers['sec-websocket-protocol'].split(',').map((s) => s.trim());
       if (protocols.includes('json')) { responseHeaders.push('Sec-WebSocket-Protocol: json'); }
-      // socket.write(responseHeaders.join('\r\n') + '\r\n\r\n');
       this.webSocketServer.handleUpgrade(request, socket, head, this.upgradeCallback);
     });
     this.webSocketServer.on('connection', this.mountEventsOnConnection);