X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2FUserAdminWrapper.java;h=2cd3eab213d620bb6527354216b3c6aa488a2736;hb=25e98954db6faeec4ba9950f651e81fbea595b0c;hp=6b077e08f17913efb7704a12401d78bbf8f03dea;hpb=facc75a4aa15d208661ab0f9fd0e4317ebfc33cd;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
index 6b077e08f..2cd3eab21 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
@@ -7,18 +7,17 @@ import java.util.List;
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.ArgeoException;
+import org.argeo.cms.auth.AuthConstants;
 import org.argeo.osgi.useradmin.UserAdminConf;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.useradmin.UserAdmin;
 import org.osgi.service.useradmin.UserAdminEvent;
 import org.osgi.service.useradmin.UserAdminListener;
 
-/** Simplifies the interaction with the UserAdmin in this bundle */
+/** Centralize interaction with the UserAdmin in this bundle */
 public class UserAdminWrapper {
-	private Log log = LogFactory.getLog(UserAdminWrapper.class);
+	// private Log log = LogFactory.getLog(UserAdminWrapper.class);
 
 	private UserAdmin userAdmin;
 	private ServiceReference<UserAdmin> userAdminServiceReference;
@@ -34,12 +33,13 @@ public class UserAdminWrapper {
 	}
 
 	/** Must be called from the UI Thread. */
-	public void beginTransactionIfNeeded() {
+	public UserTransaction beginTransactionIfNeeded() {
 		try {
 			if (userTransaction.getStatus() == Status.STATUS_NO_TRANSACTION) {
 				userTransaction.begin();
 				UiAdminUtils.notifyTransactionStateChange(userTransaction);
 			}
+			return userTransaction;
 		} catch (Exception e) {
 			throw new ArgeoException("Unable to begin transaction", e);
 		}
@@ -64,25 +64,35 @@ public class UserAdminWrapper {
 		return userTransaction;
 	}
 
-	/* DEPENDENCY INJECTION */
-	public void setUserAdmin(UserAdmin userAdmin) {
-		this.userAdmin = userAdmin;
-	}
-
 	public void setUserAdminServiceReference(
 			ServiceReference<UserAdmin> userAdminServiceReference) {
 		this.userAdminServiceReference = userAdminServiceReference;
+	}
+
+	public List<String> getKnownBaseDns(boolean onlyWritable) {
+		List<String> dns = new ArrayList<String>();
 		for (String uri : userAdminServiceReference.getPropertyKeys()) {
 			if (!uri.startsWith("/"))
 				continue;
-			log.debug(uri);
 			Dictionary<String, ?> props = UserAdminConf.uriAsProperties(uri);
-			log.debug(props);
+			String readOnly = UserAdminConf.readOnly.getValue(props);
+			String baseDn = UserAdminConf.baseDn.getValue(props);
+
+			if (onlyWritable && "true".equals(readOnly))
+				continue;
+			if (baseDn.equalsIgnoreCase(AuthConstants.ROLES_BASEDN))
+				continue;
+			dns.add(baseDn);
 		}
+		return dns;
+	}
+
+	/* DEPENDENCY INJECTION */
+	public void setUserAdmin(UserAdmin userAdmin) {
+		this.userAdmin = userAdmin;
 	}
 
 	public void setUserTransaction(UserTransaction userTransaction) {
 		this.userTransaction = userTransaction;
 	}
-
-}
+}
\ No newline at end of file