import java.util.Collections;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.argeo.security.ArgeoUser;
-import org.argeo.security.BasicArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
import org.argeo.security.UserNature;
import org.springframework.security.Authentication;
import org.springframework.security.GrantedAuthority;
public class ArgeoUserDetails extends User implements ArgeoUser {
private static final long serialVersionUID = 1L;
+ private final static Log log = LogFactory.getLog(ArgeoUserDetails.class);
private final List<UserNature> userNatures;
private final List<String> roles;
}
public ArgeoUserDetails(ArgeoUser argeoUser) {
- // TODO: password
- this(argeoUser.getUsername(), argeoUser.getUserNatures(), null,
- rolesToAuthorities(argeoUser.getRoles()));
+ this(argeoUser.getUsername(), argeoUser.getUserNatures(), argeoUser
+ .getPassword(), rolesToAuthorities(argeoUser.getRoles()));
}
public List<UserNature> getUserNatures() {
protected static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
GrantedAuthority[] arr = new GrantedAuthority[roles.size()];
for (int i = 0; i < roles.size(); i++) {
- arr[i] = new GrantedAuthorityImpl(roles.get(i));
+ String role = roles.get(i);
+ if (log.isTraceEnabled())
+ log.debug("Convert role " + role + " to authority (i=" + i
+ + ")");
+ arr[i] = new GrantedAuthorityImpl(role);
}
return arr;
}
- public static BasicArgeoUser createBasicArgeoUser(UserDetails userDetails) {
- BasicArgeoUser argeoUser = new BasicArgeoUser();
- argeoUser.setUsername(userDetails.getUsername());
- addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
- .getRoles());
- return argeoUser;
+ public static SimpleArgeoUser createSimpleArgeoUser(UserDetails userDetails) {
+ if (userDetails instanceof ArgeoUser) {
+ return new SimpleArgeoUser((ArgeoUser) userDetails);
+ } else {
+ SimpleArgeoUser argeoUser = new SimpleArgeoUser();
+ argeoUser.setUsername(userDetails.getUsername());
+ addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
+ .getRoles());
+ return argeoUser;
+ }
}
public static ArgeoUser asArgeoUser(Authentication authentication) {
if (authentication.getPrincipal() instanceof ArgeoUser) {
- return (ArgeoUser) authentication.getPrincipal();
+ return new SimpleArgeoUser((ArgeoUser) authentication
+ .getPrincipal());
} else {
- BasicArgeoUser argeoUser = new BasicArgeoUser();
+ SimpleArgeoUser argeoUser = new SimpleArgeoUser();
argeoUser.setUsername(authentication.getName());
addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
.getRoles());