X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2FUserAdminService.java;h=dddec035701d60afc61874ce6a3f1ac4185cbcc4;hb=fb4f7c451ea7d9025f7cf7fe032020f229df794a;hp=cd49d656668cfa15037bfe470f30c4620f5232b7;hpb=891dc0919c8fdcb6777ba02523432c1e2adc9e58;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 cd49d6566..dddec0357 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,33 @@ 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 <a href=
+	 * "http://www.mkyong.com/regular-expressions/how-to-validate-username-with-regular-expression/"
+	 * >this tip</a> (modified to remove '-')
 	 */
-	public void newUser(ArgeoUser argeoUser);
-
-	public ArgeoUser getUser(String username);
-
-	public Set<ArgeoUser> listUsers();
-
-	public Boolean userExists(String username);
+	public final static String USERNAME_PATTERN = "^[a-z0-9_]{3,15}$";
 
-	public void updateUser(ArgeoUser user);
-
-	public void updateUserPassword(String username, String password);
+	/**
+	 * Email addresses must match this regexp pattern ({@value #EMAIL_PATTERN}.
+	 * Thanks to <a href=
+	 * "http://www.mkyong.com/regular-expressions/how-to-validate-email-address-with-regular-expression/"
+	 * >this tip</a>.
+	 */
+	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
+	 */
 	/** List users having this role (except the super user). */
-	public Set<ArgeoUser> listUsersInRole(String role);
+	public Set<String> listUsersInRole(String role);
 
-	public void deleteUser(String username);
+	/** Synchronize with the underlying DAO. */
+	public void synchronize();
 
 	/*
 	 * ROLES