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

Convert the Authentication mechanism from User to UserAccount.

Browse source
This commit is contained in:
j2blake 2011-06-07 15:00:41 +00:00
parent ee577adff7
commit 72314d3598
24 changed files with 517 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,8 +9,8 @@ import javax.servlet.http.HttpSession;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.beans.User;
import edu.cornell.mannlib.vitro.webapp.dao.UserDao;
import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
/**
@ -81,7 +81,7 @@ public class LoginStatusBean {
/**
* Get the current user, or null if not logged in.
*/
public static User getCurrentUser(HttpServletRequest request) {
public static UserAccount getCurrentUser(HttpServletRequest request) {
if (request == null) {
return null;
}
@ -91,7 +91,7 @@ public class LoginStatusBean {
/**
* Get the current user, or null if not logged in.
*/
public static User getCurrentUser(HttpSession session) {
public static UserAccount getCurrentUser(HttpSession session) {
if (session == null) {
return null;
}
@ -108,14 +108,14 @@ public class LoginStatusBean {
return null;
}
UserDao userDao = wadf.getUserDao();
if (userDao == null) {
log.error("No UserDao");
UserAccountsDao userAccountsDao = wadf.getUserAccountsDao();
if (userAccountsDao == null) {
log.error("No UserAccountsDao");
return null;
}
String userUri = getBean(session).getUserURI();
return userDao.getUserByURI(userUri);
return userAccountsDao.getUserAccountByUri(userUri);
}
// ----------------------------------------------------------------------