[SDC-29] rebase continue work to align source

Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 20 insertions, 4 deletions

diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java
index 4eba2e5eb5..a743f98b18 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/servlets/PortalServlet.java
@@ -34,7 +34,9 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Context;
 
-import org.openecomp.portalsdk.core.onboarding.crossapi.ECOMPSSO;
+import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
 import org.openecomp.sdc.common.config.EcompErrorName;
 import org.openecomp.sdc.common.impl.MutableHttpServletRequest;
 import org.openecomp.sdc.fe.Constants;
@@ -95,9 +97,8 @@ public class PortalServlet extends HttpServlet {
 		if (null == userId) {
 			// Authentication via ecomp portal
 			try {
-				String valdiateECOMPSSO = ECOMPSSO.valdiateECOMPSSO(request);
-				String userIdFromCookie = ECOMPSSO.getUserIdFromCookie(request);
-				if (valdiateECOMPSSO == null || ("").equals(userIdFromCookie)) {
+				String userIdFromCookie = getUserIdFromCookie(request);
+				if (("").equals(userIdFromCookie)) {
 					// This is probably a webseal request, so missing header in request should be printed.
 					response.sendError(HttpServletResponse.SC_USE_PROXY, MISSING_HEADERS_MSG);
 				}
@@ -275,5 +276,20 @@ public class PortalServlet extends HttpServlet {
 		}
 		return newHeaderIsSet;
 	}
+	
+	private static String getUserIdFromCookie(HttpServletRequest request) throws Exception {
+		String userId = "";
+		Cookie[] cookies = request.getCookies();
+		Cookie userIdcookie = null;
+		if (cookies != null)
+			for (Cookie cookie : cookies)
+				if (cookie.getName().equals(Constants.USER_ID))
+					userIdcookie = cookie;
+		if (userIdcookie != null) {
+			userId = CipherUtil.decrypt(userIdcookie.getValue(),
+					PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key));
+		}
+		return userId;
 
+	}
 }