import java.util.List;
import org.argeo.ArgeoException;
+import org.argeo.cms.auth.AuthConstants;
+import org.argeo.eclipse.ui.ColumnDefinition;
import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.eclipse.ui.parts.LdifUsersTable;
import org.argeo.jcr.ArgeoNames;
+import org.argeo.osgi.useradmin.LdifName;
import org.argeo.security.ui.admin.SecurityAdminPlugin;
-import org.argeo.security.ui.admin.internal.ColumnDefinition;
-import org.argeo.security.ui.admin.internal.UiAdminUtils;
-import org.argeo.security.ui.admin.internal.UserAdminConstants;
+import org.argeo.security.ui.admin.internal.UiUserAdminListener;
+import org.argeo.security.ui.admin.internal.UserAdminUtils;
import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.UserTableViewer;
import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
import org.argeo.security.ui.admin.internal.providers.DomainNameLP;
import org.argeo.security.ui.admin.internal.providers.MailLP;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.part.ViewPart;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.useradmin.Role;
import org.osgi.service.useradmin.User;
-import org.osgi.service.useradmin.UserAdmin;
import org.osgi.service.useradmin.UserAdminEvent;
import org.osgi.service.useradmin.UserAdminListener;
/** List all users with filter - based on Ldif userAdmin */
public class UsersView extends ViewPart implements ArgeoNames {
// private final static Log log = LogFactory.getLog(UsersView.class);
+
public final static String ID = SecurityAdminPlugin.PLUGIN_ID
+ ".usersView";
/* DEPENDENCY INJECTION */
private UserAdminWrapper userAdminWrapper;
- private UserAdmin userAdmin;
-
// UI Objects
- private UserTableViewer userTableViewerCmp;
+ private LdifUsersTable userTableViewerCmp;
private TableViewer userViewer;
private List<ColumnDefinition> columnDefs = new ArrayList<ColumnDefinition>();
// Define the displayed columns
columnDefs.add(new ColumnDefinition(new CommonNameLP(), "Common Name",
150));
- columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 120));
columnDefs.add(new ColumnDefinition(new MailLP(), "E-mail", 150));
- columnDefs.add(new ColumnDefinition(new UserNameLP(),
- "Distinguished Name", 300));
+ columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200));
+ // Only show technical DN to admin
+ if (UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN))
+ columnDefs.add(new ColumnDefinition(new UserNameLP(),
+ "Distinguished Name", 300));
// Create and configure the table
userTableViewerCmp = new MyUserTableViewer(parent, SWT.MULTI
- | SWT.H_SCROLL | SWT.V_SCROLL, userAdmin);
+ | SWT.H_SCROLL | SWT.V_SCROLL);
userTableViewerCmp.setLayoutData(EclipseUiUtils.fillAll());
-
userTableViewerCmp.setColumnDefinitions(columnDefs);
userTableViewerCmp.populate(true, false);
userViewer));
// Register a useradmin listener
- listener = new UserAdminListener() {
- @Override
- public void roleChanged(UserAdminEvent event) {
- if (userViewer != null && !userViewer.getTable().isDisposed())
- refresh();
- }
- };
+ listener = new MyUiUAListener(parent.getDisplay());
userAdminWrapper.addListener(listener);
}
- private class MyUserTableViewer extends UserTableViewer {
+ private class MyUiUAListener extends UiUserAdminListener {
+ public MyUiUAListener(Display display) {
+ super(display);
+ }
+
+ @Override
+ public void roleChangedToUiThread(UserAdminEvent event) {
+ if (userViewer != null && !userViewer.getTable().isDisposed())
+ refresh();
+ }
+ }
+
+ private class MyUserTableViewer extends LdifUsersTable {
private static final long serialVersionUID = 8467999509931900367L;
- private final String[] knownProps = { UserAdminConstants.KEY_UID,
- UserAdminConstants.KEY_DN, UserAdminConstants.KEY_CN,
- UserAdminConstants.KEY_FIRSTNAME,
- UserAdminConstants.KEY_LASTNAME, UserAdminConstants.KEY_MAIL };
+ private final String[] knownProps = { LdifName.uid.name(),
+ LdifName.dn.name(), LdifName.cn.name(),
+ LdifName.givenName.name(), LdifName.sn.name(),
+ LdifName.mail.name() };
- public MyUserTableViewer(Composite parent, int style,
- UserAdmin userAdmin) {
- super(parent, style, userAdmin);
+ public MyUserTableViewer(Composite parent, int style) {
+ super(parent, style);
}
@Override
StringBuilder builder = new StringBuilder();
StringBuilder tmpBuilder = new StringBuilder();
- if (UiAdminUtils.notNull(filter))
+ if (EclipseUiUtils.notEmpty(filter))
for (String prop : knownProps) {
tmpBuilder.append("(");
tmpBuilder.append(prop);
tmpBuilder.append("*)");
}
if (tmpBuilder.length() > 1) {
- builder.append("(&(objectclass=inetOrgPerson)(|");
+ builder.append("(&(").append(LdifName.objectClass.name())
+ .append("=").append(LdifName.inetOrgPerson.name())
+ .append(")(|");
builder.append(tmpBuilder.toString());
builder.append("))");
} else
- builder.append("(objectclass=inetOrgPerson)");
- roles = userAdmin.getRoles(builder.toString());
+ builder.append("(").append(LdifName.objectClass.name())
+ .append("=").append(LdifName.inetOrgPerson.name())
+ .append(")");
+ roles = userAdminWrapper.getUserAdmin().getRoles(
+ builder.toString());
} catch (InvalidSyntaxException e) {
throw new ArgeoException("Unable to get roles with filter: "
+ filter, e);
/* DEPENDENCY INJECTION */
public void setUserAdminWrapper(UserAdminWrapper userAdminWrapper) {
this.userAdminWrapper = userAdminWrapper;
- this.userAdmin = userAdminWrapper.getUserAdmin();
}
}
\ No newline at end of file