X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FWebSecurityMockConfiguration.java;h=afa9711767211e317aa658d5a3cf5dd08f57e5d1;hb=329b53efb578dd41a6de31eafd5f228f3f10987c;hp=257b4a4978ba3864284d9830cf1eddc6a5d3116d;hpb=64a5e9470799236f0af4ce2df98f77c94eb1bed3;p=portal%2Fric-dashboard.git

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
index 257b4a49..afa97117 100644
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
@@ -21,7 +21,6 @@ package org.oransc.ric.portal.dashboard.config;
 
 import java.lang.invoke.MethodHandles;
 
-import org.onap.portalsdk.core.onboarding.crossapi.IPortalRestCentralService;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.portalapi.PortalAuthManager;
 import org.slf4j.Logger;
@@ -52,12 +51,18 @@ public class WebSecurityMockConfiguration extends WebSecurityConfigurerAdapter {
 
 	// Although constructor arguments are recommended over field injection,
 	// this results in fewer lines of code.
+	@Value("${portalapi.security}")
+	private Boolean portalapiSecurity;
+	@Value("${portalapi.appname}")
+	private String appName;
+	@Value("${portalapi.username}")
+	private String portalApiUsername;
+	@Value("${portalapi.password}")
+	private String portalApiPassword;
 	@Value("${portalapi.decryptor}")
 	private String decryptor;
 	@Value("${portalapi.usercookie}")
 	private String userCookie;
-	@Value("${userfile}")
-	private String userFilePath;
 
 	@Override
 	protected void configure(AuthenticationManagerBuilder auth) throws Exception {
@@ -92,10 +97,8 @@ public class WebSecurityMockConfiguration extends WebSecurityConfigurerAdapter {
 
 	@Bean
 	public PortalAuthManager portalAuthManagerBean() throws Exception {
-		logger.debug("portalAuthManagerBean");
-		return new PortalAuthManager(IPortalRestCentralService.CREDENTIALS_APP,
-				IPortalRestCentralService.CREDENTIALS_USER, IPortalRestCentralService.CREDENTIALS_PASS, decryptor,
-				userCookie);
+		logger.debug("portalAuthManagerBean: app {}", appName);
+		return new PortalAuthManager(appName, portalApiUsername, portalApiPassword, decryptor, userCookie);
 	}
 
 }