Merge "added proper annotation"

[portal.git] / ecomp-portal-BE-os / src / main / java / org / onap / portalapp / portal / interceptor / SessionTimeoutInterceptor.java

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/interceptor/SessionTimeoutInterceptor.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/interceptor/SessionTimeoutInterceptor.java
index d0d3d48..8a3bee6 100644 (file)
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/interceptor/SessionTimeoutInterceptor.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/interceptor/SessionTimeoutInterceptor.java
@@ -42,7 +42,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.onap.portalapp.authentication.LoginStrategy;
 import org.onap.portalapp.portal.domain.EPUser;
-import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalapp.util.EPUserUtils;
 import org.onap.portalapp.util.SessionCookieUtil;
 import org.onap.portalsdk.core.controller.FusionBaseController;
@@ -52,6 +51,8 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.portalapp.portal.utils.EPSystemProperties;
 
 public class SessionTimeoutInterceptor extends HandlerInterceptorAdapter {
        EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SessionTimeoutInterceptor.class);
@@ -79,7 +80,9 @@ public class SessionTimeoutInterceptor extends HandlerInterceptorAdapter {
                        if (!controller.isAccessible()) {
                                try {
                                        EPUser user = EPUserUtils.getUserSession(request);
-
+                                       if (user == null) {
+                                               throw new SessionExpiredException();
+                                       }
                                        if (request.getRequestURI().indexOf("logout.htm") > -1) {
                                                CollaborateList.delUserName(user.getOrgUserId());
                                                throw new SessionExpiredException();
@@ -87,6 +90,11 @@ public class SessionTimeoutInterceptor extends HandlerInterceptorAdapter {
                                                resetSessionMaxIdleTimeOut(request);
                                                CollaborateList.addUserName(user.getOrgUserId());
                                        }
+                               } catch (SessionExpiredException e) {
+                                       String message=e.getMessage();
+                                       logger.error(EELFLoggerDelegate.errorLogger,message, e);
+                                       response.sendRedirect(SystemProperties.getProperty(EPSystemProperties.LOGIN_URL_NO_RET_VAL));
+                                       return false;
                                } catch (Exception e) {
                                        logger.error(EELFLoggerDelegate.errorLogger, "preHandle failed", e);
                                        return false;
@@ -115,4 +123,4 @@ public class SessionTimeoutInterceptor extends HandlerInterceptorAdapter {
                        return true;
                return false;
        }
-}
\ No newline at end of file
+}