Catalog alignment

Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe

1 files changed, 57 insertions, 69 deletions

diff --git a/catalog-ui/webpack.server.js b/catalog-ui/webpack.server.js
index b8821cd9d1..1993617197 100644
--- a/catalog-ui/webpack.server.js
+++ b/catalog-ui/webpack.server.js
@@ -3,8 +3,9 @@ let path = require('path');
 const mockApis = require('./configurations/mock.json').sdcConfig;
 const proxy = require('http-proxy-middleware');
 const devPort = 9000;
-const fePort = 8181;
-const localhost = "localhost";
+const fePort = 8287;
+const loclahost = "localhost"; // "localhost"
+const portalCookieValue = "randomValue"; //for dev solely, in production - the webseal would add the cookie byitself.
 
 module.exports = function(env) {
 
@@ -25,79 +26,66 @@ module.exports = function(env) {
 			exclude: ['node_modules']
 		},
 		setup: server => {
-			let userType = mockApis.userTypes[env.role];
+		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);
-					next();
-				}
-			];
-
-			// Redirect all '/sdc1/feProxy/rest' to feHost
-			middlewares.push(
-				proxy(['/sdc1/feProxy/rest'], {
-					target: 'http://' + localhost + ':' + fePort,
-					changeOrigin: true,
-					secure: false
-				}));
+	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/rest' to feHost
-			middlewares.push(
-				proxy(['/sdc1/rest'],{
-					target: 'http://' + localhost + ':' + fePort,
-					changeOrigin: true,
-					secure: false
-				}));
+	// 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 dcae urls to feHost
-			middlewares.push(
-				proxy(['/dcae','/sdc1/feProxy/dcae-api'], {
-					target: 'http://' + localhost + ':' + 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 all '/sdc1/rest' to feHost
+	middlewares.push(
+		proxy(['/sdc1/rest'],{
+			target: 'http://' + loclahost + ':' + fePort,
+			changeOrigin: true,
+			secure: false
+		}));
 
-			// Redirect onboarding urls to feHost
-			middlewares.push(
-				proxy(['/onboarding', '/sdc1/feProxy/onboarding-api'], {
-					target: 'http://' + localhost + ':' + 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://' + 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 workflow urls to feHost
-			middlewares.push(
-				proxy(['/sdc1/feProxy/wf', '/wf'], {
-					target: 'http://' + localhost + ':' + 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(; )?/, '');
+	}
+}
+}));
 
-			server.use(middlewares);
-		}
-	};
+	server.use(middlewares);
+}
+};
 
 	return ServerConfig;
 }