X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FWebSecurityConfiguration.java;h=5fde5c28f598bf9a446ea052d4e64751557553e8;hb=55472d9367cf229b2b87a625a8aa1dfb822cbaad;hp=686b9cb17f535d4f9dceacd544f3b1788ec52b41;hpb=56ff26b25a114f55b66e47d8f2430d8fb8e3cda3;p=portal%2Fric-dashboard.git

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
index 686b9cb1..5fde5c28 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
@@ -23,10 +23,7 @@ import java.io.IOException;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 
-import org.onap.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
-import org.oransc.ric.portal.dashboard.DashboardConstants;
-import org.oransc.ric.portal.dashboard.LoginServlet;
 import org.oransc.ric.portal.dashboard.controller.A1MediatorController;
 import org.oransc.ric.portal.dashboard.controller.AdminController;
 import org.oransc.ric.portal.dashboard.controller.AnrXappController;
@@ -39,7 +36,6 @@ import org.oransc.ric.portal.dashboard.portalapi.PortalAuthenticationFilter;
 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;
@@ -106,9 +102,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 			AppManagerController.CONTROLLER_PATH + "/" + AppManagerController.VERSION_METHOD, //
 			E2ManagerController.CONTROLLER_PATH + "/" + E2ManagerController.HEALTH_METHOD, //
 			E2ManagerController.CONTROLLER_PATH + "/" + E2ManagerController.VERSION_METHOD, //
-			SimpleErrorController.ERROR_PATH, //
-			DashboardConstants.LOGIN_PAGE //
-	};
+			SimpleErrorController.ERROR_PATH };
 
 	@Override
 	public void configure(WebSecurity web) throws Exception {
@@ -145,36 +139,4 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
 		return portalAuthenticationFilter;
 	}
 
-	/**
-	 * Instantiates the EPSDK-FW servlet. Needed because this app is not configured
-	 * to scan the EPSDK-FW packages; there's also a chance that Spring-Boot does
-	 * not automatically process @WebServlet annotations.
-	 * 
-	 * @return Servlet registration bean for the Portal Rest API proxy servlet.
-	 */
-	@Bean
-	public ServletRegistrationBean<PortalRestAPIProxy> portalApiProxyServletBean() {
-		PortalRestAPIProxy servlet = new PortalRestAPIProxy();
-		final ServletRegistrationBean<PortalRestAPIProxy> servletBean = new ServletRegistrationBean<>(servlet,
-				PortalApiConstants.API_PREFIX + "/*");
-		servletBean.setName("PortalRestApiProxyServlet");
-		return servletBean;
-	}
-
-	/**
-	 * Instantiates a trivial login servlet that serves a basic page with a link to
-	 * authenticate at Portal. The login filter redirects to this page instead of
-	 * Portal.
-	 * 
-	 * @return Servlet registration bean for the Dashboard login servlet.
-	 */
-	@Bean
-	public ServletRegistrationBean<LoginServlet> loginServletBean() {
-		LoginServlet servlet = new LoginServlet();
-		final ServletRegistrationBean<LoginServlet> servletBean = new ServletRegistrationBean<>(servlet,
-				DashboardConstants.LOGIN_PAGE);
-		servletBean.setName("LoginServlet");
-		return servletBean;
-	}
-
 }