X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=dashboard%2Fwebapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FWebSecurityConfiguration.java;h=9d9bb11e5f7ee7a5cf987ee4128145d9f0d77f73;hb=0dce3bd452fd7e735d830a7d659e6b95a12514f9;hp=471002ade8b34801ff2d18c0e7244f6a0b389eca;hpb=c7d74b01b59da07704be4069acece1a91d451a7e;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 471002ad..9d9bb11e 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
@@ -29,6 +29,7 @@ import org.oransc.ric.portal.dashboard.controller.AdminController;
 import org.oransc.ric.portal.dashboard.controller.AppManagerController;
 import org.oransc.ric.portal.dashboard.controller.E2ManagerController;
 import org.oransc.ric.portal.dashboard.controller.SimpleErrorController;
+import org.oransc.ric.portal.dashboard.controller.XappOnboarderController;
 import org.oransc.ric.portal.dashboard.portalapi.PortalAuthManager;
 import org.oransc.ric.portal.dashboard.portalapi.PortalAuthenticationFilter;
 import org.slf4j.Logger;
@@ -61,9 +62,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}")
@@ -102,6 +103,9 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 			E2ManagerController.CONTROLLER_PATH + "/" + DashboardConstants.RIC_INSTANCE_KEY + "/*/"
 					+ E2ManagerController.HEALTH_METHOD, //
 			E2ManagerController.CONTROLLER_PATH + "/" + DashboardConstants.VERSION_METHOD, //
+			XappOnboarderController.CONTROLLER_PATH + "/" + DashboardConstants.VERSION_METHOD, //
+			XappOnboarderController.CONTROLLER_PATH + "/" + DashboardConstants.RIC_INSTANCE_KEY + "/*/"
+					+ XappOnboarderController.HEALTH_METHOD, //
 			SimpleErrorController.ERROR_PATH };
 
 	@Override
@@ -113,8 +117,8 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 	@Bean
 	public PortalAuthManager portalAuthManagerBean() throws ClassNotFoundException, IllegalAccessException,
 			InstantiationException, InvocationTargetException, NoSuchMethodException {
-		logger.debug("portalAuthManagerBean");
-		return new PortalAuthManager(appName, userName, password, decryptor, userCookie);
+		logger.debug("portalAuthManagerBean: appName {}", appName);
+		return new PortalAuthManager(appName, portalApiUsername, portalApiPassword, decryptor, userCookie);
 	}
 
 	/*
@@ -128,7 +132,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 	 */
 	public PortalAuthenticationFilter portalAuthenticationFilterBean() throws ClassNotFoundException,
 			IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
-		logger.debug("portalAuthenticationFilterBean");
+		logger.debug("portalAuthenticationFilterBean: portalapiSecurity {}", portalapiSecurity);
 		return new PortalAuthenticationFilter(portalapiSecurity, portalAuthManagerBean(), this.userManager);
 	}