X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FWebSecurityMockConfiguration.java;h=de2ee55d83364b57bac67ba66a1132619b0ee0fa;hb=9fef9615bd5889eacbe8ddad454b7ff4b4c195c0;hp=cc9a30887245c0074312f56a597d2284c39b2cdb;hpb=c0dbfbc9c6268d8a8bea989daffb3a5065e820aa;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
index cc9a3088..de2ee55d 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/WebSecurityMockConfiguration.java
@@ -19,33 +19,19 @@
  */
 package org.oransc.ric.portal.dashboard.config;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-
-import java.io.File;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.onap.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy;
 import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
-import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.onap.portalsdk.core.restful.domain.EcompRole;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
-import org.oransc.ric.portal.dashboard.LoginServlet;
 import org.oransc.ric.portal.dashboard.portalapi.DashboardUserManager;
-import org.oransc.ric.portal.dashboard.portalapi.PortalAuthManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
@@ -67,10 +53,6 @@ public class WebSecurityMockConfiguration extends WebSecurityConfigurerAdapter {
 	public static final String TEST_CRED_ADMIN = "admin";
 	public static final String TEST_CRED_STANDARD = "standard";
 
-	// Unfortunately EPSDK-FW does not define these as constants
-	public static final String PORTAL_USERNAME_HEADER_KEY = "username";
-	public static final String PORTAL_PASSWORD_HEADER_KEY = "password";
-
 	private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
 	public WebSecurityMockConfiguration(@Value("${userfile}") final String userFilePath) {
@@ -107,53 +89,10 @@ public class WebSecurityMockConfiguration extends WebSecurityConfigurerAdapter {
 		web.ignoring().antMatchers("/", "/csrf"); // allow swagger-ui to load
 	}
 
-	@Bean
-	public ServletRegistrationBean<LoginServlet> loginServlet() {
-		LoginServlet servlet = new LoginServlet();
-		final ServletRegistrationBean<LoginServlet> servletBean = new ServletRegistrationBean<>(servlet,
-				DashboardConstants.LOGIN_PAGE);
-		servletBean.setName("LoginServlet");
-		return servletBean;
-	}
-
-	@Bean
-	public ServletRegistrationBean<PortalRestAPIProxy> portalApiProxyServlet() {
-		PortalRestAPIProxy servlet = new PortalRestAPIProxy();
-		final ServletRegistrationBean<PortalRestAPIProxy> servletBean = new ServletRegistrationBean<>(servlet,
-				PortalApiConstants.API_PREFIX + "/*");
-		servletBean.setName("PortalRestApiProxyServlet");
-		return servletBean;
-	}
-
-	@Bean
-	public PortalAuthManager portalAuthManager() throws Exception {
-		PortalAuthManager mockManager = mock(PortalAuthManager.class);
-		final Map<String, String> credentialsMap = new HashMap<>();
-		credentialsMap.put("appName", "appName");
-		credentialsMap.put(PORTAL_USERNAME_HEADER_KEY, PORTAL_USERNAME_HEADER_KEY);
-		credentialsMap.put(PORTAL_PASSWORD_HEADER_KEY, PORTAL_PASSWORD_HEADER_KEY);
-		doAnswer(inv -> {
-			logger.debug("getAppCredentials");
-			return credentialsMap;
-		}).when(mockManager).getAppCredentials();
-		doAnswer(inv -> {
-			logger.debug("getUserId");
-			return "userId";
-		}).when(mockManager).valdiateEcompSso(any(HttpServletRequest.class));
-		doAnswer(inv -> {
-			logger.debug("getAppCredentials");
-			return credentialsMap;
-		}).when(mockManager).getAppCredentials();
-		return mockManager;
-	}
-
 	// This implementation is so light it can be used during tests.
 	@Bean
 	public DashboardUserManager dashboardUserManager() throws IOException, PortalAPIException {
-		File f = new File("/tmp/users.json");
-		if (f.exists())
-			f.delete();
-		DashboardUserManager um = new DashboardUserManager(f.getAbsolutePath());
+		DashboardUserManager dum = new DashboardUserManager(true);
 		// Mock user for convenience in testing
 		EcompUser demo = new EcompUser();
 		demo.setLoginId("demo");
@@ -165,8 +104,8 @@ public class WebSecurityMockConfiguration extends WebSecurityConfigurerAdapter {
 		Set<EcompRole> roles = new HashSet<>();
 		roles.add(role);
 		demo.setRoles(roles);
-		um.createUser(demo);
-		return um;
+		dum.createUser(demo);
+		return dum;
 	}
 
 }