From 1561fcbfcd82ffe7d2198b2d3f3aa5205ad089be Mon Sep 17 00:00:00 2001
From: Jorge Miguel Lobo Escalona
 <47326048+jloboescalona2@users.noreply.github.com>
Date: Thu, 3 Jun 2021 11:10:01 +0200
Subject: [PATCH] M #~: fix cors sockets (#1267)

Co-authored-by: Jorge Lobo <jlobo@opennebula.systems>
---
 src/fireedge/src/server/routes/websockets/index.js | 12 +++++++++++-
 src/sunstone/public/app/main.js                    |  2 +-
 src/sunstone/public/bower.json                     |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/fireedge/src/server/routes/websockets/index.js b/src/fireedge/src/server/routes/websockets/index.js
index a49fed3679..b33c1830ae 100644
--- a/src/fireedge/src/server/routes/websockets/index.js
+++ b/src/fireedge/src/server/routes/websockets/index.js
@@ -31,7 +31,17 @@ const websockets = (appServer = {}) => {
     appServer.constructor.name &&
     appServer.constructor.name === 'Server'
   ) {
-    const io = socketIO({ path: defaultEndpointWebsocket }).listen(appServer)
+    const io = socketIO(
+      {
+        path: defaultEndpointWebsocket,
+        cors: {
+          origin: '*',
+          methods: ['GET', 'POST'],
+          credentials: true
+        }
+      }
+    ).listen(appServer)
+
     defaultFilesWebsockets.forEach(file => {
       try {
         // eslint-disable-next-line global-require
diff --git a/src/sunstone/public/app/main.js b/src/sunstone/public/app/main.js
index 2d3016ca2e..d146b3b1a2 100644
--- a/src/sunstone/public/app/main.js
+++ b/src/sunstone/public/app/main.js
@@ -102,7 +102,7 @@ require.config({
     "sprintf": "../bower_components/sprintf/dist/sprintf.min",
 
     /* socket.io-client */
-    "socket-io-client": "../bower_components/socket.io-client/dist/socket.io.slim",
+    "socket-io-client": "../bower_components/socket.io-client/dist/socket.io.min",
 
     /* ace editor */
     "ace-builds": "../bower_components/ace-builds/ace"
diff --git a/src/sunstone/public/bower.json b/src/sunstone/public/bower.json
index 371dc358db..00d1b88c59 100644
--- a/src/sunstone/public/bower.json
+++ b/src/sunstone/public/bower.json
@@ -22,7 +22,7 @@
     "guacamole-common-js": "https://github.com/OpenNebula/sunstone-deps.git#fe6e35b885",
     "webauthn-json": "https://registry.npmjs.org/@github/webauthn-json/-/webauthn-json-0.4.1.tgz",
     "wmks": "https://github.com/OpenNebula/sunstone-deps.git#cb0251c",
-    "socket.io-client": "~2.3.0",
+    "socket.io-client": "4.1.2",
     "ace-builds": "https://github.com/OpenNebula/sunstone-deps.git#01ae12a" 
   },
   "authors": [