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

NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean.

Browse source
This commit is contained in:
jeb228 2010-10-13 16:46:10 +00:00
parent 02e32428bd
commit 275ef7d471
10 changed files with 38 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

62
webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
View file

@ -24,6 +24,7 @@ import com.hp.hpl.jena.ontology.OntModel;
import edu.cornell.mannlib.vedit.beans.EditProcessObject;
import edu.cornell.mannlib.vedit.beans.LoginFormBean;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.util.FormUtils;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
@ -110,40 +111,35 @@ public class BaseEditController extends VitroHttpServlet {
private String createEpoKey(){
return Long.toHexString(cal.getTimeInMillis());
}
/**
* If not logged in, send them to the login page.
*/
protected boolean checkLoginStatus(HttpServletRequest request,
HttpServletResponse response) {
return checkLoginStatus(request, response, LoginStatusBean.ANYBODY);
}
protected boolean checkLoginStatus(HttpServletRequest request, HttpServletResponse response){
return checkLoginStatus(request, response, null);
}
protected boolean checkLoginStatus(HttpServletRequest request, HttpServletResponse response, String postLoginRedirectURI){
LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
String loginPage = request.getContextPath() + Controllers.LOGIN;
if (loginBean == null){
try{
if (postLoginRedirectURI == null)
request.getSession().setAttribute("postLoginRequest",request.getRequestURI()+"?"+request.getQueryString());
else
request.getSession().setAttribute("postLoginRequest",postLoginRedirectURI+"?"+request.getQueryString());
response.sendRedirect(loginPage);
return false;
} catch (IOException ioe) {
log.error("checkLoginStatus() could not redirect to login page");
return false;
}
} else {
if (!loginBean.getLoginStatus().equals("authenticated")) {
try{
response.sendRedirect(loginPage);
return false;
} catch (IOException ioe) {
log.error("checkLoginStatus() could not redirect to login page");
return false;
}
}
}
return true;
}
/**
* If not logged in at the minimum level or higher, send them to the login page.
*/
protected boolean checkLoginStatus(HttpServletRequest request,
HttpServletResponse response, int minimumLevel) {
if (LoginStatusBean.getBean(request).isLoggedInAtLeast(minimumLevel)) {
return true;
}
request.getSession().setAttribute("postLoginRequest",
request.getRequestURI() + "?" + request.getQueryString());
try {
String loginPage = request.getContextPath() + Controllers.LOGIN;
response.sendRedirect(loginPage);
} catch (IOException ioe) {
log.error("checkLoginStatus() could not redirect to login page");
}
return false;
}
protected void setRequestAttributes(HttpServletRequest request, EditProcessObject epo){
Portal portal = (Portal)request.getAttribute("portalBean");
request.setAttribute("epoKey",epo.getKey());

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
View file

@ -40,7 +40,7 @@ public class DatapropEditController extends BaseEditController {
final int NUM_COLS=15;
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
View file

@ -56,7 +56,7 @@ public class EntityEditController extends BaseEditController {
public void doGet (HttpServletRequest request, HttpServletResponse response) {
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/KeywordEditController.java
View file

@ -26,7 +26,7 @@ public class KeywordEditController extends BaseEditController {
public void doPost (HttpServletRequest request, HttpServletResponse response) {
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/OntologyEditController.java
View file

@ -30,7 +30,7 @@ public class OntologyEditController extends BaseEditController {
public void doPost (HttpServletRequest req, HttpServletResponse response) {
VitroRequest request = new VitroRequest(req);
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PortalEditController.java
View file

@ -26,7 +26,7 @@ public class PortalEditController extends BaseEditController {
public void doPost (HttpServletRequest request, HttpServletResponse response) {
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyEditController.java
View file

@ -38,7 +38,7 @@ public class PropertyEditController extends BaseEditController {
public void doPost (HttpServletRequest request, HttpServletResponse response) {
final int NUM_COLS=17;
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/TabEditController.java
View file

@ -30,7 +30,7 @@ public class TabEditController extends BaseEditController {
public void doPost (HttpServletRequest request, HttpServletResponse response) {
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/UserEditController.java
View file

@ -40,7 +40,7 @@ public class UserEditController extends BaseEditController {
public void doPost (HttpServletRequest request, HttpServletResponse response) throws ServletException {
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java
View file

@ -41,7 +41,7 @@ public class VclassEditController extends BaseEditController {
VitroRequest request = new VitroRequest(req);
if (!checkLoginStatus(request,response,(String)request.getAttribute("fetchURI")))
if (!checkLoginStatus(request,response))
return;
try {