X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Finterceptor%2FPortalResourceInterceptor.java;h=5a57e09440d6a0a4209417f3ba27ae7debb4b31d;hb=230c71614b1d2fb71a8fb482c749ff5a6dad65d8;hp=146050a48318da7c57423a1e8e9014e862f32820;hpb=e42eae64a6ed2dbdf9dd1112bb31633faf60e0a3;p=portal.git

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 146050a4..5a57e094 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
@@ -39,17 +39,12 @@
  */
 package org.onap.portalapp.portal.interceptor;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mockito.internal.stubbing.answers.ThrowsException;
 import org.onap.aaf.cadi.CadiWrap;
 import org.onap.portalapp.controller.sessionmgt.SessionCommunicationController;
 import org.onap.portalapp.portal.controller.BasicAuthenticationController;
@@ -58,7 +53,6 @@ import org.onap.portalapp.portal.controller.SharedContextRestController;
 import org.onap.portalapp.portal.controller.WebAnalyticsExtAppController;
 import org.onap.portalapp.portal.domain.BasicAuthCredentials;
 import org.onap.portalapp.portal.domain.EPApp;
-import org.onap.portalapp.portal.domain.EPEndpoint;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
 import org.onap.portalapp.portal.logging.format.EPAppMessagesEnum;
@@ -66,7 +60,6 @@ import org.onap.portalapp.portal.logging.logic.EPLogUtil;
 import org.onap.portalapp.portal.service.AdminRolesService;
 import org.onap.portalapp.portal.service.AppsCacheService;
 import org.onap.portalapp.portal.service.BasicAuthenticationCredentialService;
-import org.onap.portalapp.portal.service.ExternalAccessRolesService;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.service.RemoteWebServiceCallService;
@@ -246,7 +239,7 @@ public class PortalResourceInterceptor extends ResourceInterceptor {
 				logger.debug(EELFLoggerDelegate.debugLogger, "Entering in the loop as the uri contains auxapi : {}");
 				String nameSpace=PortalApiProperties.getProperty(PortalApiConstants.AUTH_NAMESPACE);
 				logger.debug(EELFLoggerDelegate.debugLogger, "namespace form the portal properties : {}",nameSpace);
-				Boolean accessallowed=AuthUtil.isAccessAllowed(request, nameSpace);
+				Boolean accessallowed=AuthUtil.isAccessAllowed(request, nameSpace, new HashMap<>());
 				logger.debug(EELFLoggerDelegate.debugLogger, "AccessAllowed for the request and namespace : {}",accessallowed);
 				if(accessallowed){
 					logger.debug(EELFLoggerDelegate.debugLogger, "AccessAllowed is allowed: {}",accessallowed);
@@ -260,7 +253,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);
@@ -324,8 +317,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;
 					}