Fixed Logout, Empty White Page, Session Timeout

Logout, Empty White Page, Session Timeout Issues- fixed

Issue-ID: PORTAL-920
Change-Id: Ie96c5015397b88887e2fbc5422ce526eaacc8562
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>

2 files changed, 5 insertions, 97 deletions

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/LogoutController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/LogoutController.java
index bbd08c45..d41bf239 100644
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/LogoutController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/LogoutController.java
@@ -37,20 +37,16 @@
  */
 package org.onap.portalapp.controller.core;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.onap.portalsdk.core.controller.UnRestrictedBaseController;
-import org.onap.portalsdk.core.domain.User;
-import org.onap.portalsdk.core.logging.aspect.MetricsLog;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
-import org.onap.portalsdk.core.onboarding.util.PortalApiProperties;
-import org.onap.portalsdk.core.web.support.UserUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.ModelAndView;
 
 @Controller
@@ -59,8 +55,6 @@ public class LogoutController extends UnRestrictedBaseController {
 
 	private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(LogoutController.class);
 
-	private User user;
-
 	/**
 	 * 
 	 * invalidates the current application session, then redirects to portal logout
@@ -72,53 +66,12 @@ public class LogoutController extends UnRestrictedBaseController {
 	public ModelAndView globalLogout(HttpServletRequest request) {
 		ModelAndView modelView = null;
 		try {
-			chatRoomLogout(request);
 			request.getSession().invalidate();
-			String portalUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL);
-			String portalDomain = portalUrl.substring(0, portalUrl.lastIndexOf('/'));
-			String redirectUrl = portalDomain + "/logout.htm";
-			modelView = new ModelAndView("redirect:" + redirectUrl);
+			Map<String, Object> model = new HashMap<>();
+			return new ModelAndView("login", "model", model);
 		} catch (Exception e) {
 			logger.error(EELFLoggerDelegate.errorLogger, "Logout failed", e);
 		}
 		return modelView;
 	}
-
-	/**
-	 * 
-	 * invalidates the current session (application logout) and redirects user to
-	 * Portal.
-	 * 
-	 * @param request
-	 * @return modelView
-	 */
-	@RequestMapping(value = { "/app_logout.htm" }, method = RequestMethod.GET)
-	public ModelAndView appLogout(HttpServletRequest request) {
-		ModelAndView modelView = null;
-		try {
-			chatRoomLogout(request);
-			modelView = new ModelAndView(
-					"redirect:" + PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL));
-			UserUtils.clearUserSession(request);
-			request.getSession().invalidate();
-		} catch (Exception e) {
-			logger.error(EELFLoggerDelegate.errorLogger, "Application Logout failed", e);
-		}
-		return modelView;
-	}
-
-	@MetricsLog
-	public void chatRoomLogout(HttpServletRequest request) {
-		request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
-		setUser(UserUtils.getUserSession(request));
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
 }
diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java
index 8883cfa8..71d7277a 100644
--- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java
+++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/LogoutControllerTest.java
@@ -37,9 +37,6 @@
  */
 package org.onap.portalapp.controller.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -111,46 +108,4 @@ public class LogoutControllerTest {
 						.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
 		logoutController.globalLogout(mockedRequest);
 	}
-	
-	@Test
-	public void globalLogoutExceptionTest(){
-		PowerMockito.mockStatic(PortalApiProperties.class);
-		PowerMockito.mockStatic(PortalApiConstants.class);
-		Mockito.when(PortalApiProperties
-						.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");		
-		assertNull(logoutController.globalLogout(mockedRequest));
-	}
-	
-	@Test
-	public void appLogoutTest(){
-		ModelAndView actualModelView = new ModelAndView("redirect:http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");
-		PowerMockito.mockStatic(PortalApiProperties.class);
-		PowerMockito.mockStatic(PortalApiConstants.class);
-		PowerMockito.mockStatic(RequestContextHolder.class);
-		ServletRequestAttributes ServletRequestAttributes = new ServletRequestAttributes(mockedRequest);
-		Mockito.when(RequestContextHolder.currentRequestAttributes()).thenReturn(ServletRequestAttributes);
-		Mockito.when(PortalApiProperties
-						.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");		
-		ModelAndView expectedModelView = logoutController.appLogout(mockedRequest);
-		assertEquals(actualModelView.getViewName(), expectedModelView.getViewName());
-	}
-	
-	@Test
-	public void appLogoutExceptionTest(){
-		PowerMockito.mockStatic(PortalApiProperties.class);
-		PowerMockito.mockStatic(PortalApiConstants.class);
-		Mockito.when(PortalApiProperties
-						.getProperty(PortalApiConstants.ECOMP_REDIRECT_URL)).thenReturn("http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm");		
-		assertNull(logoutController.appLogout(mockedRequest));
-	}
-	
-	@Test
-	public void getUserTest(){
-		User expectedUser = new User();
-		expectedUser.setActive(false);
-		user.setActive(false);
-		logoutController.setUser(user);
-		User actualUser = logoutController.getUser();
-		assertEquals(expectedUser.getActive(), actualUser.getActive());
-	}
 }