From e39644629a624cf181705ec78a56e97ed1d4512e Mon Sep 17 00:00:00 2001 From: Jorge Miguel Lobo Escalona <47326048+jloboescalona2@users.noreply.github.com> Date: Mon, 26 Oct 2020 10:53:11 +0100 Subject: [PATCH] B #3951: fix routing server fireedge (#358) Signed-off-by: Jorge Lobo Co-authored-by: Jorge Lobo --- src/fireedge/src/server/index.js | 11 +++++++---- src/fireedge/src/server/routes/entrypoints/App.js | 2 +- src/fireedge/src/server/utils/constants/defaults.js | 7 +++++++ src/fireedge/webpack.config.dev.client.js | 7 ++++--- src/fireedge/webpack.config.prod.client.js | 5 ++++- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/fireedge/src/server/index.js b/src/fireedge/src/server/index.js index a102cb88cb..1a07b58afd 100644 --- a/src/fireedge/src/server/index.js +++ b/src/fireedge/src/server/index.js @@ -15,7 +15,7 @@ import { } from 'fs-extra' import http from 'http' import https from 'https' -import { defaultTypeLog, defaultPort, defaultWebpackMode } from './utils/constants/defaults' +import { defaultTypeLog, defaultPort, defaultWebpackMode, defaultApps } from './utils/constants/defaults' import { validateServerIsSecure, getCert, @@ -109,9 +109,12 @@ app.use(bodyParser.urlencoded({ extended: false })) app.use(bodyParser.json()) app.use('/api', entrypointApi) // opennebula Api routes -app.get('/provision', entrypointApp) -app.get('/fireedge', entrypointApp) -app.get('/', (req, res) => res.send('index')) +const frontApps = Object.keys(defaultApps) +frontApps.map(frontApp => { + app.get(`/${frontApp}`, entrypointApp) + app.get(`/${frontApp}/*`, entrypointApp) +}) +app.get('/*', (req, res) => res.send('index')) // 404 - public app.get('*', entrypoint404) diff --git a/src/fireedge/src/server/routes/entrypoints/App.js b/src/fireedge/src/server/routes/entrypoints/App.js index 569a58b794..fb09a08135 100644 --- a/src/fireedge/src/server/routes/entrypoints/App.js +++ b/src/fireedge/src/server/routes/entrypoints/App.js @@ -33,7 +33,7 @@ router.get('*', (req, res) => { let storeRender = '' let chunks = '' if (env.NODE_ENV === 'production') { - app = req.url.replace(/\//g, '') + app = req.url.split(/\//gi).filter(sub => sub && sub.length > 0)[0] chunks = `` } diff --git a/src/fireedge/src/server/utils/constants/defaults.js b/src/fireedge/src/server/utils/constants/defaults.js index be0d7a2286..a20058fa21 100644 --- a/src/fireedge/src/server/utils/constants/defaults.js +++ b/src/fireedge/src/server/utils/constants/defaults.js @@ -13,10 +13,17 @@ /* limitations under the License. */ /* -------------------------------------------------------------------------- */ +const apps = { + fireedge: { + assets: true + }, + provision: undefined +} const default2FAOpennebulaVar = 'TWO_FACTOR_AUTH_SECRET' const defaultIp = '127.0.0.1' const protocol = 'http' const defaults = { + defaultApps: apps, httpMethod: { GET: 'GET', POST: 'POST', diff --git a/src/fireedge/webpack.config.dev.client.js b/src/fireedge/webpack.config.dev.client.js index 0ad11a6f07..db51909e4e 100644 --- a/src/fireedge/webpack.config.dev.client.js +++ b/src/fireedge/webpack.config.dev.client.js @@ -8,7 +8,8 @@ const js = { include: path.resolve(__dirname, 'src', 'client') } -const bundle = ({ name = 'fireedge' } = {}) => { +const bundle = () => { + const devPathFile = path.resolve(__dirname, 'src', 'client', 'dev.js') const plugins = [ new webpack.HotModuleReplacementPlugin(), new webpack.DefinePlugin({ @@ -21,11 +22,11 @@ const bundle = ({ name = 'fireedge' } = {}) => { mode: defaultWebpackMode, entry: [ 'webpack-hot-middleware/client', - path.resolve(__dirname, 'src', 'client', 'dev.js') + devPathFile ], target: 'web', output: { - path: path.resolve(__dirname, 'src', 'client', 'dev.js'), + path: devPathFile, filename: 'bundle.dev.js', publicPath: '/client' }, diff --git a/src/fireedge/webpack.config.prod.client.js b/src/fireedge/webpack.config.prod.client.js index f25eb3b9e2..0ac46291ea 100644 --- a/src/fireedge/webpack.config.prod.client.js +++ b/src/fireedge/webpack.config.prod.client.js @@ -1,6 +1,7 @@ const path = require('path') const webpack = require('webpack') const CopyPlugin = require('copy-webpack-plugin') +const { defaultApps } = require('./src/server/utils/constants/defaults') const js = { test: /\.js$/, @@ -41,4 +42,6 @@ const bundle = ({ assets = false, name = 'fireedge' }) => { } } -module.exports = [bundle({ assets: true }), bundle({ name: 'provision' })] +module.exports = () => Object.entries(defaultApps).map(([key, values]) => + bundle({ ...values, name: key }) +)