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

NIHVIVO-2279 Remove LoginStatusBean methods isLoggedInAtLeast() and isLoggedInExactly()

Browse source
This commit is contained in:
j2blake 2011-06-06 13:39:37 +00:00
parent 320ca3c8b0
commit a8b74facd1
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vedit/beans/LoginStatusBean.java
View file

@ -168,14 +168,6 @@ public class LoginStatusBean {
return authenticationSource != AuthenticationSource.UNKNOWN; return authenticationSource != AuthenticationSource.UNKNOWN;
} }
public boolean isLoggedInExactly(int level) {
return securityLevel == level;
}
public boolean isLoggedInAtLeast(int minimumLevel) {
return securityLevel >= minimumLevel;
}
public boolean hasExternalAuthentication() { public boolean hasExternalAuthentication() {
return authenticationSource == AuthenticationSource.EXTERNAL; return authenticationSource == AuthenticationSource.EXTERNAL;
} }

6
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
View file

@ -17,6 +17,7 @@ import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource; import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration; import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate; import edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate;
@ -155,8 +156,9 @@ public class BasicAuthenticator extends Authenticator {
* Editors and other privileged users get a longer timeout interval. * Editors and other privileged users get a longer timeout interval.
*/ */
private void setSessionTimeoutLimit(HttpSession session) { private void setSessionTimeoutLimit(HttpSession session) {
if (LoginStatusBean.getBean(session).isLoggedInAtLeast( RoleLevel role = RoleLevel.getRoleFromLoginStatus(request);
LoginStatusBean.EDITOR)) { if (role == RoleLevel.EDITOR || role == RoleLevel.CURATOR
|| role == RoleLevel.DB_ADMIN) {
session.setMaxInactiveInterval(PRIVILEGED_TIMEOUT_INTERVAL); session.setMaxInactiveInterval(PRIVILEGED_TIMEOUT_INTERVAL);
} else { } else {
session.setMaxInactiveInterval(LOGGED_IN_TIMEOUT_INTERVAL); session.setMaxInactiveInterval(LOGGED_IN_TIMEOUT_INTERVAL);

5
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java
View file

@ -15,6 +15,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vedit.beans.LoginStatusBean; import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage; import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
import edu.cornell.mannlib.vitro.webapp.beans.User; import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.controller.Controllers; import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
@ -152,8 +153,8 @@ public class LoginRedirector {
} }
private boolean isMerelySelfEditor() { private boolean isMerelySelfEditor() {
return LoginStatusBean.getBean(session).isLoggedInExactly( RoleLevel role = RoleLevel.getRoleFromLoginStatus(request);
LoginStatusBean.NON_EDITOR); return role == RoleLevel.PUBLIC || role == RoleLevel.SELF;
} }
private boolean isLoginPage(String page) { private boolean isLoginPage(String page) {