NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean.

webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java

@@ -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;
@@ -111,38 +112,33 @@ public class BaseEditController extends VitroHttpServlet {
         return Long.toHexString(cal.getTimeInMillis());
     }
 
-    protected boolean checkLoginStatus(HttpServletRequest request, HttpServletResponse response){
+    /**
-        return checkLoginStatus(request, response, null);
+     * 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, String postLoginRedirectURI){
+	/**
-        LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
+	 * If not logged in at the minimum level or higher, send them to the login page.
-        String loginPage = request.getContextPath() + Controllers.LOGIN;
+	 */
-        if (loginBean == null){
+	protected boolean checkLoginStatus(HttpServletRequest request,
-            try{
+			HttpServletResponse response, int minimumLevel) {
-                if (postLoginRedirectURI == null)
+		if (LoginStatusBean.getBean(request).isLoggedInAtLeast(minimumLevel)) {
-                    request.getSession().setAttribute("postLoginRequest",request.getRequestURI()+"?"+request.getQueryString());
+			return true;
-                else
+		}
-                    request.getSession().setAttribute("postLoginRequest",postLoginRedirectURI+"?"+request.getQueryString());
+		
-                response.sendRedirect(loginPage);
+		request.getSession().setAttribute("postLoginRequest",
-                return false;
+				request.getRequestURI() + "?" + request.getQueryString());
-            } catch (IOException ioe) {
+		try {
-                log.error("checkLoginStatus() could not redirect to login page");
+			String loginPage = request.getContextPath() + Controllers.LOGIN;
-                return false;
+			response.sendRedirect(loginPage);
-            }
+		} catch (IOException ioe) {
-        } else {
+			log.error("checkLoginStatus() could not redirect to login page");
-            if (!loginBean.getLoginStatus().equals("authenticated")) {
+		}
-                try{
+		return false;
-                    response.sendRedirect(loginPage);
+	}
-                    return false;
-                } catch (IOException ioe) {
-                    log.error("checkLoginStatus() could not redirect to login page");
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
 	
     protected void setRequestAttributes(HttpServletRequest request, EditProcessObject epo){
         Portal portal = (Portal)request.getAttribute("portalBean");

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {

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

@@ -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 {