import org.argeo.security.ArgeoUser;
import org.argeo.security.SimpleArgeoUser;
import org.argeo.security.UserNature;
+import org.argeo.security.nature.SimpleUserNature;
import org.springframework.security.Authentication;
import org.springframework.security.GrantedAuthority;
import org.springframework.security.GrantedAuthorityImpl;
private final Map<String, UserNature> userNatures;
private final List<String> roles;
- public ArgeoUserDetails(String username, Map<String, UserNature> userNatures,
- String password, GrantedAuthority[] authorities)
- throws IllegalArgumentException {
+ public ArgeoUserDetails(String username,
+ Map<String, UserNature> userNatures, String password,
+ GrantedAuthority[] authorities) throws IllegalArgumentException {
super(username, password, true, true, true, true, authorities);
this.userNatures = Collections.unmodifiableMap(userNatures);
}
public void updateUserNatures(Map<String, UserNature> userNaturesData) {
- UserNature.updateUserNaturesWithCheck(userNatures, userNaturesData);
+ SimpleArgeoUser
+ .updateUserNaturesWithCheck(userNatures, userNaturesData);
}
public List<String> getRoles() {
}
/** The provided list, for chaining using {@link Collections} */
- protected static List<String> addAuthoritiesToRoles(
+ public static List<String> addAuthoritiesToRoles(
GrantedAuthority[] authorities, List<String> roles) {
for (GrantedAuthority authority : authorities) {
roles.add(authority.getAuthority());
return roles;
}
- protected static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
+ public static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
GrantedAuthority[] arr = new GrantedAuthority[roles.size()];
for (int i = 0; i < roles.size(); i++) {
String role = roles.get(i);