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=65bc4bb251eb2dba8afe374aa7a3baac656bb818;hb=72c5c4c7e5348ad96a451ef866a1e231db976dc7;hp=4bd887ec7224bd0096215952ec7f36323c1277ce;hpb=977a7a352131b082a98739f15e421f2bff747567;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 4bd887ec7..65bc4bb25 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,37 @@ package org.argeo.security;
import java.util.Set;
-public interface UserAdminService {
- /*
- * USERS
+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 add upper-case, add '@')
*/
- public void newUser(ArgeoUser argeoUser);
-
- public ArgeoUser getUser(String username);
+ //public final static String USERNAME_PATTERN = "^[a-zA-Z0-9_-@]{3,64}$";
- 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,11 +42,4 @@ public interface UserAdminService {
public Set listEditableRoles();
public void deleteRole(String role);
-
- /*
- * SYSTEM
- */
- @Deprecated
- /** @deprecated Use ${link SystemExecutionService} instead.*/
- public Runnable wrapWithSystemAuthentication(final Runnable runnable);
}