Resolved the License issue in Policy

Updated epsdk version from 1.1.0 to 1.3.1 to resolve the flexslider.
Added Exclusions to resolve the mysql and iText.

Issue-ID: POLICY-355
Change-Id: Iffb052bee37aa3c10f634db1b5bdb2985e9f176b
Signed-off-by: rb7147 <rb7147@att.com>

6 files changed, 47 insertions, 40 deletions

diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index e6ef8ed1e..04f933930 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -31,7 +31,7 @@
 
 	<properties>
 		<encoding>UTF-8</encoding>
-		<epsdk.version>1.1.0</epsdk.version>
+		<epsdk.version>1.3.1</epsdk.version>
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. -->
@@ -108,8 +108,11 @@
 					</archive>
 					<overlays>
 						<overlay>
-							<groupId>org.openecomp.ecompsdkos</groupId>
+							<groupId>org.onap.portal.sdk</groupId>
 							<artifactId>epsdk-app-overlay</artifactId>
+							<excludes>
+               					<exclude>static/fusion/raptor/uigrid/vfs_fonts.js</exclude>
+           			 		</excludes>
 						</overlay>
 						<overlay>
 							<groupId>org.onap.policy.engine</groupId>
@@ -149,7 +152,7 @@
 			<type>war</type>
 			<exclusions>
 				<exclusion>
-					<groupId>org.openecomp.ecompsdkos</groupId>
+					<groupId>org.onap.portal.sdk</groupId>
 					<artifactId>epsdk-core</artifactId>
 				</exclusion>
 			</exclusions>
@@ -162,7 +165,7 @@
 			<classifier>classes</classifier>
 			<exclusions>
 				<exclusion>
-					<groupId>org.openecomp.ecompsdkos</groupId>
+					<groupId>org.onap.portal.sdk</groupId>
 					<artifactId>epsdk-core</artifactId>
 				</exclusion>
 			</exclusions>
@@ -180,25 +183,31 @@
 		</dependency>
 		<!-- SDK overlay war -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-overlay</artifactId>
 			<version>${epsdk.version}</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-common</artifactId>
 			<version>${epsdk.version}</version>
 			<type>jar</type>
 		</dependency>
 		<!-- SDK components -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-core</artifactId>
 			<version>${epsdk.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>mysql</groupId>
+    				<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-analytics</artifactId>
 			<version>${epsdk.version}</version>
 			<exclusions>
@@ -209,7 +218,7 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-workflow</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
diff --git a/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
index 567fbb7cf..3b38f1d8e 100644
--- a/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
+++ b/ONAP-SDK-APP/src/main/java/org/openecomp/portalapp/login/LoginStrategyImpl.java
@@ -26,10 +26,10 @@ import javax.servlet.http.HttpServletResponse;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.openecomp.portalsdk.core.auth.LoginStrategy;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException;
 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.portalsdk.core.util.SystemProperties;
 import org.springframework.web.servlet.ModelAndView;
 
 public class LoginStrategyImpl extends LoginStrategy {
@@ -58,23 +58,21 @@ public class LoginStrategyImpl extends LoginStrategy {
     }
 
     private static String getUserIdFromCookie(HttpServletRequest request) throws PortalAPIException {
-        String userId = "";
-        Cookie[] cookies = request.getCookies();
-        Cookie userIdcookie = null;
-        if (cookies != null)
-            for (Cookie cookie : cookies)
-                if (cookie.getName().equals(USER_ID))
-                    userIdcookie = cookie;
-        if (userIdcookie != null) {
-            try {
-                userId = CipherUtil.decrypt(userIdcookie.getValue(),
-                        PortalApiProperties.getProperty(PortalApiConstants.Decryption_Key));
-            } catch (Exception e) {
-                throw new PortalAPIException(e);
-            }
-        }
-        return userId;
-
+    	String userId = ""; 
+		Cookie userIdCookie = getCookie(request, USER_ID); 
+		if (userIdCookie != null) { 
+			final String cookieValue = userIdCookie.getValue(); 
+			if (!SystemProperties.containsProperty(SystemProperties.Decryption_Key)) 
+				throw new IllegalStateException("Failed to find property " + SystemProperties.Decryption_Key); 
+			final String decryptionKey = SystemProperties.getProperty(SystemProperties.Decryption_Key); 
+			try {
+				userId = CipherUtil.decrypt(cookieValue, decryptionKey);
+				LOGGER.debug("getUserIdFromCookie: decrypted as {}" +userId); 
+			} catch (Exception e) {
+				LOGGER.error("Exception Occured in getUserIdFromCookie" + e);
+			} 
+		} 
+		return userId;
     }
 
     private static boolean isLoginCookieExist(HttpServletRequest request) {
diff --git a/ONAP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties
index 30cbf0fff..1f2336d7b 100644
--- a/ONAP-SDK-APP/src/main/resources/portal.properties
+++ b/ONAP-SDK-APP/src/main/resources/portal.properties
@@ -27,11 +27,6 @@ portal.api.prefix = /api
 max.idle.time = 5
 user.attribute.name = user_attribute
 
-# CSP settings
-csp_cookie_name          = attESSec
-csp_gate_keeper_prod_key = PROD
-testing=testing
-
 #Use REST API instead of UEB to fetch the functional menu data
 use_rest_for_functional_menu=true
 
diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 5adb5d169..aea0afc24 100644
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -49,7 +49,7 @@
 	</build>
 	<properties>
 		<encoding>UTF-8</encoding>
-		<epsdk.version>1.1.0</epsdk.version>
+		<epsdk.version>1.3.1</epsdk.version>
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<skipassembly>true</skipassembly>
@@ -59,9 +59,15 @@
 	</properties>
 	<dependencies>
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-core</artifactId>
 			<version>${epsdk.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>mysql</groupId>
+    				<artifactId>mysql-connector-java</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	<!-- Spring -->
 		<dependency>
diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml
index effaf5b9d..df846eec7 100644
--- a/PolicyEngineUtils/pom.xml
+++ b/PolicyEngineUtils/pom.xml
@@ -102,6 +102,10 @@
 					<groupId>com.google.guava</groupId>
 					<artifactId>guava</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>com.lowagie</groupId>
+    				<artifactId>itext</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
diff --git a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties
index eaee63f60..4c95afbcc 100644
--- a/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties
+++ b/packages/base/src/files/install/servers/onap/WEB-INF/classes/portal.properties
@@ -28,11 +28,6 @@ portal.api.prefix = /api
 max.idle.time = 5
 user.attribute.name = user_attribute
 
-# CSP settings
-csp_cookie_name          = attESSec
-csp_gate_keeper_prod_key = PROD
-testing=testing
-
 #Use REST API instead of UEB to fetch the functional menu data
 use_rest_for_functional_menu=true