Remove dependency to OSGi user admin from API

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / osgi / useradmin / LdifAuthorization.java

diff --git a/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifAuthorization.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifAuthorization.java
index 3bedeab059d5d93fd2ecccc25f8f5877ee1da5b1..59e5df93110b3327ab1b413fb8bc8cd51429b6d8 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifAuthorization.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifAuthorization.java
@@ -5,18 +5,17 @@ import java.util.Collections;
 import java.util.Dictionary;
 import java.util.List;
 
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
 import org.osgi.service.useradmin.Authorization;
-import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
 
 /** Basic authorization. */
-class LdifAuthorization implements Authorization {
+class LdifAuthorization implements CmsOsgiAuthorization {
        private final String name;
        private final String displayName;
        private final List<String> allRoles;
 
-       public LdifAuthorization(User user, List<Role> allRoles) {
+       public LdifAuthorization(User user, List<CmsOsgiRole> allRoles) {
                if (user == null) {
                        this.name = null;
                        this.displayName = "anonymous";
@@ -71,11 +70,11 @@ class LdifAuthorization implements Authorization {
 
        final static String extractDisplayName(User user) {
                Dictionary<String, Object> props = user.getProperties();
-               Object displayName = props.get(LdapAttrs.displayName.name());
+               Object displayName = props.get(LdapAttr.displayName.name());
                if (displayName == null)
-                       displayName = props.get(LdapAttrs.cn.name());
+                       displayName = props.get(LdapAttr.cn.name());
                if (displayName == null)
-                       displayName = props.get(LdapAttrs.uid.name());
+                       displayName = props.get(LdapAttr.uid.name());
                if (displayName == null)
                        displayName = user.getName();
                if (displayName == null)