From 515dbc86128935d70a5467dfae6a7132286b3d10 Mon Sep 17 00:00:00 2001
From: Jorge Lobo <jlobo@opennebula.systems>
Date: Tue, 22 Jun 2021 10:38:20 +0200
Subject: [PATCH] F OpenNebula/One#5422: add baseURL websockets

Signed-off-by: Jorge Lobo <jlobo@opennebula.io>
---
 src/fireedge/src/client/constants/index.js          |  2 +-
 src/fireedge/src/server/utils/constants/defaults.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/fireedge/src/client/constants/index.js b/src/fireedge/src/client/constants/index.js
index d304ccd920..3ac17ecf3f 100644
--- a/src/fireedge/src/client/constants/index.js
+++ b/src/fireedge/src/client/constants/index.js
@@ -27,7 +27,7 @@ export const TIME_HIDE_LOGO = 1500
 export const _APPS = defaultApps
 export const APPS = Object.keys(defaultApps)
 export const APP_URL = defaultAppName ? `/${defaultAppName}` : ''
-export const WEBSOCKET_URL = `${APP_URL}/provision`
+export const WEBSOCKET_URL = `${APP_URL}/websockets/provision`
 export const STATIC_FILES_URL = `${APP_URL}/client/assets`
 
 export const IMAGES_URL = `${STATIC_FILES_URL}/images`
diff --git a/src/fireedge/src/server/utils/constants/defaults.js b/src/fireedge/src/server/utils/constants/defaults.js
index 33770cc518..05a23d0639 100644
--- a/src/fireedge/src/server/utils/constants/defaults.js
+++ b/src/fireedge/src/server/utils/constants/defaults.js
@@ -14,7 +14,7 @@
 /* -------------------------------------------------------------------------- */
 
 const appName = 'fireedge'
-const prepend = `${appName ? `/${appName}/` : '/'}`
+const baseUrl = `${appName ? `/${appName}/` : '/'}`
 const apps = {
   flow: {
     name: 'flow',
@@ -41,11 +41,11 @@ const defaults = {
   },
   defaultFilesWebsockets: {
     hooks: {
-      path: `${prepend}hooks`,
+      path: `${baseUrl}websockets/hooks`,
       methods: ['GET', 'POST']
     },
     provision: {
-      path: `${prepend}provision`,
+      path: `${baseUrl}websockets/provision`,
       methods: ['GET', 'POST']
     }
   },
@@ -99,8 +99,8 @@ const defaults = {
   defaultKeyFilename: `${appName}_key`,
   defaultVmrcTokens: 'sunstone_vmrc_tokens/',
   defaultBaseURL: '',
-  endpointVmrc: `${prepend}vmrc`,
-  endpointGuacamole: `${prepend}guacamole`,
+  endpointVmrc: `${baseUrl}vmrc`,
+  endpointGuacamole: `${baseUrl}guacamole`,
   defaultNamespace: 'one.',
   defaultMessageInvalidZone: 'Invalid Zone',
   default2FAIssuer: `${appName}-UI`,