projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix various issues:
[lgpl/argeo-commons.git]
/
security
/
runtime
/
org.argeo.security.core
/
src
/
main
/
java
/
org
/
argeo
/
security
/
core
/
ArgeoUserDetails.java
diff --git
a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
index 7ec9ce74ee768bd780f8b9e58505e10bbf23d55f..a05dd1245399e931567cc56a9c0dc19a54c6c762 100644
(file)
--- a/
security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
+++ b/
security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
@@
-4,6
+4,8
@@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
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.SimpleArgeoUser;
import org.argeo.security.UserNature;
import org.argeo.security.ArgeoUser;
import org.argeo.security.SimpleArgeoUser;
import org.argeo.security.UserNature;
@@
-15,6
+17,7
@@
import org.springframework.security.userdetails.UserDetails;
public class ArgeoUserDetails extends User implements ArgeoUser {
private static final long serialVersionUID = 1L;
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;
private final List<UserNature> userNatures;
private final List<String> roles;
@@
-55,12
+58,16
@@
public class ArgeoUserDetails extends User implements ArgeoUser {
protected static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
GrantedAuthority[] arr = new GrantedAuthority[roles.size()];
for (int i = 0; i < roles.size(); i++) {
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;
}
}
return arr;
}
- public static SimpleArgeoUser create
Basic
ArgeoUser(UserDetails userDetails) {
+ public static SimpleArgeoUser create
Simple
ArgeoUser(UserDetails userDetails) {
if (userDetails instanceof ArgeoUser) {
return new SimpleArgeoUser((ArgeoUser) userDetails);
} else {
if (userDetails instanceof ArgeoUser) {
return new SimpleArgeoUser((ArgeoUser) userDetails);
} else {
@@
-74,7
+81,8
@@
public class ArgeoUserDetails extends User implements ArgeoUser {
public static ArgeoUser asArgeoUser(Authentication authentication) {
if (authentication.getPrincipal() instanceof ArgeoUser) {
public static ArgeoUser asArgeoUser(Authentication authentication) {
if (authentication.getPrincipal() instanceof ArgeoUser) {
- return new SimpleArgeoUser((ArgeoUser) authentication.getPrincipal());
+ return new SimpleArgeoUser((ArgeoUser) authentication
+ .getPrincipal());
} else {
SimpleArgeoUser argeoUser = new SimpleArgeoUser();
argeoUser.setUsername(authentication.getName());
} else {
SimpleArgeoUser argeoUser = new SimpleArgeoUser();
argeoUser.setUsername(authentication.getName());