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;
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);
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();
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;
return true;
return false;
}
-}
\ No newline at end of file
+}