import java.util.List;
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;
+import org.springframework.security.GrantedAuthorityImpl;
import org.springframework.security.userdetails.User;
import org.springframework.security.userdetails.UserDetails;
getAuthorities(), new ArrayList<String>()));
}
+ public ArgeoUserDetails(ArgeoUser argeoUser) {
+ this(argeoUser.getUsername(), argeoUser.getUserNatures(), argeoUser
+ .getPassword(), rolesToAuthorities(argeoUser.getRoles()));
+ }
+
public List<UserNature> getUserNatures() {
return userNatures;
}
return roles;
}
- public static BasicArgeoUser createBasicArgeoUser(UserDetails userDetails) {
- BasicArgeoUser argeoUser = new BasicArgeoUser();
- argeoUser.setUsername(userDetails.getUsername());
- addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
- .getRoles());
- return argeoUser;
+ 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));
+ }
+ return arr;
}
- public static BasicArgeoUser createBasicArgeoUser(
- Authentication authentication) {
- BasicArgeoUser argeoUser = new BasicArgeoUser();
- argeoUser.setUsername(authentication.getName());
- addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
- .getRoles());
- return argeoUser;
+ public static SimpleArgeoUser createBasicArgeoUser(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 new SimpleArgeoUser((ArgeoUser) authentication.getPrincipal());
+ } else {
+ SimpleArgeoUser argeoUser = new SimpleArgeoUser();
+ argeoUser.setUsername(authentication.getName());
+ addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
+ .getRoles());
+ return argeoUser;
+ }
}
}