Update license headers

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / UserAdminService.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java
index 4babb87a03c7c40e687802412cc2956fa0402de6..69786f6fb92947b9dc7e468b60da645b1c2c8c57 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/UserAdminService.java
@@ -1,16 +1,33 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * 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;
 
-import java.util.List;
 import java.util.Set;
 
-public interface UserAdminService {
+import org.springframework.security.userdetails.UserDetailsManager;
+
+/** Enrich {@link UserDetailsManager} in order to provide roles semantics. */
+public interface UserAdminService extends UserDetailsManager {
        /**
         * Usernames must match this regexp pattern ({@value #USERNAME_PATTERN}).
         * Thanks to <a href=
         * "http://www.mkyong.com/regular-expressions/how-to-validate-username-with-regular-expression/"
-        * >this tip</a> (modified to remove '-')
+        * >this tip</a> (modified to add upper-case, add '@')
         */
-       public final static String USERNAME_PATTERN = "^[a-z0-9_]{3,15}$";
+       //public final static String USERNAME_PATTERN = "^[a-zA-Z0-9_-@]{3,64}$";
 
        /**
         * Email addresses must match this regexp pattern ({@value #EMAIL_PATTERN}.
@@ -23,24 +40,11 @@ public interface UserAdminService {
        /*
         * USERS
         */
-       public void newUser(ArgeoUser argeoUser);
-
-       public ArgeoUser getUser(String username);
-
-       public Set<ArgeoUser> listUsers();
-
-       public Boolean userExists(String username);
-
-       public void updateUser(ArgeoUser user);
-
-       public void updateUserPassword(String username, String password);
+       /** List all users. */
+       public Set<String> listUsers();
 
        /** List users having this role (except the super user). */
-       public Set<ArgeoUser> listUsersInRole(String role);
-
-       public List<String> listUserRoles(String username);
-
-       public void deleteUser(String username);
+       public Set<String> listUsersInRole(String role);
 
        /** Synchronize with the underlying DAO. */
        public void synchronize();