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

NIHVIVO-151 send all logout requests directly to /logout. Remove old links to login_process.jsp

Browse source
This commit is contained in:
jeb228 2010-11-29 21:37:01 +00:00
parent f200a9bb59
commit d60f39f7d4
6 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
webapp/config/web.xml
View file

@ -1293,11 +1293,6 @@
<servlet-name>loginExternalAuthReturn</servlet-name> <servlet-name>loginExternalAuthReturn</servlet-name>
<url-pattern>/loginExternalAuthReturn</url-pattern> <url-pattern>/loginExternalAuthReturn</url-pattern>
</servlet-mapping> </servlet-mapping>
<servlet-mapping>
<!-- for backward-compatibility -->
<servlet-name>login</servlet-name>
<url-pattern>/login_process.jsp</url-pattern>
</servlet-mapping>
<servlet-mapping> <servlet-mapping>
<servlet-name>logout</servlet-name> <servlet-name>logout</servlet-name>
<url-pattern>/logout</url-pattern> <url-pattern>/logout</url-pattern>

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
View file

@ -42,8 +42,8 @@ public class Controllers {
public static final String TAB = "/index.jsp"; public static final String TAB = "/index.jsp";
public static final String LOGIN_JSP = "/login_process.jsp"; public static final String LOGIN_JSP = "/login";
public static final String LOGOUT_JSP = "/login_process.jsp"; public static final String LOGOUT_JSP = "/logout";
public static final String BASIC_JSP = "/templates/page/basicPage.jsp"; public static final String BASIC_JSP = "/templates/page/basicPage.jsp";
public static final String DEBUG_JSP = "/templates/page/debug.jsp"; public static final String DEBUG_JSP = "/templates/page/debug.jsp";

9
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Login.java
View file

@ -25,15 +25,6 @@ public class Login extends HttpServlet {
@Override @Override
protected void doPost(HttpServletRequest request, protected void doPost(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException { HttpServletResponse response) throws ServletException, IOException {
/*
* For backward compatibility, if they requested a logout, honor the
* request.
*/
if ("Log Out".equals(request.getParameter("loginSubmitMode"))) {
request.getRequestDispatcher("/logout").forward(request, response);
return;
}
String username = request.getParameter(PARAM_USERNAME); String username = request.getParameter(PARAM_USERNAME);
String password = request.getParameter(PARAM_PASSWORD); String password = request.getParameter(PARAM_PASSWORD);

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/UrlBuilder.java
View file

@ -32,7 +32,7 @@ public class UrlBuilder {
INDIVIDUAL_EDIT("/entityEdit"), INDIVIDUAL_EDIT("/entityEdit"),
INDIVIDUAL_LIST("/individuallist"), INDIVIDUAL_LIST("/individuallist"),
LOGIN("/login"), LOGIN("/login"),
LOGOUT("/login_process.jsp"), LOGOUT("/logout"),
SEARCH("/search"), SEARCH("/search"),
SITE_ADMIN("/siteAdmin"), SITE_ADMIN("/siteAdmin"),
TERMS_OF_USE("/termsOfUse"), TERMS_OF_USE("/termsOfUse"),
@ -121,7 +121,7 @@ public class UrlBuilder {
} }
public String getLogoutUrl() { public String getLogoutUrl() {
return getPortalUrl(Route.LOGOUT, new ParamMap("loginSubmitMode", "Log Out")); return getPortalUrl(Route.LOGOUT);
} }
public ParamMap getPortalParam() { public ParamMap getPortalParam() {

1
webapp/web/themes/default/jsp/menu.jsp
View file

@ -49,7 +49,6 @@
<c:url var="logoutHref" value="<%= Controllers.LOGOUT_JSP %>"> <c:url var="logoutHref" value="<%= Controllers.LOGOUT_JSP %>">
<c:param name="home" value="${currentPortal}" /> <c:param name="home" value="${currentPortal}" />
<c:param name="loginSubmitMode" value="Log Out" />
</c:url> </c:url>
<c:url var="siteAdminHref" value="<%= Controllers.SITE_ADMIN %>"> <c:url var="siteAdminHref" value="<%= Controllers.SITE_ADMIN %>">

1
webapp/web/themes/enhanced/jsp/identity.jsp
View file

@ -73,7 +73,6 @@ portal.getRootBreadCrumbURL() : request.getContextPath()+"/";
<c:url var="logoutHref" value="<%= Controllers.LOGOUT_JSP %>"> <c:url var="logoutHref" value="<%= Controllers.LOGOUT_JSP %>">
<c:param name="home" value="${currentPortal}" /> <c:param name="home" value="${currentPortal}" />
<c:param name="loginSubmitMode" value="Log Out" />
</c:url> </c:url>
<c:url var="siteAdminHref" value="<%= Controllers.SITE_ADMIN %>"> <c:url var="siteAdminHref" value="<%= Controllers.SITE_ADMIN %>">