litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1568 If a user clicks on the Login link, or tries to access a restricted page, any previous login process is cancelled and a new one is begun.

Browse source
This commit is contained in:
jeb228 2011-02-02 16:44:00 +00:00
parent 7c5b296476
commit 7b62bdd0a2
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Authenticate.java
View file

@ -89,6 +89,9 @@ public class Authenticate extends VitroHttpServlet {
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);
try { try {
if (loginProcessIsRestarting(vreq)) {
LoginProcessBean.removeBean(vreq);
}
if (loginProcessPagesAreEmpty(vreq)) { if (loginProcessPagesAreEmpty(vreq)) {
recordLoginProcessPages(vreq); recordLoginProcessPages(vreq);
} }
@ -138,6 +141,23 @@ public class Authenticate extends VitroHttpServlet {
} }
/**
* The after-login page or the return flag are supplied only on the first
* step in the process. If we see either of them, we conclude that the user
* has re-started the login.
*/
private boolean loginProcessIsRestarting(HttpServletRequest request) {
if (isAfterLoginParameterSet(request)) {
log.debug("after-login parameter is set: restarting the login.");
return true;
}
if (isReturnParameterSet(request)) {
log.debug("return parameter is set: restarting the login.");
return true;
}
return false;
}
/** /**
* Once these URLs have been set, don't change them. * Once these URLs have been set, don't change them.
*/ */
@ -191,6 +211,10 @@ public class Authenticate extends VitroHttpServlet {
} }
} }
private boolean isAfterLoginParameterSet(HttpServletRequest request) {
return (null != request.getParameter(PARAMETER_AFTER_LOGIN));
}
private boolean isReturnParameterSet(HttpServletRequest request) { private boolean isReturnParameterSet(HttpServletRequest request) {
return (null != request.getParameter(PARAMETER_RETURN)); return (null != request.getParameter(PARAMETER_RETURN));
} }