Fixed bug which only allowed 1 instance of ldap node at a time.

Author: sublime93

package-lock.json

@@ -1,10 +1,11 @@
-const ldap = require('./ldap');
+const ldapClient = require('./ldap');
 module.exports = function (RED) {
     'use strict';
 
     function ldapNode (n) {
         RED.nodes.createNode(this, n);
         let node = this;
+        let that = this;
 
         this.options = {
             host: n.host || 'ldap://localhost',
@@ -15,14 +16,22 @@ module.exports = function (RED) {
 
         this.connect = function(config, node) {
             node.status({ fill:"blue",shape:"dot",text: 'connecting...' });
+
+            that.ldapClient = new ldapClient();
+            that.ldapClient.random = Math.random();
+
             let url = `${config.options.host}:${config.options.port}`;
-            ldap.connect(url, config.credentials.username, config.credentials.password).then( (res, err) => {
+            that.ldapClient.connect(url, config.credentials.username, config.credentials.password).then( (res, err) => {
+                if (err) {
+                    node.status({ fill: 'red', shape: 'dot', text: 'Error'});
+                    node.error(err ? err.toString() : 'Unknown error' );
+                }
                 node.status({ fill: 'green', shape: 'dot', text: 'connected' });
             });
         };
 
         this.on('close', function (done) {
-            ldap.disconnect();
+            that.ldapClient.disconnect();
             node.status({ });
             // if (this.tick) { clearTimeout(this.tick); }
             // if (this.check) { clearInterval(this.check); }
@@ -52,15 +61,15 @@ module.exports = function (RED) {
             try {
                 node.status({ fill: 'blue', shape: 'dot', text: 'running update' });
 
-                let update = await ldap.update(node.dn, node.operation, node.attribute, node.value);
+                let update = await this.ldapConfig.ldapClient.update(node.dn, node.operation, node.attribute, node.value);
                 msg.ldapStatus = update;
 
                 node.send(msg);
 
-                node.status({});
+                node.status({ fill: 'green', shape: 'dot', text: 'completed' });
             } catch (err) {
                 node.status({ fill: 'red', shape: 'ring', text: 'failed' });
-                node.error(err ? err : 'Unknown error' );
+                node.error(err ? err.toString() : 'Unknown error' );
             }
         });
     }
@@ -72,4 +81,4 @@ module.exports = function (RED) {
         }
     });
     RED.nodes.registerType('ldap-update in', ldapUpdateNode);
-};
+};

transports/ldap/index.js

@@ -1,9 +1,9 @@
 const ldap = require('ldapjs');
 const uuidParse = require('../tools/uuid-parse');
 
-module.exports = {
-    client: undefined,
-    defaultAttributes: {
+function ldapClient () {
+    this.client = undefined;
+    this.defaultAttributes = {
         user: [
             'dn', 'userPrincipalName', 'sAMAccountName', 'objectSID', 'mail',
             'lockoutTime', 'whenCreated', 'pwdLastSet', 'userAccountControl',
@@ -13,8 +13,8 @@ module.exports = {
         group: [
             'dn', 'cn', 'description'
         ]
-    },
-    baseDn: '',
+    };
+    this.baseDn = '';
     /**
      * @public
      * Connect to LDAP server
@@ -24,7 +24,7 @@ module.exports = {
      * @param {object} options  additional options for ldapjs connection
      * @returns {Promise<*>}
      */
-    connect: async function(url, username, password, options = {}) {
+    this.connect = async function (url, username, password, options = {}) {
         let that = this;
         this.client = ldap.createClient({
             url,
@@ -43,12 +43,12 @@ module.exports = {
                 return resolve(conn);
             });
         });
-    },
-    disconnect: function () {
+    }
+    this.disconnect = function () {
         if (this.client) {
             this.client.unbind();
         }
-    },
+    };
     /**
      * @public
      * Perform an update action on a specific LDAP object
@@ -58,7 +58,7 @@ module.exports = {
      * @param {null|string} value Value of the change
      * @returns {Promise<*>}
      */
-    update: async function (dn, operation, attribute, value = null) {
+    this.update = async function (dn, operation, attribute, value = null) {
         let that = this;
         let changeObj = {
             operation,
@@ -76,14 +76,14 @@ module.exports = {
                 return resolve({ success: true });
             });
         });
-    },
+    };
     /**
      * @public
      * @param {string} dn       base dn for the search
      * @param {object} userOpts additional user options for search query
      * @returns {Promise<array(object)>}
      */
-    search: async function (dn, userOpts) {
+    this.search = async function (dn, userOpts) {
         let opts = {
             // filter: '&(dn=CN=Jordan Vohwinkel,OU=Test,OU=Users,OU=NTech,OU=BOE Companies,DC=Corp,DC=BOETeams,DC=com)',
             filter: 'cn=Jordan Vohwinkel',
@@ -114,18 +114,22 @@ module.exports = {
                 res.on('end', function(result) { return resolve(that.results); });
             })
         });
-    },
+    };
     /**
      * @private
      * Default search entry parser.
      * @param {object} item       Item returned from AD
      * @param {object} raw        Raw return object
      * @param {function} callback Callback when parsing is complete
      */
-    onSearchEntry: function(item, raw, callback) {
+    this.onSearchEntry = function (item, raw, callback) {
         if (raw.hasOwnProperty('objectSid')) item.objectSid = uuidParse.unparse(raw.objectSid);
         if (raw.hasOwnProperty("objectGUID")) entry.objectGUID = uuidParse.unparse(raw.objectGUID);
         if (raw.hasOwnProperty("mS-DS-ConsistencyGuid")) entry['mS-DS-ConsistencyGuid'] = uuidParse.unparse(raw['mS-DS-ConsistencyGuid']);
         callback(item);
-    }
-};
+    };
+
+    return this;
+}
+
+module.exports = ldapClient;