import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.cms.auth.UserAdminUtils;
import org.argeo.cms.ui.eclipse.forms.AbstractFormPart;
import org.argeo.cms.ui.eclipse.forms.IManagedForm;
@PostConstruct
public void init(Composite parent) {
this.userAdmin = userAdminWrapper.getUserAdmin();
- username = mPart.getPersistedState().get(LdapAttrs.uid.name());
+ username = mPart.getPersistedState().get(LdapAttr.uid.name());
user = (User) userAdmin.getRole(username);
listener = new NameChangeListener(Display.getCurrent());
void updateEditorTitle(String title) {
if (title == null) {
- String commonName = UserAdminUtils.getProperty(user, LdapAttrs.cn.name());
+ String commonName = UserAdminUtils.getProperty(user, LdapAttr.cn.name());
title = "".equals(commonName) ? user.getName() : commonName;
}
setPartName(title);
package org.argeo.cms.e4.users;
-import static org.argeo.api.acr.ldap.LdapAttrs.businessCategory;
-import static org.argeo.api.acr.ldap.LdapAttrs.description;
+import static org.argeo.api.acr.ldap.LdapAttr.businessCategory;
+import static org.argeo.api.acr.ldap.LdapAttr.description;
import static org.argeo.api.cms.CmsContext.WORKGROUP;
import static org.argeo.cms.auth.UserAdminUtils.setProperty;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.api.cms.CmsConstants;
import org.argeo.api.cms.CmsContext;
import org.argeo.api.cms.transaction.WorkTransaction;
body.setLayout(layout);
body.setLayoutData(CmsSwtUtils.fillWidth());
- String cn = UserAdminUtils.getProperty(group, LdapAttrs.cn.name());
+ String cn = UserAdminUtils.getProperty(group, LdapAttr.cn.name());
createReadOnlyLT(body, "Name", cn);
createReadOnlyLT(body, "DN", group.getName());
createReadOnlyLT(body, "Domain", UserAdminUtils.getDomainName(group));
public void refresh() {
// dnTxt.setText(group.getName());
// cnTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.cn.name()));
- descTxt.setText(UserAdminUtils.getProperty(group, LdapAttrs.description.name()));
+ descTxt.setText(UserAdminUtils.getProperty(group, LdapAttr.description.name()));
Node workgroupHome = CmsJcrUtils.getGroupHome(groupsSession, cn);
if (workgroupHome == null)
markAsWorkgroupLk.setText("<a>Mark as workgroup</a>");
import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import org.argeo.api.acr.ldap.LdapAttrs;
-import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.acr.ldap.LdapObj;
import org.argeo.api.cms.CmsConstants;
import org.argeo.api.cms.CmsLog;
import org.argeo.cms.CurrentUser;
private boolean showSystemRoles = true;
- private final String[] knownProps = { LdapAttrs.uid.name(), LdapAttrs.cn.name(), LdapAttrs.DN };
+ private final String[] knownProps = { LdapAttr.uid.name(), LdapAttr.cn.name(), LdapAttr.DN };
public MyUserTableViewer(Composite parent, int style) {
super(parent, style);
tmpBuilder.append("*)");
}
if (tmpBuilder.length() > 1) {
- builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.groupOfNames.name()).append(")");
+ builder.append("(&(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.groupOfNames.name()).append(")");
// hide tokens
- builder.append("(!(").append(LdapAttrs.DN).append("=*").append(CmsConstants.TOKENS_BASEDN)
+ builder.append("(!(").append(LdapAttr.DN).append("=*").append(CmsConstants.TOKENS_BASEDN)
.append("))");
if (!showSystemRoles)
- builder.append("(!(").append(LdapAttrs.DN).append("=*").append(CmsConstants.SYSTEM_ROLES_BASEDN)
+ builder.append("(!(").append(LdapAttr.DN).append("=*").append(CmsConstants.SYSTEM_ROLES_BASEDN)
.append("))");
builder.append("(|");
builder.append(tmpBuilder.toString());
builder.append("))");
} else {
if (!showSystemRoles)
- builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.groupOfNames.name()).append(")(!(").append(LdapAttrs.DN).append("=*")
- .append(CmsConstants.SYSTEM_ROLES_BASEDN).append("))(!(").append(LdapAttrs.DN).append("=*")
+ builder.append("(&(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.groupOfNames.name()).append(")(!(").append(LdapAttr.DN).append("=*")
+ .append(CmsConstants.SYSTEM_ROLES_BASEDN).append("))(!(").append(LdapAttr.DN).append("=*")
.append(CmsConstants.TOKENS_BASEDN).append(")))");
else
- builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.groupOfNames.name()).append(")(!(").append(LdapAttrs.DN).append("=*")
+ builder.append("(&(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.groupOfNames.name()).append(")(!(").append(LdapAttr.DN).append("=*")
.append(CmsConstants.TOKENS_BASEDN).append(")))");
}
import java.util.List;
import java.util.Map;
-import org.argeo.api.acr.ldap.LdapAttrs;
-import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.acr.ldap.LdapObj;
import org.argeo.api.cms.CmsConstants;
import org.argeo.api.cms.CmsLog;
import org.argeo.api.cms.transaction.WorkTransaction;
try {
for (User user : usersToUpdate) {
// the char array is emptied after being used.
- user.getProperties().put(LdapAttrs.mail.name(), newEmail);
+ user.getProperties().put(LdapAttr.mail.name(), newEmail);
}
userAdminWrapper.commitOrNotifyTransactionStateChange();
private class ChooseUserTableViewer extends LdifUsersTable {
private static final long serialVersionUID = 5080437561015853124L;
- private final String[] knownProps = { LdapAttrs.uid.name(), LdapAttrs.DN, LdapAttrs.cn.name(),
- LdapAttrs.givenName.name(), LdapAttrs.sn.name(), LdapAttrs.mail.name() };
+ private final String[] knownProps = { LdapAttr.uid.name(), LdapAttr.DN, LdapAttr.cn.name(),
+ LdapAttr.givenName.name(), LdapAttr.sn.name(), LdapAttr.mail.name() };
public ChooseUserTableViewer(Composite parent, int style) {
super(parent, style);
tmpBuilder.append("*)");
}
if (tmpBuilder.length() > 1) {
- builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.inetOrgPerson.name()).append(")(|");
+ builder.append("(&(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.inetOrgPerson.name()).append(")(|");
builder.append(tmpBuilder.toString());
builder.append("))");
} else
- builder.append("(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.inetOrgPerson.name()).append(")");
+ builder.append("(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.inetOrgPerson.name()).append(")");
roles = userAdminWrapper.getUserAdmin().getRoles(builder.toString());
} catch (InvalidSyntaxException e) {
throw new CmsException("Unable to get roles with filter: " + filter, e);
package org.argeo.cms.e4.users;
-import static org.argeo.api.acr.ldap.LdapAttrs.cn;
-import static org.argeo.api.acr.ldap.LdapAttrs.givenName;
-import static org.argeo.api.acr.ldap.LdapAttrs.mail;
-import static org.argeo.api.acr.ldap.LdapAttrs.sn;
-import static org.argeo.api.acr.ldap.LdapAttrs.uid;
+import static org.argeo.api.acr.ldap.LdapAttr.cn;
+import static org.argeo.api.acr.ldap.LdapAttr.givenName;
+import static org.argeo.api.acr.ldap.LdapAttr.mail;
+import static org.argeo.api.acr.ldap.LdapAttr.sn;
+import static org.argeo.api.acr.ldap.LdapAttr.uid;
import static org.argeo.cms.auth.UserAdminUtils.getProperty;
import java.util.ArrayList;
import javax.inject.Inject;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.CurrentUser;
import org.argeo.cms.auth.UserAdminUtils;
@SuppressWarnings("unchecked")
public void commit(boolean onSave) {
// TODO Sanity checks (mail validity...)
- user.getProperties().put(LdapAttrs.givenName.name(), firstName.getText());
- user.getProperties().put(LdapAttrs.sn.name(), lastName.getText());
- user.getProperties().put(LdapAttrs.cn.name(), commonName.getText());
- user.getProperties().put(LdapAttrs.mail.name(), email.getText());
+ user.getProperties().put(LdapAttr.givenName.name(), firstName.getText());
+ user.getProperties().put(LdapAttr.sn.name(), lastName.getText());
+ user.getProperties().put(LdapAttr.cn.name(), commonName.getText());
+ user.getProperties().put(LdapAttr.mail.name(), email.getText());
super.commit(onSave);
}
@Override
public void refresh() {
- distinguishedName.setText(UserAdminUtils.getProperty(user, LdapAttrs.uid.name()));
- commonName.setText(UserAdminUtils.getProperty(user, LdapAttrs.cn.name()));
- firstName.setText(UserAdminUtils.getProperty(user, LdapAttrs.givenName.name()));
- lastName.setText(UserAdminUtils.getProperty(user, LdapAttrs.sn.name()));
- email.setText(UserAdminUtils.getProperty(user, LdapAttrs.mail.name()));
+ distinguishedName.setText(UserAdminUtils.getProperty(user, LdapAttr.uid.name()));
+ commonName.setText(UserAdminUtils.getProperty(user, LdapAttr.cn.name()));
+ firstName.setText(UserAdminUtils.getProperty(user, LdapAttr.givenName.name()));
+ lastName.setText(UserAdminUtils.getProperty(user, LdapAttr.sn.name()));
+ email.setText(UserAdminUtils.getProperty(user, LdapAttr.mail.name()));
refreshFormTitle(user);
super.refresh();
}
package org.argeo.cms.e4.users;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.cms.e4.CmsE4Utils;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.jface.viewers.DoubleClickEvent;
User user = (User) obj;
String editorId = getEditorId(user);
- CmsE4Utils.openEditor(partService, editorId, LdapAttrs.uid.name(), user.getName());
+ CmsE4Utils.openEditor(partService, editorId, LdapAttr.uid.name(), user.getName());
}
protected String getEditorId(User user) {
import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import org.argeo.api.acr.ldap.LdapAttrs;
-import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.acr.ldap.LdapObj;
import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.CurrentUser;
import org.argeo.cms.e4.users.providers.CommonNameLP;
private class MyUserTableViewer extends LdifUsersTable {
private static final long serialVersionUID = 8467999509931900367L;
- private final String[] knownProps = { LdapAttrs.DN, LdapAttrs.uid.name(), LdapAttrs.cn.name(),
- LdapAttrs.givenName.name(), LdapAttrs.sn.name(), LdapAttrs.mail.name() };
+ private final String[] knownProps = { LdapAttr.DN, LdapAttr.uid.name(), LdapAttr.cn.name(),
+ LdapAttr.givenName.name(), LdapAttr.sn.name(), LdapAttr.mail.name() };
public MyUserTableViewer(Composite parent, int style) {
super(parent, style);
tmpBuilder.append("*)");
}
if (tmpBuilder.length() > 1) {
- builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.inetOrgPerson.name()).append(")(|");
+ builder.append("(&(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.inetOrgPerson.name()).append(")(|");
builder.append(tmpBuilder.toString());
builder.append("))");
} else
- builder.append("(").append(LdapAttrs.objectClass.name()).append("=")
- .append(LdapObjs.inetOrgPerson.name()).append(")");
+ builder.append("(").append(LdapAttr.objectClass.name()).append("=")
+ .append(LdapObj.inetOrgPerson.name()).append(")");
roles = userAdminWrapper.getUserAdmin().getRoles(builder.toString());
} catch (InvalidSyntaxException e) {
throw new CmsException("Unable to get roles with filter: " + filter, e);
import javax.inject.Inject;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.cms.e4.users.UserAdminWrapper;
import org.argeo.cms.runtime.DirectoryConf;
import org.argeo.cms.swt.CmsException;
Dictionary props = group.getProperties();
String descStr = descriptionTxt.getText();
if (EclipseUiUtils.notEmpty(descStr))
- props.put(LdapAttrs.description.name(), descStr);
+ props.put(LdapAttr.description.name(), descStr);
userAdminWrapper.commitOrNotifyTransactionStateChange();
userAdminWrapper.notifyListeners(new UserAdminEvent(null, UserAdminEvent.ROLE_CREATED, group));
return true;
String bdn = baseDnCmb.getText();
if (EclipseUiUtils.notEmpty(bdn)) {
Dictionary<String, ?> props = DirectoryConf.uriAsProperties(dns.get(bdn));
- String dn = LdapAttrs.cn.name() + "=" + cn + "," + DirectoryConf.groupBase.getValue(props) + "," + bdn;
+ String dn = LdapAttr.cn.name() + "=" + cn + "," + DirectoryConf.groupBase.getValue(props) + "," + bdn;
return dn;
}
return null;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.cms.auth.UserAdminUtils;
import org.argeo.cms.e4.users.UiAdminUtils;
import org.argeo.cms.e4.users.UserAdminWrapper;
String lastNameStr = lastNameTxt.getText();
if (EclipseUiUtils.notEmpty(lastNameStr))
- props.put(LdapAttrs.sn.name(), lastNameStr);
+ props.put(LdapAttr.sn.name(), lastNameStr);
String firstNameStr = firstNameTxt.getText();
if (EclipseUiUtils.notEmpty(firstNameStr))
- props.put(LdapAttrs.givenName.name(), firstNameStr);
+ props.put(LdapAttr.givenName.name(), firstNameStr);
String cn = UserAdminUtils.buildDefaultCn(firstNameStr, lastNameStr);
if (EclipseUiUtils.notEmpty(cn))
- props.put(LdapAttrs.cn.name(), cn);
+ props.put(LdapAttr.cn.name(), cn);
String mailStr = primaryMailTxt.getText();
if (EclipseUiUtils.notEmpty(mailStr))
- props.put(LdapAttrs.mail.name(), mailStr);
+ props.put(LdapAttr.mail.name(), mailStr);
char[] password = mainUserInfo.getPassword();
user.getCredentials().put(null, password);
String bdn = baseDnCmb.getText();
if (EclipseUiUtils.notEmpty(bdn)) {
Dictionary<String, ?> props = DirectoryConf.uriAsProperties(dns.get(bdn));
- String dn = LdapAttrs.uid.name() + "=" + uid + "," + DirectoryConf.userBase.getValue(props) + "," + bdn;
+ String dn = LdapAttr.uid.name() + "=" + uid + "," + DirectoryConf.userBase.getValue(props) + "," + bdn;
return dn;
}
return null;
package org.argeo.cms.e4.users.providers;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.cms.auth.UserAdminUtils;
import org.osgi.service.useradmin.User;
@Override
public String getText(User user) {
- return UserAdminUtils.getProperty(user, LdapAttrs.cn.name());
+ return UserAdminUtils.getProperty(user, LdapAttr.cn.name());
}
@Override
public String getToolTipText(Object element) {
- return UserAdminUtils.getProperty((User) element, LdapAttrs.DN);
+ return UserAdminUtils.getProperty((User) element, LdapAttr.DN);
}
}
package org.argeo.cms.e4.users.providers;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.cms.auth.UserAdminUtils;
import org.osgi.service.useradmin.User;
@Override
public String getText(User user) {
- return UserAdminUtils.getProperty(user, LdapAttrs.mail.name());
+ return UserAdminUtils.getProperty(user, LdapAttr.mail.name());
}
}
package org.argeo.cms.e4.users.providers;
import org.argeo.api.cms.CmsContext;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.auth.UserAdminUtils;
import org.argeo.cms.e4.users.SecurityAdminImages;
if (dn.endsWith(CmsConstants.SYSTEM_ROLES_BASEDN))
return SecurityAdminImages.ICON_ROLE;
else if (user.getType() == Role.GROUP) {
- String businessCategory = UserAdminUtils.getProperty(user, LdapAttrs.businessCategory);
+ String businessCategory = UserAdminUtils.getProperty(user, LdapAttr.businessCategory);
if (businessCategory != null && businessCategory.equals(CmsContext.WORKGROUP))
return SecurityAdminImages.ICON_WORKGROUP;
return SecurityAdminImages.ICON_GROUP;
import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty;
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
import org.argeo.api.cms.CmsConstants;
import org.argeo.cms.auth.UserAdminUtils;
import org.eclipse.jface.viewers.Viewer;
private String searchString;
private boolean showSystemRole = true;
- private final String[] knownProps = { LdapAttrs.DN, LdapAttrs.cn.name(), LdapAttrs.givenName.name(),
- LdapAttrs.sn.name(), LdapAttrs.uid.name(), LdapAttrs.description.name(), LdapAttrs.mail.name() };
+ private final String[] knownProps = { LdapAttr.DN, LdapAttr.cn.name(), LdapAttr.givenName.name(),
+ LdapAttr.sn.name(), LdapAttr.uid.name(), LdapAttr.description.name(), LdapAttr.mail.name() };
public void setSearchText(String s) {
// ensure that the value can be used for matching
import java.util.ArrayList;
import java.util.List;
-import org.argeo.api.acr.ldap.LdapAttrs;
-import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttr;
+import org.argeo.api.acr.ldap.LdapObj;
import org.argeo.api.cms.CmsConstants;
import org.argeo.eclipse.ui.ColumnDefinition;
import org.argeo.eclipse.ui.EclipseUiException;
private class MyUserTableViewer extends LdifUsersTable {
private static final long serialVersionUID = 8467999509931900367L;
- private final String[] knownProps = { LdapAttrs.uid.name(),
- LdapAttrs.cn.name(), LdapAttrs.DN };
+ private final String[] knownProps = { LdapAttr.uid.name(),
+ LdapAttr.cn.name(), LdapAttr.DN };
private Button showSystemRoleBtn;
private Button showUserBtn;
filterBuilder.append("*)");
}
- String typeStr = "(" + LdapAttrs.objectClass.name() + "="
- + LdapObjs.groupOfNames.name() + ")";
+ String typeStr = "(" + LdapAttr.objectClass.name() + "="
+ + LdapObj.groupOfNames.name() + ")";
if ((showUserBtn.getSelection()))
- typeStr = "(|(" + LdapAttrs.objectClass.name() + "="
- + LdapObjs.inetOrgPerson.name() + ")" + typeStr
+ typeStr = "(|(" + LdapAttr.objectClass.name() + "="
+ + LdapObj.inetOrgPerson.name() + ")" + typeStr
+ ")";
if (!showSystemRoleBtn.getSelection())
- typeStr = "(& " + typeStr + "(!(" + LdapAttrs.DN + "=*"
+ typeStr = "(& " + typeStr + "(!(" + LdapAttr.DN + "=*"
+ CmsConstants.SYSTEM_ROLES_BASEDN + ")))";
if (filterBuilder.length() > 1) {