Improve user management

[lgpl/argeo-commons.git] / org.argeo.util / src / org / argeo / util / directory / ldap / DefaultLdapEntry.java

diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java b/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java
index 14a7eb87cc2f5b78dc931ab0e5dd2eb47750550b..c4d20feba922576dc181129ebcd75dae523fbde5 100644 (file)
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java
+++ b/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java
@@ -32,18 +32,18 @@ public class DefaultLdapEntry implements LdapEntry {
 
        private final LdapName dn;
 
-       private Attributes publishedAttributes;
+//     private Attributes publishedAttributes;
 
        // Temporarily expose the fields
        protected AttributeDictionary properties;
        protected AttributeDictionary credentials;
 
-       protected DefaultLdapEntry(AbstractLdapDirectory directory, LdapName dn, Attributes attributes) {
+       protected DefaultLdapEntry(AbstractLdapDirectory directory, LdapName dn) {
                Objects.requireNonNull(directory);
                Objects.requireNonNull(dn);
                this.directory = directory;
                this.dn = dn;
-               this.publishedAttributes = attributes;
+//             this.publishedAttributes = attributes;
 //             properties = new AttributeDictionary(false);
 //             credentials = new AttributeDictionary(true);
        }
@@ -54,10 +54,10 @@ public class DefaultLdapEntry implements LdapEntry {
        }
 
        public synchronized Attributes getAttributes() {
-               // lazy loading
-               if (publishedAttributes == null)
-                       publishedAttributes = getDirectory().getDirectoryDao().doGetAttributes(dn);
-               return isEditing() ? getModifiedAttributes() : publishedAttributes;
+//             // lazy loading
+//             if (publishedAttributes == null)
+//                     publishedAttributes = getDirectory().getDirectoryDao().doGetAttributes(dn);
+               return isEditing() ? getModifiedAttributes() : getDirectory().getDirectoryDao().doGetAttributes(dn);
        }
 
        @Override
@@ -104,7 +104,7 @@ public class DefaultLdapEntry implements LdapEntry {
        }
 
        public synchronized void publishAttributes(Attributes modifiedAttributes) {
-               publishedAttributes = modifiedAttributes;
+//             publishedAttributes = modifiedAttributes;
        }
 
        /*
@@ -376,6 +376,7 @@ public class DefaultLdapEntry implements LdapEntry {
                public Object put(String key, Object value) {
                        try {
                                if (key == null) {
+                                       // FIXME remove this "feature", a key should be specified
                                        // TODO persist to other sources (like PKCS12)
                                        char[] password = DirectoryDigestUtils.bytesToChars(value);
                                        byte[] hashedPassword = sha1hash(password);
@@ -384,6 +385,13 @@ public class DefaultLdapEntry implements LdapEntry {
                                if (key.startsWith("X-")) {
                                        return put(LdapAttrs.authPassword.name(), value);
                                }
+
+                               // start editing
+                               getDirectory().checkEdit();
+                               if (!isEditing())
+                                       startEditing();
+
+                               // object classes special case.
                                if (key.equals(LdapAttrs.objectClasses.name())) {
                                        Attribute attribute = new BasicAttribute(LdapAttrs.objectClass.name());
                                        String[] objectClasses = value.toString().split("\n");
@@ -399,10 +407,6 @@ public class DefaultLdapEntry implements LdapEntry {
                                                return null;
                                }
 
-                               getDirectory().checkEdit();
-                               if (!isEditing())
-                                       startEditing();
-
                                if (!(value instanceof String || value instanceof byte[]))
                                        throw new IllegalArgumentException("Value must be String or byte[]");