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 1080eb82c016c909a37f7c476588628bbc353c6a..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,11 +1,29 @@
+/*
+ * 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.BasicArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
 import org.argeo.security.UserNature;
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
@@ -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;
@@ -31,15 +50,18 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
        }
 
        public ArgeoUserDetails(ArgeoUser argeoUser) {
-               // TODO: password
-               this(argeoUser.getUsername(), argeoUser.getUserNatures(), null,
-                               rolesToAuthorities(argeoUser.getRoles()));
+               this(argeoUser.getUsername(), argeoUser.getUserNatures(), argeoUser
+                               .getPassword(), rolesToAuthorities(argeoUser.getRoles()));
        }
 
        public List<UserNature> getUserNatures() {
                return userNatures;
        }
 
+       public void updateUserNatures(List<UserNature> userNaturesData) {
+               UserNature.updateUserNaturesWithCheck(userNatures, userNaturesData);
+       }
+
        public List<String> getRoles() {
                return roles;
        }
@@ -56,24 +78,36 @@ 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 BasicArgeoUser createBasicArgeoUser(UserDetails userDetails) {
-               BasicArgeoUser argeoUser = new BasicArgeoUser();
-               argeoUser.setUsername(userDetails.getUsername());
-               addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
-                               .getRoles());
-               return argeoUser;
+       public static SimpleArgeoUser createSimpleArgeoUser(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 == null)
+                       return null;
+
                if (authentication.getPrincipal() instanceof ArgeoUser) {
-                       return (ArgeoUser) authentication.getPrincipal();
+                       return new SimpleArgeoUser((ArgeoUser) authentication
+                                       .getPrincipal());
                } else {
-                       BasicArgeoUser argeoUser = new BasicArgeoUser();
+                       SimpleArgeoUser argeoUser = new SimpleArgeoUser();
                        argeoUser.setUsername(authentication.getName());
                        addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
                                        .getRoles());