X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.admin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Fcommands%2FRefreshUsersList.java;h=e4c14ab21b6ad0b3c2fe9aa83e11a5b7cbb9cf63;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=a66b79067d78a348c2727a7263ea23a8247baa35;hpb=fb4f7c451ea7d9025f7cf7fe032020f229df794a;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..e4c14ab21 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,22 +1,91 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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.commands;
 
+import java.util.Set;
+
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.Repository;
+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;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-/** Refresh the main EBI list. */
+/**
+ * Refreshes the main user list, removing nodes which are not referenced by user
+ * admin service.
+ */
 public class RefreshUsersList extends AbstractHandler {
 	private UserAdminService userAdminService;
+	private Repository repository;
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
+		Set<String> users = userAdminService.listUsers();
+		Session session = null;
+		try {
+			session = repository.login();
+			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);
+		} finally {
+			JcrUtils.logoutQuietly(session);
+		}
 		userAdminService.synchronize();
+
+		// FIXME try to refresh views that extend the UsersView and have another
+		// ID
+		IWorkbenchPart part = HandlerUtil.getActiveWorkbenchWindow(event)
+				.getActivePage().getActivePart();
+		if (part instanceof UsersView)
+			((UsersView) part).refresh();
+
+		// Try to refresh UsersView if opened
 		UsersView view = (UsersView) HandlerUtil
 				.getActiveWorkbenchWindow(event).getActivePage()
 				.findView(UsersView.ID);
-		view.refresh();
+		if (view != null)
+			view.refresh();
+
 		return null;
 	}
 
@@ -24,4 +93,8 @@ public class RefreshUsersList extends AbstractHandler {
 		this.userAdminService = userAdminService;
 	}
 
+	public void setRepository(Repository repository) {
+		this.repository = repository;
+	}
+
 }
\ No newline at end of file