X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FWebSecurityConfiguration.java;h=0a3f022e260c99a79d990279172dc010cd175006;hb=9a688995681b92344824c990bb1d838d3cc7cfaa;hp=f1438d7ee704e004616ff2b68a06b99a33de8ee4;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
index f1438d7e..0a3f022e 100644
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
@@ -25,7 +25,6 @@ import java.lang.reflect.InvocationTargetException;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.DashboardUserManager;
-import org.oransc.ric.portal.dashboard.controller.A1MediatorController;
 import org.oransc.ric.portal.dashboard.controller.AdminController;
 import org.oransc.ric.portal.dashboard.controller.AppManagerController;
 import org.oransc.ric.portal.dashboard.controller.E2ManagerController;
@@ -62,9 +61,9 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 	@Value("${portalapi.appname}")
 	private String appName;
 	@Value("${portalapi.username}")
-	private String userName;
+	private String portalApiUsername;
 	@Value("${portalapi.password}")
-	private String password;
+	private String portalApiPassword;
 	@Value("${portalapi.decryptor}")
 	private String decryptor;
 	@Value("${portalapi.usercookie}")
@@ -93,7 +92,6 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 			"/swagger-ui.html", //
 			"/webjars/**", //
 			PortalApiConstants.API_PREFIX + "/**", //
-			A1MediatorController.CONTROLLER_PATH + "/" + DashboardConstants.VERSION_METHOD, //
 			AdminController.CONTROLLER_PATH + "/" + AdminController.HEALTH_METHOD, //
 			AdminController.CONTROLLER_PATH + "/" + AdminController.VERSION_METHOD, //
 			AppManagerController.CONTROLLER_PATH + "/" + DashboardConstants.RIC_INSTANCE_KEY + "/*/"
@@ -116,7 +114,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 	public PortalAuthManager portalAuthManagerBean() throws ClassNotFoundException, IllegalAccessException,
 			InstantiationException, InvocationTargetException, NoSuchMethodException {
 		logger.debug("portalAuthManagerBean");
-		return new PortalAuthManager(appName, userName, password, decryptor, userCookie);
+		return new PortalAuthManager(appName, portalApiUsername, portalApiPassword, decryptor, userCookie);
 	}
 
 	/*