X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Feditors%2FArgeoUserEditor.java;h=b511e683c5242cea0188f71e2988089791ddc740;hb=484dcb1507e4e35cc282e50522ea7eac7e99a7f9;hp=a0e4dfc82332faf44b9dfbc04e909e44b02fae4b;hpb=2f510fb09e18bc3d3e902c8131d0037763c5f279;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
index a0e4dfc82..b511e683c 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/editors/ArgeoUserEditor.java
@@ -1,14 +1,13 @@
 package org.argeo.security.ui.admin.editors;
 
 import javax.jcr.Node;
+import javax.jcr.Session;
 
 import org.argeo.ArgeoException;
 import org.argeo.jcr.ArgeoNames;
-import org.argeo.security.ArgeoUser;
-import org.argeo.security.SimpleArgeoUser;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.security.UserAdminService;
 import org.argeo.security.jcr.JcrUserDetails;
-import org.argeo.security.nature.SimpleUserNature;
 import org.argeo.security.ui.admin.SecurityAdminPlugin;
 import org.argeo.security.ui.admin.views.UsersView;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -17,35 +16,26 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.forms.editor.FormEditor;
-import org.springframework.security.userdetails.UserDetailsManager;
 
 /** Editor for an Argeo user. */
 public class ArgeoUserEditor extends FormEditor {
 	public final static String ID = "org.argeo.security.ui.admin.adminArgeoUserEditor";
 
-	private ArgeoUser user;
 	private JcrUserDetails userDetails;
 	private Node userHome;
 	private UserAdminService userAdminService;
-	private UserDetailsManager userDetailsManager;
+	private Session session;
 
 	public void init(IEditorSite site, IEditorInput input)
 			throws PartInitException {
 		super.init(site, input);
-		userHome = ((ArgeoUserEditorInput) getEditorInput()).getUserHome();
 		String username = ((ArgeoUserEditorInput) getEditorInput())
 				.getUsername();
+		userHome = JcrUtils.getUserHome(session, username);
 
-		userDetails = (JcrUserDetails) userDetailsManager
+		userDetails = (JcrUserDetails) userAdminService
 				.loadUserByUsername(username);
 
-		if (username == null) {// new
-			user = new SimpleArgeoUser();
-			user.getUserNatures().put(SimpleUserNature.TYPE,
-					new SimpleUserNature());
-		} else
-			user = userAdminService.getUser(username);
-
 		this.setPartProperty("name", username != null ? username : "<new user>");
 		setPartName(username != null ? username : "<new user>");
 	}
@@ -53,7 +43,7 @@ public class ArgeoUserEditor extends FormEditor {
 	protected void addPages() {
 		try {
 			addPage(new DefaultUserMainPage(this,
-					userHome.getNode(ArgeoNames.ARGEO_USER_PROFILE)));
+					userHome.getNode(ArgeoNames.ARGEO_PROFILE)));
 			addPage(new UserRolesPage(this, userDetails, userAdminService));
 		} catch (Exception e) {
 			throw new ArgeoException("Cannot add pages", e);
@@ -80,7 +70,7 @@ public class ArgeoUserEditor extends FormEditor {
 					.getRoles());
 		}
 
-		userDetailsManager.updateUser(userDetails);
+		userAdminService.updateUser(userDetails);
 
 		// if (userAdminService.userExists(user.getUsername()))
 		// userAdminService.updateUser(user);
@@ -117,8 +107,7 @@ public class ArgeoUserEditor extends FormEditor {
 		this.userAdminService = userAdminService;
 	}
 
-	public void setUserDetailsManager(UserDetailsManager userDetailsManager) {
-		this.userDetailsManager = userDetailsManager;
+	public void setSession(Session session) {
+		this.session = session;
 	}
-
 }