X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fosgi%2Fuseradmin%2FAggregatingUserAdmin.java;h=8ebb98e3ad1cc6a1943839b7c6b1d59a834b80f5;hb=feddb4be70a8304dd4a533efee6e14c22691b500;hp=2d438cbf02c3e4cf23973e07f42c21953f8d7198;hpb=f3cb3bed85cb528d919193ce6abb2bb8d05faf03;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingUserAdmin.java index 2d438cbf0..8ebb98e3a 100644 --- a/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingUserAdmin.java +++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingUserAdmin.java @@ -16,6 +16,8 @@ import java.util.TreeSet; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; +import org.argeo.api.cms.directory.CmsUser; +import org.argeo.api.cms.directory.UserDirectory; import org.argeo.cms.runtime.DirectoryConf; import org.osgi.framework.InvalidSyntaxException; import org.osgi.service.useradmin.Authorization; @@ -165,7 +167,7 @@ public class AggregatingUserAdmin implements UserAdmin { private DirectoryUserAdmin userAdminToUse(User user, DirectoryUserAdmin userAdmin) { if (userAdmin.isAuthenticated()) return userAdmin; - if (user instanceof DirectoryUser) { + if (user instanceof CmsUser) { return userAdmin; } else if (user instanceof AuthenticatingUser) { return userAdmin.scope(user).orElse(null);