1 files changed, 7 insertions, 5 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
index 78b40473..e96485d8 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/interceptor/PortalResourceInterceptor.java
@@ -72,6 +72,8 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
 import org.onap.portalsdk.core.onboarding.util.AuthUtil;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.KeyConstants;
+import org.onap.portalsdk.core.onboarding.util.KeyProperties;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;
 import org.onap.portalsdk.core.util.SystemProperties;
@@ -253,7 +255,7 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 							throw new Exception("Invalid credentials!");
 						}
 						else {
-							final String appUsername = application.getUsername();
+							final String appUsername = application.getAppBasicAuthUsername();
 							logger.debug(EELFLoggerDelegate.debugLogger, "appUsername : {}",appUsername);
 
 							String[] accountNamePassword = EcompPortalUtils.getUserNamePassword(authHeader);
@@ -317,8 +319,8 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 					throw new Exception("Invalid credentials!");
 				}
 				else {
-					final String appUsername = application.getUsername();
-					final String dbDecryptedPwd = CipherUtil.decryptPKC(application.getAppPassword());
+					final String appUsername = application.getAppBasicAuthUsername();
+					final String dbDecryptedPwd = CipherUtil.decryptPKC(application.getAppBasicAuthPassword());
 					if (appUsername.equals(accountNamePassword[0]) && dbDecryptedPwd.equals(accountNamePassword[1])) {
 						return true;
 					}
@@ -370,7 +372,7 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 		String result = "";
 		if (encrypted != null && encrypted.length() > 0) {
 			try {
-				result = CipherUtil.decryptPKC(encrypted, SystemProperties.getProperty(SystemProperties.Decryption_Key));
+				result = CipherUtil.decryptPKC(encrypted, KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY));
 			} catch (Exception e) {
 				logger.error(EELFLoggerDelegate.errorLogger, "decryptedPassword failed", e);
 				throw e;
@@ -384,7 +386,7 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 		if (decryptedPwd != null && decryptedPwd.length() > 0) {
 			try {
 				result = CipherUtil.encryptPKC(decryptedPwd,
-						SystemProperties.getProperty(SystemProperties.Decryption_Key));
+						KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY));
 			} catch (Exception e) {
 				logger.error(EELFLoggerDelegate.errorLogger, "encryptedPassword() failed", e);
 				throw e;