import org.springframework.security.userdetails.ldap.UserDetailsContextMapper;
public class ArgeoUserDetailsContextMapper implements UserDetailsContextMapper {
- private List<UserNatureMapper> userInfoMappers = new ArrayList<UserNatureMapper>();
+// private final static Log log = LogFactory
+// .getLog(ArgeoUserDetailsContextMapper.class);
+
+ private List<UserNatureMapper> userNatureMappers = new ArrayList<UserNatureMapper>();
public UserDetails mapUserFromContext(DirContextOperations ctx,
String username, GrantedAuthority[] authorities) {
.first();
String password = new String(arr);
- List<UserNature> userInfos = new ArrayList<UserNature>();
- for (UserNatureMapper userInfoMapper : userInfoMappers) {
- userInfos.add(userInfoMapper.mapUserInfoFromContext(ctx));
+ List<UserNature> userNatures = new ArrayList<UserNature>();
+ for (UserNatureMapper userInfoMapper : userNatureMappers) {
+ UserNature userNature = userInfoMapper.mapUserInfoFromContext(ctx);
+ if (userNature != null)
+ userNatures.add(userNature);
}
return new ArgeoUserDetails(username, Collections
- .unmodifiableList(userInfos), password, authorities);
+ .unmodifiableList(userNatures), password, authorities);
}
public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
ctx.setAttributeValue("userPassword", user.getPassword());
if (user instanceof ArgeoUser) {
ArgeoUser argeoUser = (ArgeoUser) user;
- for (UserNature userInfo : argeoUser.getUserNatures()) {
- for (UserNatureMapper userInfoMapper : userInfoMappers) {
- if (userInfoMapper.supports(userInfo)) {
- userInfoMapper.mapUserInfoToContext(userInfo, ctx);
- break;// use the first mapper found an no others
+ for (UserNature userNature : argeoUser.getUserNatures()) {
+ for (UserNatureMapper userInfoMapper : userNatureMappers) {
+ if (userInfoMapper.supports(userNature)) {
+ userInfoMapper.mapUserInfoToContext(userNature, ctx);
+ break;// use the first mapper found and no others
}
}
}
}
}
- public void setUserInfoMappers(List<UserNatureMapper> userInfoMappers) {
- this.userInfoMappers = userInfoMappers;
+ public void setUserNatureMappers(List<UserNatureMapper> userNatureMappers) {
+ this.userNatureMappers = userNatureMappers;
}
}