Add license headers

[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..10f850444894e08a10aa704eb4e88d986f85a975 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
@@ -1,9 +1,27 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.security.core;
 
 import java.util.ArrayList;
 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;
@@ -15,6 +33,7 @@ import org.springframework.security.userdetails.UserDetails;
 
 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;
@@ -39,6 +58,10 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
                return userNatures;
        }
 
+       public void updateUserNatures(List<UserNature> userNaturesData) {
+               UserNature.updateUserNaturesWithCheck(userNatures, userNaturesData);
+       }
+
        public List<String> getRoles() {
                return roles;
        }
@@ -55,12 +78,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++) {
-                       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;
        }
 
-       public static SimpleArgeoUser createBasicArgeoUser(UserDetails userDetails) {
+       public static SimpleArgeoUser createSimpleArgeoUser(UserDetails userDetails) {
                if (userDetails instanceof ArgeoUser) {
                        return new SimpleArgeoUser((ArgeoUser) userDetails);
                } else {
@@ -73,8 +100,12 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
        }
 
        public static ArgeoUser asArgeoUser(Authentication authentication) {
+               if (authentication == null)
+                       return null;
+
                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());