package org.argeo.security.ui.admin.internal.parts;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
+import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.util.useradmin.UserAdminUtils;
+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.security.ui.admin.internal.ColumnDefinition;
-import org.argeo.security.ui.admin.internal.UserAdminConstants;
+import org.argeo.osgi.useradmin.LdifName;
+import org.argeo.security.ui.admin.SecurityAdminImages;
import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.UserTableViewer;
+import org.argeo.security.ui.admin.internal.parts.UserEditor.GroupChangeListener;
+import org.argeo.security.ui.admin.internal.parts.UserEditor.MainInfoListener;
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.RoleIconLP;
+import org.argeo.security.ui.admin.internal.providers.UserFilter;
import org.argeo.security.ui.admin.internal.providers.UserNameLP;
import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ToolBarManager;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerDropAdapter;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.dnd.TransferData;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.ui.forms.AbstractFormPart;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.SectionPart;
import org.osgi.service.useradmin.UserAdmin;
import org.osgi.service.useradmin.UserAdminEvent;
-/** Display/edit the properties common to all users */
+/** Display/edit the properties of a given user */
public class UserMainPage extends FormPage implements ArgeoNames {
- final static String ID = "argeoUserEditor.mainPage";
-
- // private final static Log log = LogFactory.getLog(UserMainPage.class);
+ final static String ID = "UserEditor.mainPage";
private final UserEditor editor;
private UserAdminWrapper userAdminWrapper;
- private char[] newPassword;
-
// Local configuration
private final int PRE_TITLE_INDENT = 10;
this.userAdminWrapper = userAdminWrapper;
}
- public String getNewPassword() {
- if (newPassword != null)
- return new String(newPassword);
- else
- return null;
- }
-
- public void resetNewPassword() {
- if (newPassword != null)
- Arrays.fill(newPassword, 'x');
- newPassword = null;
- }
-
protected void createFormContent(final IManagedForm mf) {
ScrolledForm form = mf.getForm();
- // Form page main title
- form.setText(editor.getProperty(UserAdminConstants.KEY_CN));
-
- // Body
Composite body = form.getBody();
- GridLayout mainLayout = new GridLayout(1, true);
+ GridLayout mainLayout = new GridLayout();
+ // mainLayout.marginRight = 10;
body.setLayout(mainLayout);
- appendOverviewPart(body);
- appendPasswordPart(body);
- appendMemberOfPart(body);
+ User user = editor.getDisplayedUser();
+ appendOverviewPart(body, user);
+ // Remove to ability to force the password for his own user. The user
+ // must then use the change pwd feature
+ if (!UserAdminUtils.isCurrentUser(user))
+ appendPasswordPart(body, user);
+ appendMemberOfPart(body, user);
}
/** Creates the general section */
- protected void appendOverviewPart(Composite parent) {
+ private void appendOverviewPart(final Composite parent, final User user) {
FormToolkit tk = getManagedForm().getToolkit();
- Composite body = addSection(tk, parent, "Main information");
+
+ Section section = addSection(tk, parent, "Main information");
+ Composite body = (Composite) section.getClient();
body.setLayout(new GridLayout(2, false));
- Text distinguishedName = createLT(body, "User Name",
- editor.getProperty(UserAdminConstants.KEY_UID));
+ final Text distinguishedName = createLT(tk, body, "User Name",
+ UserAdminUtils.getProperty(user, LdifName.uid.name()));
distinguishedName.setEnabled(false);
- final Text commonName = createLT(body, "Common Name",
- editor.getProperty(UserAdminConstants.KEY_CN));
+ final Text commonName = createLT(tk, body, "Common Name",
+ UserAdminUtils.getProperty(user, LdifName.cn.name()));
commonName.setEnabled(false);
- final Text firstName = createLT(body, "First name",
- editor.getProperty(UserAdminConstants.KEY_FIRSTNAME));
+ final Text firstName = createLT(tk, body, "First name",
+ UserAdminUtils.getProperty(user, LdifName.givenName.name()));
- final Text lastName = createLT(body, "Last name",
- editor.getProperty(UserAdminConstants.KEY_LASTNAME));
+ final Text lastName = createLT(tk, body, "Last name",
+ UserAdminUtils.getProperty(user, LdifName.sn.name()));
- final Text email = createLT(body, "Email",
- editor.getProperty(UserAdminConstants.KEY_MAIL));
+ final Text email = createLT(tk, body, "Email",
+ UserAdminUtils.getProperty(user, LdifName.mail.name()));
// create form part (controller)
AbstractFormPart part = new SectionPart((Section) body.getParent()) {
- public void commit(boolean onSave) {
- // TODO check changed ?
- // TODO Sanity checks
+ private MainInfoListener listener;
- editor.setProperty(UserAdminConstants.KEY_FIRSTNAME,
+ @Override
+ public void initialize(IManagedForm form) {
+ super.initialize(form);
+ listener = editor.new MainInfoListener(parent.getDisplay(),
+ this);
+ userAdminWrapper.addListener(listener);
+ }
+
+ @Override
+ public void dispose() {
+ userAdminWrapper.removeListener(listener);
+ super.dispose();
+ }
+
+ @SuppressWarnings("unchecked")
+ public void commit(boolean onSave) {
+ // TODO Sanity checks (mail validity...)
+ user.getProperties().put(LdifName.givenName.name(),
firstName.getText());
- editor.setProperty(UserAdminConstants.KEY_LASTNAME,
- lastName.getText());
- editor.setProperty(UserAdminConstants.KEY_CN,
+ user.getProperties()
+ .put(LdifName.sn.name(), lastName.getText());
+ user.getProperties().put(LdifName.cn.name(),
commonName.getText());
- // TODO check mail validity
- editor.setProperty(UserAdminConstants.KEY_MAIL, email.getText());
-
- // Enable common name ?
- // editor.setProperty(UserAdminConstants.KEY_CN,
- // email.getText());
+ user.getProperties().put(LdifName.mail.name(), email.getText());
super.commit(onSave);
}
+
+ @Override
+ public void refresh() {
+ distinguishedName.setText(UserAdminUtils.getProperty(user,
+ LdifName.uid.name()));
+ commonName.setText(UserAdminUtils.getProperty(user,
+ LdifName.cn.name()));
+ firstName.setText(UserAdminUtils.getProperty(user,
+ LdifName.givenName.name()));
+ lastName.setText(UserAdminUtils.getProperty(user,
+ LdifName.sn.name()));
+ email.setText(UserAdminUtils.getProperty(user,
+ LdifName.mail.name()));
+ refreshFormTitle(user);
+ super.refresh();
+ }
};
+ // Improve this: automatically generate CN when first or last name
+ // changes
ModifyListener cnML = new ModifyListener() {
private static final long serialVersionUID = 4298649222869835486L;
};
firstName.addModifyListener(cnML);
lastName.addModifyListener(cnML);
- firstName.addModifyListener(new FormPartML(part));
- lastName.addModifyListener(new FormPartML(part));
- email.addModifyListener(new FormPartML(part));
+
+ ModifyListener defaultListener = editor.new FormPartML(part);
+ firstName.addModifyListener(defaultListener);
+ lastName.addModifyListener(defaultListener);
+ email.addModifyListener(defaultListener);
getManagedForm().addPart(part);
}
/** Creates the password section */
- protected void appendPasswordPart(Composite parent) {
+ private void appendPasswordPart(Composite parent, final User user) {
FormToolkit tk = getManagedForm().getToolkit();
- Composite body = addSection(tk, parent, "Password");
-
- // Section section = tk.createSection(parent, Section.TITLE_BAR);
- // section.setLayoutData(EclipseUiUtils.fillWidth());
- // section.setText("Password");
- // Composite body = tk.createComposite(section, SWT.NO_FOCUS);
- // section.setClient(body);
- // body.setLayoutData(EclipseUiUtils.fillWidth());
-
+ Section section = addSection(tk, parent, "Password");
+ Composite body = (Composite) section.getClient();
body.setLayout(new GridLayout(2, false));
+
// add widgets (view)
- final Text password1 = createLP(body, "New password", "");
- final Text password2 = createLP(body, "Repeat password", "");
+ final Text password1 = createLP(tk, body, "New password", "");
+ final Text password2 = createLP(tk, body, "Repeat password", "");
+
// create form part (controller)
AbstractFormPart part = new SectionPart((Section) body.getParent()) {
-
+ @SuppressWarnings("unchecked")
public void commit(boolean onSave) {
if (!password1.getText().equals("")
|| !password2.getText().equals("")) {
if (password1.getText().equals(password2.getText())) {
- newPassword = password1.getText().toCharArray();
- // TODO real set password
+ char[] newPassword = password1.getText().toCharArray();
+ // userAdminWrapper.beginTransactionIfNeeded();
+ user.getCredentials().put(null, newPassword);
password1.setText("");
password2.setText("");
super.commit(onSave);
} else {
password1.setText("");
password2.setText("");
- throw new ArgeoException("Passwords are not equals");
+ throw new CmsException("Passwords are not equals");
}
}
}
-
};
- password1.addModifyListener(new FormPartML(part));
- password2.addModifyListener(new FormPartML(part));
+ ModifyListener defaultListener = editor.new FormPartML(part);
+ password1.addModifyListener(defaultListener);
+ password2.addModifyListener(defaultListener);
getManagedForm().addPart(part);
}
- private UserTableViewer userTableViewerCmp;
- private TableViewer userViewer;
-
- private void appendMemberOfPart(Composite parent) {
+ private LdifUsersTable appendMemberOfPart(final Composite parent, User user) {
FormToolkit tk = getManagedForm().getToolkit();
- Composite body = addSection(tk, parent, "Roles");
+ Section section = addSection(tk, parent, "Roles");
+ Composite body = (Composite) section.getClient();
body.setLayout(EclipseUiUtils.noSpaceGridLayout());
- // Define the displayed columns
+ boolean isAdmin = UserAdminUtils.isUserInRole(AuthConstants.ROLE_ADMIN);
+
+ // Displayed columns
List<ColumnDefinition> columnDefs = new ArrayList<ColumnDefinition>();
columnDefs.add(new ColumnDefinition(new RoleIconLP(), "", 0, 24));
- columnDefs.add(new ColumnDefinition(new UserNameLP(),
- "Distinguished Name", 300));
columnDefs.add(new ColumnDefinition(new CommonNameLP(), "Common Name",
150));
+ columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain Name",
+ 200));
+ // Only show technical DN to administrators
+ if (isAdmin)
+ columnDefs.add(new ColumnDefinition(new UserNameLP(),
+ "Distinguished Name", 120));
// Create and configure the table
- userTableViewerCmp = new MyUserTableViewer(body, SWT.MULTI
- | SWT.H_SCROLL | SWT.V_SCROLL, userAdminWrapper.getUserAdmin());
+ final LdifUsersTable userViewerCmp = new MyUserTableViewer(body,
+ SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL, user);
- userTableViewerCmp.setColumnDefinitions(columnDefs);
- userTableViewerCmp.populate(true, false);
+ userViewerCmp.setColumnDefinitions(columnDefs);
+ if (isAdmin)
+ userViewerCmp.populateWithStaticFilters(false, false);
+ else
+ userViewerCmp.populate(true, false);
GridData gd = EclipseUiUtils.fillAll();
gd.heightHint = 300;
- userTableViewerCmp.setLayoutData(gd);
+ userViewerCmp.setLayoutData(gd);
- // Links
- userViewer = userTableViewerCmp.getTableViewer();
+ // Controllers
+ TableViewer userViewer = userViewerCmp.getTableViewer();
userViewer.addDoubleClickListener(new UserTableDefaultDClickListener());
- // Really?
- userTableViewerCmp.refresh();
-
- // Drag and drop
int operations = DND.DROP_COPY | DND.DROP_MOVE;
Transfer[] tt = new Transfer[] { TextTransfer.getInstance() };
- userViewer.addDropSupport(operations, tt, new GroupDropListener(
- userViewer, userAdminWrapper.getUserAdmin(), editor.getDisplayedUser()));
+ GroupDropListener dropL = new GroupDropListener(userAdminWrapper,
+ userViewer, user);
+ userViewer.addDropSupport(operations, tt, dropL);
+ SectionPart part = new SectionPart((Section) body.getParent()) {
+
+ private GroupChangeListener listener;
+
+ @Override
+ public void initialize(IManagedForm form) {
+ super.initialize(form);
+ listener = editor.new GroupChangeListener(parent.getDisplay(),
+ this);
+ userAdminWrapper.addListener(listener);
+ }
+
+ public void commit(boolean onSave) {
+ super.commit(onSave);
+ }
+
+ @Override
+ public void dispose() {
+ userAdminWrapper.removeListener(listener);
+ super.dispose();
+ }
+
+ @Override
+ public void refresh() {
+ userViewerCmp.refresh();
+ super.refresh();
+ }
+ };
+ getManagedForm().addPart(part);
+ addRemoveAbitily(part, userViewer, user);
+ return userViewerCmp;
}
- private class MyUserTableViewer extends UserTableViewer {
- private static final long serialVersionUID = 8467999509931900367L;
+ private class MyUserTableViewer extends LdifUsersTable {
+ private static final long serialVersionUID = 2653790051461237329L;
- public MyUserTableViewer(Composite parent, int style,
- UserAdmin userAdmin) {
- super(parent, style, userAdmin, true);
+ private Button showSystemRoleBtn;
+
+ private final User user;
+ private final UserFilter userFilter;
+
+ public MyUserTableViewer(Composite parent, int style, User user) {
+ super(parent, style, true);
+ this.user = user;
+ userFilter = new UserFilter();
+ userFilter.setShowSystemRole(false);
+ }
+
+ protected void populateStaticFilters(Composite staticFilterCmp) {
+ staticFilterCmp.setLayout(new GridLayout());
+ showSystemRoleBtn = new Button(staticFilterCmp, SWT.CHECK);
+ showSystemRoleBtn.setText("Show system roles");
+ showSystemRoleBtn.addSelectionListener(new SelectionAdapter() {
+ private static final long serialVersionUID = -7033424592697691676L;
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ userFilter.setShowSystemRole(showSystemRoleBtn
+ .getSelection());
+ refresh();
+ }
+ });
}
@Override
protected List<User> listFilteredElements(String filter) {
- return (List<User>) editor.getFlatGroups(null);
+ List<User> users = (List<User>) editor.getFlatGroups(null);
+ List<User> filteredUsers = new ArrayList<User>();
+ if (users.contains(user))
+ users.remove(user);
+ userFilter.setSearchText(filter);
+ for (User user : users)
+ if (userFilter.select(null, null, user))
+ filteredUsers.add(user);
+ return filteredUsers;
+ }
+ }
+
+ private void addRemoveAbitily(SectionPart sectionPart,
+ TableViewer userViewer, User user) {
+ Section section = sectionPart.getSection();
+ ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
+ ToolBar toolbar = toolBarManager.createControl(section);
+ final Cursor handCursor = new Cursor(section.getDisplay(),
+ SWT.CURSOR_HAND);
+ toolbar.setCursor(handCursor);
+ toolbar.addDisposeListener(new DisposeListener() {
+ private static final long serialVersionUID = 3882131405820522925L;
+
+ public void widgetDisposed(DisposeEvent e) {
+ if ((handCursor != null) && (handCursor.isDisposed() == false)) {
+ handCursor.dispose();
+ }
+ }
+ });
+
+ String tooltip = "Remove " + UserAdminUtils.getUsername(user)
+ + " from the below selected groups";
+ Action action = new RemoveMembershipAction(userViewer, user, tooltip,
+ SecurityAdminImages.ICON_REMOVE_DESC);
+ toolBarManager.add(action);
+ toolBarManager.update(true);
+ section.setTextClient(toolbar);
+ }
+
+ private class RemoveMembershipAction extends Action {
+ private static final long serialVersionUID = -1337713097184522588L;
+
+ private final TableViewer userViewer;
+ private final User user;
+
+ RemoveMembershipAction(TableViewer userViewer, User user, String name,
+ ImageDescriptor img) {
+ super(name, img);
+ this.userViewer = userViewer;
+ this.user = user;
+ }
+
+ @Override
+ public void run() {
+ ISelection selection = userViewer.getSelection();
+ if (selection.isEmpty())
+ return;
+
+ @SuppressWarnings("unchecked")
+ Iterator<Group> it = ((IStructuredSelection) selection).iterator();
+ List<Group> groups = new ArrayList<Group>();
+ while (it.hasNext()) {
+ Group currGroup = it.next();
+ groups.add(currGroup);
+ }
+
+ userAdminWrapper.beginTransactionIfNeeded();
+ for (Group group : groups) {
+ group.removeMember(user);
+ }
+ userAdminWrapper.commitOrNotifyTransactionStateChange();
+ for (Group group : groups) {
+ userAdminWrapper.notifyListeners(new UserAdminEvent(null,
+ UserAdminEvent.ROLE_CHANGED, group));
+ }
}
}
/**
- * Defines this table as being a potential target to add group membership
+ * Defines the table as being a potential target to add group memberships
* (roles) to this user
*/
private class GroupDropListener extends ViewerDropAdapter {
private static final long serialVersionUID = 2893468717831451621L;
- private final UserAdmin myUserAdmin;
+ private final UserAdminWrapper myUserAdminWrapper;
private final User myUser;
- public GroupDropListener(Viewer viewer, UserAdmin userAdmin, User user) {
- super(viewer);
- this.myUserAdmin = userAdmin;
+ public GroupDropListener(UserAdminWrapper userAdminWrapper,
+ Viewer userViewer, User user) {
+ super(userViewer);
+ this.myUserAdminWrapper = userAdminWrapper;
this.myUser = user;
}
@Override
public void drop(DropTargetEvent event) {
String name = (String) event.data;
+ UserAdmin myUserAdmin = myUserAdminWrapper.getUserAdmin();
Role role = myUserAdmin.getRole(name);
// TODO this check should be done before.
if (role.getType() == Role.GROUP) {
// TODO check if the user is already member of this group
- userAdminWrapper.beginTransactionIfNeeded();
+
+ myUserAdminWrapper.beginTransactionIfNeeded();
Group group = (Group) role;
group.addMember(myUser);
- userAdminWrapper.notifyListeners(new UserAdminEvent(null,
+ userAdminWrapper.commitOrNotifyTransactionStateChange();
+ myUserAdminWrapper.notifyListeners(new UserAdminEvent(null,
UserAdminEvent.ROLE_CHANGED, group));
}
super.drop(event);
@Override
public boolean performDrop(Object data) {
- userTableViewerCmp.refresh();
+ // userTableViewerCmp.refresh();
return true;
}
}
// LOCAL HELPERS
+ private void refreshFormTitle(User group) {
+ getManagedForm().getForm().setText(
+ UserAdminUtils.getProperty(group, LdifName.cn.name()));
+ }
+
/** Appends a section with a title */
- private Composite addSection(FormToolkit tk, Composite parent, String title) {
+ private Section addSection(FormToolkit tk, Composite parent, String title) {
Section section = tk.createSection(parent, Section.TITLE_BAR);
GridData gd = EclipseUiUtils.fillWidth();
gd.verticalAlignment = PRE_TITLE_INDENT;
section.setLayoutData(gd);
section.setText(title);
+ // section.getMenu().setVisible(true);
+
Composite body = tk.createComposite(section, SWT.WRAP);
body.setLayoutData(EclipseUiUtils.fillAll());
section.setClient(body);
- return body;
+
+ return section;
}
/** Creates label and multiline text. */
- protected Text createLMT(Composite body, String label, String value) {
- FormToolkit toolkit = getManagedForm().getToolkit();
+ Text createLMT(FormToolkit toolkit, Composite body, String label,
+ String value) {
Label lbl = toolkit.createLabel(body, label);
lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
Text text = toolkit.createText(body, value, SWT.BORDER | SWT.MULTI);
}
/** Creates label and password. */
- protected Text createLP(Composite body, String label, String value) {
- FormToolkit toolkit = getManagedForm().getToolkit();
+ Text createLP(FormToolkit toolkit, Composite body, String label,
+ String value) {
Label lbl = toolkit.createLabel(body, label);
lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
Text text = toolkit.createText(body, value, SWT.BORDER | SWT.PASSWORD);
}
/** Creates label and text. */
- protected Text createLT(Composite body, String label, String value) {
- FormToolkit toolkit = getManagedForm().getToolkit();
+ Text createLT(FormToolkit toolkit, Composite body, String label,
+ String value) {
Label lbl = toolkit.createLabel(body, label);
lbl.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
Text text = toolkit.createText(body, value, SWT.BORDER);
text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
return text;
}
-
- private class FormPartML implements ModifyListener {
- private static final long serialVersionUID = 6299808129505381333L;
- private AbstractFormPart formPart;
-
- public FormPartML(AbstractFormPart generalPart) {
- this.formPart = generalPart;
- }
-
- public void modifyText(ModifyEvent e) {
- formPart.markDirty();
- }
- }
}
\ No newline at end of file
projects / lgpl / argeo-commons.git / blobdiff