Serve login page without using redirect

[portal/ric-dashboard.git] / webapp-backend / src / test / java / org / oransc / ric / portal / dashboard / config / WebSecurityMockConfiguration.java

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 8d06693..de2ee55 100644 (file)
--- 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,7 +19,6 @@
  */
 package org.oransc.ric.portal.dashboard.config;
 
-import java.io.File;
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.util.HashSet;
@@ -29,12 +28,10 @@ import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
 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.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;
@@ -92,22 +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;
-       }
-
        // 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");
@@ -119,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;
        }
 
 }