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=69786f6fb92947b9dc7e468b60da645b1c2c8c57;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;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..69786f6fb 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,27 +1,53 @@
+/*
+ * 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.Set;
 
-public interface UserAdminService {
-	/*
-	 * USERS
-	 */
-	public void newUser(ArgeoUser argeoUser);
-
-	public ArgeoUser getUser(String username);
+import org.springframework.security.userdetails.UserDetailsManager;
 
-	public Set<ArgeoUser> listUsers();
-
-	public Boolean userExists(String username);
+/** 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 add upper-case, add '@')
+	 */
+	//public final static String USERNAME_PATTERN = "^[a-zA-Z0-9_-@]{3,64}$";
 
-	public void updateUser(ArgeoUser user);
+	/**
+	 * 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,})$";
 
-	public void updateUserPassword(String username, String password);
+	/*
+	 * USERS
+	 */
+	/** List all users. */
+	public Set<String> listUsers();
 
 	/** 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
@@ -31,11 +57,4 @@ public interface UserAdminService {
 	public Set<String> listEditableRoles();
 
 	public void deleteRole(String role);
-
-	/*
-	 * SYSTEM
-	 */
-	@Deprecated
-	/** @deprecated Use ${link SystemExecutionService} instead.*/
-	public Runnable wrapWithSystemAuthentication(final Runnable runnable);
 }