From c5d39edc6a5c3f980e9341f3ef0a09b7d28f98a1 Mon Sep 17 00:00:00 2001 From: "andre.schmid" Date: Mon, 17 Feb 2020 10:11:54 +0000 Subject: Fix dev config designer user in catalog-ui The userId for the mocked user used in the catalog-ui development environment was incorrect. Small adjustments in the webpack.server.js file. Improves the README.md for better understanding of some configuration options. Change-Id: I231f4349a868a2544a6b1ab9e9deb68873850e2b Issue-ID: SDC-2779 Signed-off-by: andre.schmid --- catalog-ui/webpack.server.js | 154 +++++++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 78 deletions(-) (limited to 'catalog-ui/webpack.server.js') diff --git a/catalog-ui/webpack.server.js b/catalog-ui/webpack.server.js index 1993617197..b3675773bf 100644 --- a/catalog-ui/webpack.server.js +++ b/catalog-ui/webpack.server.js @@ -1,91 +1,89 @@ -let path = require('path'); - const mockApis = require('./configurations/mock.json').sdcConfig; const proxy = require('http-proxy-middleware'); const devPort = 9000; -const fePort = 8287; -const loclahost = "localhost"; // "localhost" -const portalCookieValue = "randomValue"; //for dev solely, in production - the webseal would add the cookie byitself. +const fePort = 8181; +const feHost = "localhost"; +const portalCookieValue = "randomValue"; //for dev solely, in production - the webseal would add the cookie by itself. -module.exports = function(env) { +module.exports = function (env) { - // Set default role - if (!env) { - env = { - role: "designer" - }; - } - console.log("Starting dev server with role: " + env.role); + // Set default user role + if (!env) { + env = { + role: "designer" + }; + } + console.log("Starting dev server with role: " + env.role); - const ServerConfig = { - port: devPort, - historyApiFallback: true, - inline: true, - stats: { - colors: true, - exclude: ['node_modules'] - }, - setup: server => { - let userType = mockApis.userTypes[env.role]; + const serverConfig = { + port: devPort, + historyApiFallback: true, + inline: true, + stats: { + colors: true, + exclude: ['node_modules'] + }, + setup: server => { + let userType = mockApis.userTypes[env.role]; - let middlewares = [ - (req, res, next) => { - res.cookie(mockApis.cookie.userIdSuffix, req.headers[mockApis.cookie.userIdSuffix] || userType.userId); - res.cookie(mockApis.cookie.userEmail, req.headers[mockApis.cookie.userEmail] || userType.email); - res.cookie(mockApis.cookie.userFirstName, req.headers[mockApis.cookie.userFirstName] || userType.firstName); - res.cookie(mockApis.cookie.userLastName, req.headers[mockApis.cookie.userLastName] || userType.lastName); - res.cookie(mockApis.cookie.portalCookie, portalCookieValue); - next(); -} -]; + let middlewares = [ + (req, res, next) => { + res.cookie(mockApis.cookie.userIdSuffix, req.headers[mockApis.cookie.userIdSuffix] || userType.userId); + res.cookie(mockApis.cookie.userEmail, req.headers[mockApis.cookie.userEmail] || userType.email); + res.cookie(mockApis.cookie.userFirstName, req.headers[mockApis.cookie.userFirstName] || userType.firstName); + res.cookie(mockApis.cookie.userLastName, req.headers[mockApis.cookie.userLastName] || userType.lastName); + res.cookie(mockApis.cookie.portalCookie, portalCookieValue); + next(); + } + ]; - // Redirect all '/sdc1/feProxy/rest' to feHost - middlewares.push( - proxy(['/sdc1/feProxy/rest', '/sdc1/feProxy/uicache'],{ - target: 'http://' + loclahost + ':' + fePort, - changeOrigin: true, - secure: false - })); + // Redirect all '/sdc1/feProxy/rest' to feHost + middlewares.push( + proxy(['/sdc1/feProxy/rest', '/sdc1/feProxy/uicache'], { + target: 'http://' + feHost + ':' + fePort, + changeOrigin: true, + secure: false + })); - // Redirect all '/sdc1/rest' to feHost - middlewares.push( - proxy(['/sdc1/rest'],{ - target: 'http://' + loclahost + ':' + fePort, - changeOrigin: true, - secure: false - })); + // Redirect all '/sdc1/rest' to feHost + middlewares.push( + proxy(['/sdc1/rest'], { + target: 'http://' + feHost + ':' + fePort, + changeOrigin: true, + secure: false + })); - // Redirect dcae urls to feHost - middlewares.push( - proxy(['/dcae','/sdc1/feProxy/dcae-api'],{ - target: 'http://' + loclahost + ':' + fePort, - changeOrigin: true, - secure: false, - onProxyRes: (proxyRes, req, res) => { - let setCookie = proxyRes.headers['set-cookie']; - if (setCookie) { - setCookie[0] = setCookie[0].replace(/\bSecure\b(; )?/, ''); - } -} -})); + // Redirect dcae urls to feHost + middlewares.push( + proxy(['/dcae', '/sdc1/feProxy/dcae-api'], { + target: 'http://' + feHost + ':' + fePort, + changeOrigin: true, + secure: false, + onProxyRes: (proxyRes, req, res) => { + let setCookie = proxyRes.headers['set-cookie']; + if (setCookie) { + setCookie[0] = setCookie[0].replace(/\bSecure\b(; )?/, ''); + } + } + })); - // Redirect onboarding urls to feHost - middlewares.push( - proxy(['/onboarding','/sdc1/feProxy/onboarding-api'],{ - target: 'http://' + loclahost + ':' + fePort, - changeOrigin: true, - secure: false, - onProxyRes: (proxyRes, req, res) => { - let setCookie = proxyRes.headers['set-cookie']; - if (setCookie) { - setCookie[0] = setCookie[0].replace(/\bSecure\b(; )?/, ''); - } -} -})); + // Redirect onboarding urls to feHost + middlewares.push( + proxy(['/onboarding', '/sdc1/feProxy/onboarding-api'], { + target: 'http://' + feHost + ':' + fePort, + changeOrigin: true, + secure: false, + onProxyRes: (proxyRes, req, res) => { + let setCookie = proxyRes.headers['set-cookie']; + if (setCookie) { + setCookie[0] = setCookie[0].replace(/\bSecure\b(; )?/, ''); + } + } + })); - server.use(middlewares); -} -}; + server.use(middlewares); + } + }; - return ServerConfig; -} + return serverConfig; +}; -- cgit 1.2.3-korg