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

NIHVIVO-151 tidy the logic: let Authenticate be the one to create the LoginProcessBean and store the return URL.

Browse source
This commit is contained in:
jeb228 2010-12-09 15:16:51 +00:00
parent 4bb7f5d99c
commit ceaed87af7
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java
View file

@ -3,6 +3,8 @@
package edu.cornell.mannlib.vitro.webapp.controller; package edu.cornell.mannlib.vitro.webapp.controller;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
@ -136,21 +138,17 @@ public class VitroHttpServlet extends HttpServlet {
*/ */
public static void redirectToLoginPage(HttpServletRequest request, public static void redirectToLoginPage(HttpServletRequest request,
HttpServletResponse response) { HttpServletResponse response) {
LoginProcessBean bean = new LoginProcessBean(); String returnUrl = assembleUrlToReturnHere(request);
bean.setState(State.LOGGING_IN); String loginUrlWithReturn = assembleLoginUrlWithReturn(request, returnUrl);
bean.setAfterLoginUrl(assembleAfterLoginUrl(request));
LoginProcessBean.setBean(request, bean);
String loginPage = request.getContextPath() + Controllers.LOGIN;
try { try {
response.sendRedirect(loginPage); response.sendRedirect(loginUrlWithReturn);
} catch (IOException ioe) { } catch (IOException ioe) {
log.error("Could not redirect to login page"); log.error("Could not redirect to login page");
} }
} }
private static String assembleAfterLoginUrl(HttpServletRequest request) { private static String assembleUrlToReturnHere(HttpServletRequest request) {
String queryString = request.getQueryString(); String queryString = request.getQueryString();
if ((queryString == null) || queryString.isEmpty()) { if ((queryString == null) || queryString.isEmpty()) {
return request.getRequestURI(); return request.getRequestURI();
@ -159,6 +157,18 @@ public class VitroHttpServlet extends HttpServlet {
} }
} }
private static String assembleLoginUrlWithReturn(HttpServletRequest request,
String afterLoginUrl) {
String encodedAfterLoginUrl = afterLoginUrl;
try {
encodedAfterLoginUrl = URLEncoder.encode(afterLoginUrl, "UTF-8");
} catch (UnsupportedEncodingException e) {
log.error("Really? No UTF-8 encoding?", e);
}
return request.getContextPath() + Controllers.AUTHENTICATE
+ "?afterLogin=" + encodedAfterLoginUrl;
}
/** /**
* If logging is set to the TRACE level, dump the HTTP headers on the request. * If logging is set to the TRACE level, dump the HTTP headers on the request.
*/ */