X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FUserAdminService.java;h=8844534c3cd6b7408ccadea8e3f9a8f40c62df17;hb=366325583b0b101f3e78fcfda65d3f856cef8617;hp=47ea65ecccc1fda91d337c826f0c5b7f4b96ed45;hpb=136dab5338b5f731b285d17c804861bd5e5a9b5c;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 47ea65ecc..8844534c3 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
@@ -2,26 +2,36 @@ package org.argeo.security;
import java.util.Set;
-public interface UserAdminService {
- /*
- * USERS
+import org.springframework.security.userdetails.UserDetailsManager;
+
+public interface UserAdminService extends UserDetailsManager {
+ /**
+ * Usernames must match this regexp pattern ({@value #USERNAME_PATTERN}).
+ * Thanks to this tip (modified to remove '-' and add upper-case)
*/
- public void newUser(ArgeoUser argeoUser);
-
- public ArgeoUser getUser(String username);
+ public final static String USERNAME_PATTERN = "^[a-zA-Z0-9_]{3,15}$";
- public Set listUsers();
-
- public Boolean userExists(String username);
-
- public void updateUser(ArgeoUser user);
+ /**
+ * Email addresses must match this regexp pattern ({@value #EMAIL_PATTERN}.
+ * Thanks to 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 void updateUserPassword(String username, String password);
+ /*
+ * USERS
+ */
+ /** List all users. */
+ public Set listUsers();
/** List users having this role (except the super user). */
- public Set listUsersInRole(String role);
+ public Set listUsersInRole(String role);
- public void deleteUser(String username);
+ /** Synchronize with the underlying DAO. */
+ public void synchronize();
/*
* ROLES
@@ -31,9 +41,4 @@ public interface UserAdminService {
public Set listEditableRoles();
public void deleteRole(String role);
-
- /*
- * SYSTEM
- */
- public Runnable wrapWithSystemAuthentication(final Runnable runnable);
}