package org.argeo.security.core;
+import java.util.Iterator;
+import java.util.List;
+
import org.argeo.ArgeoException;
import org.argeo.security.ArgeoSecurity;
import org.argeo.security.ArgeoSecurityDao;
private String systemAuthenticationKey;
+ public ArgeoUser getCurrentUser() {
+ ArgeoUser argeoUser = ArgeoUserDetails.securityContextUser();
+ if (argeoUser == null)
+ return null;
+ if (argeoUser.getRoles().contains(securityDao.getDefaultRole()))
+ argeoUser.getRoles().remove(securityDao.getDefaultRole());
+ return argeoUser;
+ }
+
public ArgeoSecurityDao getSecurityDao() {
return securityDao;
}
}
public void updateUserPassword(String username, String password) {
- SimpleArgeoUser user = new SimpleArgeoUser(securityDao
- .getUser(username));
+ SimpleArgeoUser user = new SimpleArgeoUser(
+ securityDao.getUser(username));
user.setPassword(password);
securityDao.update(user);
}
public void updateCurrentUserPassword(String oldPassword, String newPassword) {
- SimpleArgeoUser user = new SimpleArgeoUser(securityDao.getCurrentUser());
- if (!user.getPassword().equals(oldPassword))
+ SimpleArgeoUser user = new SimpleArgeoUser(getCurrentUser());
+ if (!securityDao.isPasswordValid(user.getPassword(), oldPassword))
throw new ArgeoException("Old password is not correct.");
- user.setPassword(newPassword);
+ user.setPassword(securityDao.encodePassword(newPassword));
securityDao.update(user);
}
public void newUser(ArgeoUser user) {
- user.getUserNatures().clear();
+// user.getUserNatures().clear();
argeoSecurity.beforeCreate(user);
securityDao.create(user);
}
};
}
+ public List<ArgeoUser> listUsersInRole(String role) {
+ List<ArgeoUser> lst = securityDao.listUsersInRole(role);
+ Iterator<ArgeoUser> it = lst.iterator();
+ while (it.hasNext()) {
+ if (it.next().getUsername()
+ .equals(argeoSecurity.getSuperUsername())) {
+ it.remove();
+ break;
+ }
+ }
+ return lst;
+ }
+
public void setArgeoSecurity(ArgeoSecurity argeoSecurity) {
this.argeoSecurity = argeoSecurity;
}
public void setSystemAuthenticationKey(String systemAuthenticationKey) {
this.systemAuthenticationKey = systemAuthenticationKey;
}
-
}