X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fcommands%2FRefreshUsersList.java;fp=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fcommands%2FRefreshUsersList.java;h=6cf9a774971d70bed95350a39882effa89649273;hb=4c8c237990cda2b1a9be35532796510d9d5734c5;hp=a66b79067d78a348c2727a7263ea23a8247baa35;hpb=3393906b44fd05a9446c3c4896fadfccc3c2000a;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java
index a66b79067..6cf9a7749 100644
--- a/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java
+++ b/security/plugins/org.argeo.security.ui.admin/src/main/java/org/argeo/security/ui/admin/commands/RefreshUsersList.java
@@ -1,5 +1,17 @@
 package org.argeo.security.ui.admin.commands;
 
+import java.util.Set;
+
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.query.Query;
+
+import org.argeo.ArgeoException;
+import org.argeo.jcr.ArgeoNames;
+import org.argeo.jcr.ArgeoTypes;
+import org.argeo.jcr.JcrUtils;
 import org.argeo.security.UserAdminService;
 import org.argeo.security.ui.admin.views.UsersView;
 import org.eclipse.core.commands.AbstractHandler;
@@ -7,11 +19,37 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-/** Refresh the main EBI list. */
+/**
+ * Refreshes the main EBI list, removing nodes which are not referenced by user
+ * admin service.
+ */
 public class RefreshUsersList extends AbstractHandler {
 	private UserAdminService userAdminService;
+	private Session session;
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
+		Set<String> users = userAdminService.listUsers();
+		try {
+			Query query = session
+					.getWorkspace()
+					.getQueryManager()
+					.createQuery(
+							"select * from [" + ArgeoTypes.ARGEO_USER_HOME
+									+ "]", Query.JCR_SQL2);
+			NodeIterator nit = query.execute().getNodes();
+			while (nit.hasNext()) {
+				Node node = nit.nextNode();
+				String username = node.getProperty(ArgeoNames.ARGEO_USER_ID)
+						.getString();
+				if (!users.contains(username))
+					node.remove();
+			}
+			session.save();
+		} catch (RepositoryException e) {
+			JcrUtils.discardQuietly(session);
+			throw new ArgeoException("Cannot list users", e);
+		}
+
 		userAdminService.synchronize();
 		UsersView view = (UsersView) HandlerUtil
 				.getActiveWorkbenchWindow(event).getActivePage()
@@ -24,4 +62,8 @@ public class RefreshUsersList extends AbstractHandler {
 		this.userAdminService = userAdminService;
 	}
 
+	public void setSession(Session session) {
+		this.session = session;
+	}
+
 }
\ No newline at end of file