[PORTAL-25] Role Centralization

Bump EP SDK version to 1.3.0-SNAPSHOT

Support Role Centralization & Common Set of Roles across All ONAP On-Boarded Applications

Change-Id: Icfc1bbfddaf2c7c7176b4cf7bb7017d853c63100
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/interceptor/ResourceInterceptor.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/interceptor/ResourceInterceptor.java
index ec6e4b6c..5a631198 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/interceptor/ResourceInterceptor.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/interceptor/ResourceInterceptor.java
@@ -38,9 +38,9 @@ import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
 import org.openecomp.portalsdk.core.service.DataAccessService;
 import org.openecomp.portalsdk.core.service.LoginService;
+import org.openecomp.portalsdk.core.service.UrlAccessService;
 import org.openecomp.portalsdk.core.service.WebServiceCallService;
 import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -59,6 +59,9 @@ public class ResourceInterceptor extends HandlerInterceptorAdapter {
 
 	private AbstractCacheManager cacheManager;
 
+	@Autowired
+	UrlAccessService urlAccessService;
+	
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
@@ -87,7 +90,7 @@ public class ResourceInterceptor extends HandlerInterceptorAdapter {
 						    return false;
 					}
 				}
-				if (!UserUtils.isUrlAccessible(request, url)) {
+				if (!urlAccessService.isUrlAccessible(request, url)) {
 					logger.error(EELFLoggerDelegate.errorLogger, "Error accesing URL. Un-authorized",AlarmSeverityEnum.MINOR);
 					throw new UrlAccessRestrictedException();
 				}