X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FUserAdminService.java;h=0a84cf66ff1b83538ebd7030d6fa9cd4fc839f3f;hb=4c1cdecd3d3de9ff6a70b875a72bfd29a85b0227;hp=4babb87a03c7c40e687802412cc2956fa0402de6;hpb=8b78007039ccb1f19d498742a64cf62435e8b093;p=lgpl%2Fargeo-commons.git
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 4babb87a0..0a84cf66f 100644
--- 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 Argeo GmbH
+ *
+ * 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 this tip (modified to remove '-')
+ * >this tip (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}.
@@ -18,29 +35,16 @@ public interface UserAdminService {
* "http://www.mkyong.com/regular-expressions/how-to-validate-email-address-with-regular-expression/"
* >this tip.
*/
- public final static String EMAIL_PATTERN = "^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
+ public final static String EMAIL_PATTERN = "^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
/*
* USERS
*/
- public void newUser(ArgeoUser argeoUser);
-
- public ArgeoUser getUser(String username);
-
- public Set listUsers();
-
- public Boolean userExists(String username);
-
- public void updateUser(ArgeoUser user);
-
- public void updateUserPassword(String username, String password);
+ /** List all users. */
+ public Set listUsers();
/** List users having this role (except the super user). */
- public Set listUsersInRole(String role);
-
- public List listUserRoles(String username);
-
- public void deleteUser(String username);
+ public Set listUsersInRole(String role);
/** Synchronize with the underlying DAO. */
public void synchronize();