ad-promise - npm Package Compare versions

Comparing version 1.6.4 to 1.6.5

lib/services/internal/service.search.js

@@ -30,2 +30,3 @@
 function search (baseDN, opts, callback) {
+    
     return new Promise((resolve, reject) => {
@@ -47,7 +48,6 @@ let searchStarted = new Date();
         opts || (opts = {});
-        baseDN || (baseDN = opts.baseDN) || (baseDN = self.baseDN);
+        baseDN || (baseDN = opts.baseDN) || (baseDN = self.baseDN) || (baseDN = self.opts.baseDNs.default);
         log.trace('search(%s,%j)', baseDN, opts);
 
 
-
         var controls = opts.controls || (opts.controls = []);
@@ -106,3 +106,3 @@ // Add paging results control by default if not already added.
         Promise.all(s.map(r => {return r.result})).then(results => {
-            updateBaseDn(self.opts, "default");
+            updateBaseDn(self, "default");
             if(callback){
@@ -109,0 +109,0 @@ callback(null, results[0]);

lib/services/internal/service.updateBaseDn.js

@@ -12,20 +12,21 @@
  */
-const updateBaseDn = (Options, BaseDnType) => {
-    if(Options.baseDNs){
+const updateBaseDn = (Ad, BaseDnType) => {
+    let options = Ad.opts;
+    if(options.baseDNs){
         switch(BaseDnType){
             case "user":
-                Options.baseDN = Options.baseDNs.user || Options.baseDNs.default || Options.baseDN;
+                Ad.baseDN = options.baseDN = options.baseDNs.user || options.baseDNs.default || options.baseDN;
                 break;
             case "group":
-                Options.baseDN = Options.baseDNs.group || Options.baseDns.default || Options.baseDN;
+                Ad.baseDN = options.baseDN = options.baseDNs.group || options.baseDns.default || options.baseDN;
                 break;
             case "default":
             default:
-                Options.baseDN = Options.baseDNs.default || Options.baseDN;
+                Ad.baseDN = options.baseDN = options.baseDNs.default || options.baseDN;
         }
     }
 
-    return Options;
+    return Ad;
 }
 
 module.exports = updateBaseDn;

lib/services/service.findGroup.js

@@ -46,3 +46,3 @@ const _                                 = require('underscore');
         });
-        updateBaseDn(self.opts, 'group');
+        updateBaseDn(self, 'group');
         search.call(self, localOpts, function onSearch(err, results) {
@@ -49,0 +49,0 @@ // Ignore ECONNRESET ERRORS

lib/services/service.findGroups.js

@@ -50,3 +50,3 @@ const _                                 = require('underscore');
         });
-        updateBaseDn(self.opts, "group");
+        updateBaseDn(self, "group");
         search.call(self, localOpts, function onSearch(err, results) {
@@ -53,0 +53,0 @@ if (err) {

lib/services/service.findUser.js

@@ -53,3 +53,3 @@
         });
-        updateBaseDn(self.opts, "user");
+        updateBaseDn(self, "user");
         search.call(self, localOpts, function onSearch(err, results) {
@@ -56,0 +56,0 @@ if (err) {

lib/services/service.findUsers.js

@@ -59,3 +59,3 @@ const _                                 = require('underscore');
         });
-        updateBaseDn(self.opts, "user");
+        updateBaseDn(self, "user");
         search.call(self, localOpts, function onSearch(err, results) {
@@ -62,0 +62,0 @@ if (err) {

lib/services/service.getGroupMembershipForGroup.js

@@ -30,3 +30,3 @@ const _                                 = require('underscore');
         log.trace('getGroupMembershipForGroup(%j,%s)', opts, groupName);
-        updateBaseDn(self.opts, "group");
+        updateBaseDn(self, "group");
         getGroupDistinguishedName.call(self, opts, groupName, function (err, dn) {
@@ -33,0 +33,0 @@ if (err) {

lib/services/service.getGroupMembershipForUser.js

@@ -29,3 +29,3 @@ const _                     = require('underscore');
         log.trace('getGroupMembershipForUser(%j,%s)', opts, username);
-        updateBaseDn(self.opts, "user");
+        updateBaseDn(self, "user");
         getUserDistinguishedName.call(self, opts, username, function (err, dn) {
@@ -32,0 +32,0 @@ if (err) {

package.json

 {
   "author": "Relief Melone ([e-mail])",
   "name": "ad-promise",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "This is a fork of the gheeres node-activedirectory. It fixes some issues with timeouts with very large AD-Groups as well as returning also promises so you won't have to use callbacks",
@@ -6,0 +6,0 @@ "main": "index.js",

No alert changes

Improved metrics

Total package byte prevSize

2330110

Lines of code

5334

increased by0.02%

No dependency changes