Fix regression related to tokens
authorMathieu Baudier <mbaudier@argeo.org>
Sat, 10 Nov 2018 13:14:49 +0000 (14:14 +0100)
committerMathieu Baudier <mbaudier@argeo.org>
Sat, 10 Nov 2018 13:14:49 +0000 (14:14 +0100)
org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java

index 01254b985a64302b84dd22db5e789040143b6461..cc1dadb9bc9e0be189673a578a060fafee37a5e1 100644 (file)
@@ -88,16 +88,16 @@ public class AggregatingUserAdmin implements UserAdmin {
                Authorization rawAuthorization = userAdmin.getAuthorization(user);
                String usernameToUse;
                String displayNameToUse;
-               if (user instanceof Group) {// tokens
+               if (user instanceof Group) {
                        String ownerDn = (String) user.getProperties().get(LdapAttrs.owner.name());
-                       if (ownerDn != null) {
+                       if (ownerDn != null) {// tokens
                                UserAdmin ownerUserAdmin = findUserAdmin(ownerDn);
                                User ownerUser = (User) ownerUserAdmin.getRole(ownerDn);
                                usernameToUse = ownerDn;
                                displayNameToUse = LdifAuthorization.extractDisplayName(ownerUser);
                        } else {
-                               throw new UserDirectoryException(
-                                               "Cannot get authorization for group " + user.getName() + " without owner");
+                               usernameToUse = rawAuthorization.getName();
+                               displayNameToUse = rawAuthorization.toString();
                        }
                } else {// regular users
                        usernameToUse = rawAuthorization.getName();