X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fwizards%2FMainUserInfoWizardPage.java;h=746d1ec2cf8e269569733ddb2d173fd23a3d41f5;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=066c376a1d3f27b9ec9d8bfc43e6b6852cc8f5f0;hpb=5266ec50ddbf3247a5033d98a1dbceec6673a5b8;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java
index 066c376a1..746d1ec2c 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/wizards/MainUserInfoWizardPage.java
@@ -1,3 +1,18 @@
+/*
+ * 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.ui.admin.wizards;
 
 import javax.jcr.Node;
@@ -15,14 +30,18 @@ import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
+import org.springframework.security.userdetails.UserDetails;
+import org.springframework.security.userdetails.UsernameNotFoundException;
 
 public class MainUserInfoWizardPage extends WizardPage implements
 		ModifyListener, ArgeoNames {
 	private Text username, firstName, lastName, primaryEmail, password1,
 			password2;
+	private UserAdminService userAdminService;
 
-	public MainUserInfoWizardPage() {
+	public MainUserInfoWizardPage(UserAdminService userAdminService) {
 		super("Main");
+		this.userAdminService = userAdminService;
 		setTitle("Required Information");
 	}
 
@@ -53,8 +72,15 @@ public class MainUserInfoWizardPage extends WizardPage implements
 
 	/** @return error message or null if complete */
 	protected String checkComplete() {
-		if (!username.getText().matches(UserAdminService.USERNAME_PATTERN))
-			return "Wrong user name format, should be lower case, between 3 and 15 characters with only '_' as acceptable special character.";
+//		if (!username.getText().matches(UserAdminService.USERNAME_PATTERN))
+//			return "Wrong user name format, should be lower case, between 3 and 64 characters with only '_' an '@' as acceptable special character.";
+		try {
+			UserDetails userDetails = userAdminService
+					.loadUserByUsername(username.getText());
+			return "User " + userDetails.getUsername() + " already exists";
+		} catch (UsernameNotFoundException e) {
+			// silent
+		}
 		if (!primaryEmail.getText().matches(UserAdminService.EMAIL_PATTERN))
 			return "Not a valid email address";
 		if (firstName.getText().trim().equals(""))