package org.argeo.app.core;
+import static org.argeo.cms.acr.ContentUtils.SLASH;
+
import java.util.HashSet;
import java.util.Set;
import javax.naming.ldap.LdapName;
import javax.security.auth.x500.X500Principal;
+import org.argeo.api.acr.Content;
+import org.argeo.api.acr.ContentSession;
import org.argeo.api.cms.CmsConstants;
import org.argeo.api.cms.CmsSession;
import org.argeo.app.api.EntityType;
import org.argeo.app.api.SuiteRole;
+import org.argeo.cms.CmsUserManager;
+import org.argeo.cms.acr.CmsContentRepository;
import org.argeo.jackrabbit.security.JackrabbitSecurityUtils;
import org.argeo.jcr.JcrException;
import org.argeo.jcr.JcrUtils;
+import org.argeo.osgi.useradmin.UserDirectory;
import org.argeo.util.naming.LdapAttrs;
+import org.osgi.service.useradmin.Role;
/** Utilities around the Argeo Suite APIs. */
public class SuiteUtils {
+ public static Content roleToContent(CmsUserManager userManager, ContentSession contentSession, Role role) {
+ UserDirectory userDirectory = userManager.getDirectory(role);
+ String path = CmsContentRepository.DIRECTORY_BASE + SLASH + userDirectory.getName() + SLASH
+ + userDirectory.getRolePath(role);
+ Content content = contentSession.get(path);
+ return content;
+ }
+ @Deprecated
public static String getUserNodePath(LdapName userDn) {
String uid = userDn.getRdn(userDn.size() - 1).getValue().toString();
return EntityType.user.basePath() + '/' + uid;
}
}
+ @Deprecated
public static Node getCmsSessionNode(Session session, CmsSession cmsSession) {
try {
return session.getNode(getUserNodePath(cmsSession.getUserDn()) + '/' + cmsSession.getUuid().toString());
}
}
+ @Deprecated
public static Node getOrCreateCmsSessionNode(Session adminSession, CmsSession cmsSession) {
try {
LdapName userDn = cmsSession.getUserDn();
import org.argeo.api.acr.Content;
import org.argeo.api.acr.ContentRepository;
+import org.argeo.api.acr.ContentSession;
import org.argeo.api.cms.CmsTheme;
import org.argeo.api.cms.CmsView;
import org.argeo.app.ui.SuiteEvent;
import org.argeo.cms.ui.CmsUiProvider;
import org.argeo.cms.ux.widgets.HierarchicalPart;
import org.argeo.cms.ux.widgets.TabularPart;
+import org.argeo.osgi.useradmin.FunctionalGroup;
import org.argeo.osgi.useradmin.HierarchyUnit;
+import org.argeo.osgi.useradmin.Organization;
+import org.argeo.osgi.useradmin.Person;
import org.argeo.osgi.useradmin.UserDirectory;
import org.argeo.util.LangUtils;
+import org.argeo.util.naming.LdapAttrs;
+import org.argeo.util.naming.LdapObjs;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.swt.widgets.TreeItem;
+import org.osgi.service.useradmin.Group;
import org.osgi.service.useradmin.Role;
import org.osgi.service.useradmin.User;
CmsView cmsView = CmsSwtUtils.getCmsView(parent);
parent.setLayout(new GridLayout());
+ ContentSession contentSession = contentRepository.get();
+
SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
CmsSwtUtils.fill(sashForm);
item.setData(directory);
item.setText(directory.getName());
- item.setItemCount(LangUtils.size(directory.getRootHierarchyUnits()));
+ item.setItemCount(LangUtils.size(directory.getRootHierarchyUnits(true)));
}
@Override
int index = getTree().indexOf(item);
Iterable<HierarchyUnit> children;
if (parentItem.getData() instanceof UserDirectory)
- children = ((UserDirectory) parentItem.getData()).getRootHierarchyUnits();
+ children = ((UserDirectory) parentItem.getData()).getRootHierarchyUnits(true);
else
- children = ((HierarchyUnit) parentItem.getData()).getDirectHierachyUnits();
+ children = ((HierarchyUnit) parentItem.getData()).getFunctionalHierachyUnits();
HierarchyUnit child = LangUtils.getAt(children, index);
item.setData(child);
item.setText(child.getHierarchyUnitName());
- item.setItemCount(LangUtils.size(child.getDirectHierachyUnits()));
+ item.setItemCount(LangUtils.size(child.getFunctionalHierachyUnits()));
}
@Override
};
TabularPart usersView = new SwtTabularPart(sashForm, SWT.NONE) {
- List<? extends Role> roles;
+ List<Role> roles = new ArrayList<>();
@Override
protected void refreshItem(TableItem item) {
User role = (User) roles.get(index);
item.setData(role);
item.setText(role.getName());
+ Image icon;
+ if (role instanceof Organization) {
+ icon = SuiteIcon.organisation.getSmallIcon(theme);
+ } else if (role instanceof FunctionalGroup) {
+ icon = SuiteIcon.group.getSmallIcon(theme);
+ } else if (role instanceof Person) {
+ icon = SuiteIcon.person.getSmallIcon(theme);
+ } else {
+ icon = null;
+ }
+ item.setImage(icon);
}
@Override
protected int getItemCount() {
+ roles.clear();
HierarchyUnit hu = (HierarchyUnit) getInput();
if (hu == null)
return 0;
- roles = hu.getHierarchyUnitRoles(null, false);
+ for (HierarchyUnit directChild : hu.getDirectHierachyUnits()) {
+ if (!directChild.isFunctional()) {
+ roles.addAll(directChild.getHierarchyUnitRoles(null, false));
+ }
+ }
+ // roles = hu.getHierarchyUnitRoles(null, false);
return roles.size();
}
// private String getUserProperty(Object element, String key) {
// Object value = ((User) element).getProperties().get(key);
// return value != null ? value.toString() : null;
+// }
+
+// private boolean isOrganisation(Role role) {
+// String[] objectClasses = role.getProperties().get(LdapAttrs.objectClasses.name()).toString().split("\\n");
+// for (String objectClass : objectClasses) {
+// if (LdapObjs.organization.name().equalsIgnoreCase(objectClass))
+// return true;
+// }
+// return false;
// }
public void setCmsUserManager(CmsUserManager cmsUserManager) {