package org.argeo.security.ldap;
-import static org.argeo.security.core.ArgeoUserDetails.createBasicArgeoUser;
+import static org.argeo.security.core.ArgeoUserDetails.createSimpleArgeoUser;
import java.util.ArrayList;
import java.util.List;
import org.argeo.security.ArgeoSecurityDao;
import org.argeo.security.ArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
import org.argeo.security.core.ArgeoUserDetails;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.ldap.core.ContextExecutor;
}
public ArgeoUser getUser(String uname) {
- return createBasicArgeoUser(getDetails(uname));
+ SimpleArgeoUser user = createSimpleArgeoUser(getDetails(uname));
+ user.setPassword(null);
+ return user;
+ }
+
+ public ArgeoUser getUserWithPassword(String uname) {
+ return createSimpleArgeoUser(getDetails(uname));
}
public ArgeoUser getCurrentUser() {
Authentication authentication = SecurityContextHolder.getContext()
.getAuthentication();
ArgeoUser argeoUser = ArgeoUserDetails.asArgeoUser(authentication);
+ if (argeoUser == null)
+ return null;
if (argeoUser.getRoles().contains(defaultRole))
argeoUser.getRoles().remove(defaultRole);
return argeoUser;
List<ArgeoUser> lst = new ArrayList<ArgeoUser>();
for (String username : usernames) {
- lst.add(createBasicArgeoUser(getDetails(username)));
+ lst.add(createSimpleArgeoUser(getDetails(username)));
}
return lst;
}