X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.suite.core%2Fsrc%2Forg%2Fargeo%2Fsuite%2FSuiteUtils.java;h=e6d4960ccce1b76afc52f34131b54c3855762064;hb=41e9998f7f1c87c747c57f60c6bec65fa20757a6;hp=e63b5152c0b00430aad95bd83d5b12e2d392b7b5;hpb=25acaf721ed29e8cbe1701578a5b225d77c928de;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java b/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java
index e63b515..e6d4960 100644
--- a/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java
@@ -1,5 +1,8 @@
 package org.argeo.suite;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -8,13 +11,13 @@ import javax.jcr.security.Privilege;
 import javax.naming.ldap.LdapName;
 import javax.security.auth.x500.X500Principal;
 
-import org.argeo.api.NodeConstants;
-import org.argeo.cms.auth.CmsSession;
+import org.argeo.api.cms.CmsSession;
+import org.argeo.api.cms.CmsConstants;
 import org.argeo.entity.EntityType;
 import org.argeo.jackrabbit.security.JackrabbitSecurityUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.naming.LdapAttrs;
+import org.argeo.util.naming.LdapAttrs;
 
 /** Utilities around the Argeo Suite APIs. */
 public class SuiteUtils {
@@ -40,7 +43,7 @@ public class SuiteUtils {
 						Privilege.JCR_READ);
 				JcrUtils.addPrivilege(adminSession, userNode.getPath(), new X500Principal(userDn.toString()).getName(),
 						Privilege.JCR_READ);
-				JcrUtils.addPrivilege(adminSession, userNode.getPath(), NodeConstants.ROLE_USER_ADMIN,
+				JcrUtils.addPrivilege(adminSession, userNode.getPath(), CmsConstants.ROLE_USER_ADMIN,
 						Privilege.JCR_ALL);
 			} else {
 				userNode = usersBase.getNode(uid);
@@ -96,4 +99,24 @@ public class SuiteUtils {
 
 	}
 
+	public static Set<String> extractRoles(String[] semiColArr) {
+		Set<String> res = new HashSet<>();
+		// TODO factorize and make it more robust
+		final String rolesPrefix = "roles:=\"";
+		// first one is layer id
+		for (int i = 1; i < semiColArr.length; i++) {
+			if (semiColArr[i].startsWith(rolesPrefix)) {
+				String rolesStr = semiColArr[i].substring(rolesPrefix.length());
+				// remove last "
+				rolesStr = rolesStr.substring(0, rolesStr.lastIndexOf('\"'));
+				// TODO support AND (&) as well
+				String[] roles = rolesStr.split("\\|");// OR (|)
+				for (String role : roles) {
+					res.add(role.trim());
+				}
+			}
+		}
+		return res;
+	}
+
 }