From 427acd78356a898eed5c293703f68e3dbf105e6c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 9 Nov 2018 12:16:48 +0100 Subject: [PATCH] Deal with tokens --- .../src/org/argeo/cms/e4/users/UserAdminWrapper.java | 2 ++ org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java index 0fe2fa53e..5eecaac21 100644 --- a/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java +++ b/org.argeo.cms.e4/src/org/argeo/cms/e4/users/UserAdminWrapper.java @@ -100,6 +100,8 @@ public class UserAdminWrapper { continue; if (baseDn.equalsIgnoreCase(NodeConstants.ROLES_BASEDN)) continue; + if (baseDn.equalsIgnoreCase(NodeConstants.TOKENS_BASEDN)) + continue; dns.put(baseDn, uri); } return dns; diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java b/org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java index 5116c7593..65f99c5e1 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/UserAdminUtils.java @@ -141,6 +141,8 @@ public class UserAdminUtils { String dn = user.getName(); if (dn.endsWith(NodeConstants.ROLES_BASEDN)) return "System roles"; + if (dn.endsWith(NodeConstants.TOKENS_BASEDN)) + return "Tokens"; try { // FIXME deal with non-DC LdapName name = new LdapName(dn); -- 2.30.2