X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2FUiAdminUtils.java;h=871877a0e21d349f2cf36a469fca092fb7c6a0de;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=136c41540957913db11dc7666be5deea1d489163;hpb=cd2948994931fcb43283ffb30c1058d5860dec68;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
index 136c41540..871877a0e 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
@@ -1,115 +1,19 @@
 package org.argeo.security.ui.admin.internal;
 
-import java.security.AccessController;
-
-import javax.naming.InvalidNameException;
-import javax.naming.ldap.LdapName;
-import javax.security.auth.Subject;
-import javax.security.auth.x500.X500Principal;
-import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
+import org.argeo.security.ui.admin.internal.providers.UserTransactionProvider;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.services.ISourceProviderService;
-import org.osgi.service.useradmin.Role;
-import org.osgi.service.useradmin.User;
-import org.osgi.service.useradmin.UserAdmin;
 
 /** First effort to centralize back end methods used by the user admin UI */
 public class UiAdminUtils {
-
-	/** returns the local name of the current connected user */
-	public final static String getUsername(UserAdmin userAdmin) {
-		LdapName dn = getLdapName();
-		return getUsername(getUser(userAdmin, dn));
-	}
-
-	public final static boolean isCurrentUser(User user) {
-		String userName = UiAdminUtils.getProperty(user,
-				UserAdminConstants.KEY_DN);
-		try {
-			LdapName selfUserName = UiAdminUtils.getLdapName();
-			LdapName userLdapName = new LdapName(userName);
-			if (userLdapName.equals(selfUserName))
-				return true;
-			else
-				return false;
-		} catch (InvalidNameException e) {
-			throw new ArgeoException("User " + user + " has an unvalid dn: "
-					+ userName, e);
-		}
-	}
-
-	public final static LdapName getLdapName() {
-		Subject subject = Subject.getSubject(AccessController.getContext());
-		String name = subject.getPrincipals(X500Principal.class).iterator()
-				.next().toString();
-		LdapName dn;
-		try {
-			dn = new LdapName(name);
-		} catch (InvalidNameException e) {
-			throw new ArgeoException("Invalid user dn " + name, e);
-		}
-		return dn;
-	}
-
-	public final static User getUser(UserAdmin userAdmin, LdapName dn) {
-		User user = userAdmin.getUser(UserAdminConstants.KEY_DN, dn.toString());
-		return user;
-	}
-
-	public final static String getUsername(User user) {
-		String cn = getProperty(user, UserAdminConstants.KEY_CN);
-		if (isEmpty(cn))
-			cn = getProperty(user, UserAdminConstants.KEY_UID);
-		return cn;
-	}
-
-	public final static String getProperty(Role role, String key) {
-		Object obj = role.getProperties().get(key);
-		if (obj != null)
-			return (String) obj;
-		else
-			return "";
-	}
-
-	public final static String getDefaultCn(String firstName, String lastName) {
-		return (firstName.trim() + " " + lastName.trim() + " ").trim();
-	}
-
 	/*
 	 * INTERNAL METHODS: Below methods are meant to stay here and are not part
 	 * of a potential generic backend to manage the useradmin
 	 */
-	public final static boolean notNull(String string) {
-		if (string == null)
-			return false;
-		else
-			return !"".equals(string.trim());
-	}
-
-	public final static boolean isEmpty(String string) {
-		if (string == null)
-			return true;
-		else
-			return "".equals(string.trim());
-	}
-
-	/** Must be called from the UI Thread. */
-	public final static void beginTransactionIfNeeded(
-			UserTransaction userTransaction) {
-		try {
-			if (userTransaction.getStatus() == Status.STATUS_NO_TRANSACTION) {
-				userTransaction.begin();
-				notifyTransactionStateChange(userTransaction);
-			}
-		} catch (Exception e) {
-			throw new ArgeoException("Unable to begin transaction", e);
-		}
-	}
-
 	/** Easily notify the ActiveWindow that the transaction had a state change */
 	public final static void notifyTransactionStateChange(
 			UserTransaction userTransaction) {
@@ -122,7 +26,7 @@ public class UiAdminUtils {
 					.getSourceProvider(UserTransactionProvider.TRANSACTION_STATE);
 			esp.fireTransactionStateChange();
 		} catch (Exception e) {
-			throw new ArgeoException("Unable to begin transaction", e);
+			throw new CmsException("Unable to begin transaction", e);
 		}
 	}
 }
\ No newline at end of file