Merge pull request #106 from BalzGuenat/upgrade-ldapjs

upgrade ldapjs to 3.0.4

README.md

@@ -60,7 +60,6 @@ ldapauth-fork can look for valid users groups too. Related options:
 
 Other ldapauth-fork options:
 
-- `includeRaw` - Optional, default false. Set to true to add property `_raw` containing the original buffers to the returned user object. Useful when you need to handle binary attributes
 - `cache` - Optional, default false. If true, then up to 100 credentials at a time will be cached for 5 minutes.
 - `log` - Bunyan logger instance, optional. If given this will result in TRACE-level error logging for component:ldapauth. The logger is also passed forward to ldapjs.
 

lib/ldapauth.d.ts

@@ -91,13 +91,6 @@ declare namespace LdapAuth {
      */
     groupDnProperty?: string;
 
-    /**
-     * Set to true to add property '_raw' containing the original buffers
-     * to the returned user object. Useful when you need to handle binary
-     * attributes
-     */
-    includeRaw?: boolean;
-
     /**
      * If true, then up to 100 credentials at a time will be cached for
      * 5 minutes.

lib/ldapauth.js

@@ -279,10 +279,13 @@ LdapAuth.prototype._search = function (searchBase, options, callback) {
 
       var items = [];
       searchResult.on('searchEntry', function (entry) {
-        items.push(entry.object);
-        if (self.opts.includeRaw === true) {
-          items[items.length - 1]._raw = entry.raw;
-        }
+        var pojo = entry.pojo;
+        var entries = pojo.attributes.map(function (att) {
+          return [att.type, att.values.length === 1 ? att.values[0] : att.values];
+        });
+        var object = Object.fromEntries(entries);
+        object.dn = pojo.objectName;
+        items.push(object);
       });
 
       searchResult.on('error', callback);