.github/workflows/integration.yml

@@ -7,7 +7,6 @@ on:
   pull_request:
     branches:
       - master
-      - next
 
 jobs:
   baseline:

.github/workflows/main.yml

@@ -1,10 +1,12 @@
 name: 'Lint And Test'
 
 on:
+  push:
+    branches:
+      - master
   pull_request:
     branches:
       - master
-      - next
 
 jobs:
   lint:

README.md

@@ -1,7 +1,7 @@
 # LDAPjs
 
-[![Build Status](https://github.com/ldapjs/node-ldapjs/workflows/.github/workflows/main.yml/badge.svg)]
-[![Coverage Status](https://coveralls.io/repos/github/ldapjs/node-ldapjs/badge.svg)]
+[![Build Status](https://github.com/ldapjs/node-ldapjs/workflows/Lint%20And%20Test/badge.svg)](https://github.com/ldapjs/node-ldapjs/actions)
+[![Coverage Status](https://coveralls.io/repos/github/ldapjs/node-ldapjs/badge.svg)](https://coveralls.io/github/ldapjs/node-ldapjs/)
 
 LDAPjs makes the LDAP protocol a first class citizen in Node.js.
 

docs/client.md

@@ -131,7 +131,7 @@ Example:
     });
 
 # del
-`del(dn, controls, callbak)`
+`del(dn, controls, callback)`
 
 
 Deletes an entry from the LDAP server.

examples/inmemory.js

@@ -1,20 +1,20 @@
-var ldap = require('../lib/index')
+const ldap = require('../lib/index')
 
 /// --- Shared handlers
 
 function authorize (req, res, next) {
   /* Any user may search after bind, only cn=root has full power */
-  var isSearch = (req instanceof ldap.SearchRequest)
+  const isSearch = (req instanceof ldap.SearchRequest)
   if (!req.connection.ldap.bindDN.equals('cn=root') && !isSearch) { return next(new ldap.InsufficientAccessRightsError()) }
 
   return next()
 }
 
 /// --- Globals
 
-var SUFFIX = 'o=smartdc'
-var db = {}
-var server = ldap.createServer()
+const SUFFIX = 'o=smartdc'
+const db = {}
+const server = ldap.createServer()
 
 server.bind('cn=root', function (req, res, next) {
   if (req.dn.toString() !== 'cn=root' || req.credentials !== 'secret') { return next(new ldap.InvalidCredentialsError()) }
@@ -24,7 +24,7 @@ server.bind('cn=root', function (req, res, next) {
 })
 
 server.add(SUFFIX, authorize, function (req, res, next) {
-  var dn = req.dn.toString()
+  const dn = req.dn.toString()
 
   if (db[dn]) { return next(new ldap.EntryAlreadyExistsError(dn)) }
 
@@ -34,7 +34,7 @@ server.add(SUFFIX, authorize, function (req, res, next) {
 })
 
 server.bind(SUFFIX, function (req, res, next) {
-  var dn = req.dn.toString()
+  const dn = req.dn.toString()
   if (!db[dn]) { return next(new ldap.NoSuchObjectError(dn)) }
 
   if (!db[dn].userpassword) { return next(new ldap.NoSuchAttributeError('userPassword')) }
@@ -46,14 +46,14 @@ server.bind(SUFFIX, function (req, res, next) {
 })
 
 server.compare(SUFFIX, authorize, function (req, res, next) {
-  var dn = req.dn.toString()
+  const dn = req.dn.toString()
   if (!db[dn]) { return next(new ldap.NoSuchObjectError(dn)) }
 
   if (!db[dn][req.attribute]) { return next(new ldap.NoSuchAttributeError(req.attribute)) }
 
-  var matches = false
-  var vals = db[dn][req.attribute]
-  for (var i = 0; i < vals.length; i++) {
+  let matches = false
+  const vals = db[dn][req.attribute]
+  for (let i = 0; i < vals.length; i++) {
     if (vals[i] === req.value) {
       matches = true
       break
@@ -65,7 +65,7 @@ server.compare(SUFFIX, authorize, function (req, res, next) {
 })
 
 server.del(SUFFIX, authorize, function (req, res, next) {
-  var dn = req.dn.toString()
+  const dn = req.dn.toString()
   if (!db[dn]) { return next(new ldap.NoSuchObjectError(dn)) }
 
   delete db[dn]
@@ -75,14 +75,14 @@ server.del(SUFFIX, authorize, function (req, res, next) {
 })
 
 server.modify(SUFFIX, authorize, function (req, res, next) {
-  var dn = req.dn.toString()
+  const dn = req.dn.toString()
   if (!req.changes.length) { return next(new ldap.ProtocolError('changes required')) }
   if (!db[dn]) { return next(new ldap.NoSuchObjectError(dn)) }
 
-  var entry = db[dn]
+  const entry = db[dn]
 
   let mod
-  for (var i = 0; i < req.changes.length; i++) {
+  for (let i = 0; i < req.changes.length; i++) {
     mod = req.changes[i].modification
     switch (req.changes[i].operation) {
       case 'replace':
@@ -121,10 +121,10 @@ server.modify(SUFFIX, authorize, function (req, res, next) {
 })
 
 server.search(SUFFIX, authorize, function (req, res, next) {
-  var dn = req.dn.toString()
+  const dn = req.dn.toString()
   if (!db[dn]) { return next(new ldap.NoSuchObjectError(dn)) }
 
-  var scopeCheck
+  let scopeCheck
 
   switch (req.scope) {
     case 'base':
@@ -142,7 +142,7 @@ server.search(SUFFIX, authorize, function (req, res, next) {
       scopeCheck = function (k) {
         if (req.dn.equals(k)) { return true }
 
-        var parent = ldap.parseDN(k).parent()
+        const parent = ldap.parseDN(k).parent()
         return (parent ? parent.equals(req.dn) : false)
       }
       break

lib/assert.js

@@ -1,10 +1,10 @@
 // Copyright 2015 Joyent, Inc.
 
-var assert = require('assert')
-var util = require('util')
+const assert = require('assert')
+const util = require('util')
 
-var isDN = require('./dn').DN.isDN
-var isAttribute = require('./attribute').isAttribute
+const isDN = require('./dn').DN.isDN
+const isAttribute = require('./attribute').isAttribute
 
 /// --- Helpers
 

lib/attribute.js

@@ -1,10 +1,10 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var assert = require('assert')
+const assert = require('assert')
 
-var asn1 = require('asn1')
+const asn1 = require('asn1')
 
-var Protocol = require('./protocol')
+const Protocol = require('./protocol')
 
 /// --- API
 
@@ -42,13 +42,13 @@ Object.defineProperties(Attribute.prototype, {
   },
   vals: {
     get: function getVals () {
-      var eType = _bufferEncoding(this.type)
+      const eType = _bufferEncoding(this.type)
       return this._vals.map(function (v) {
         return v.toString(eType)
       })
     },
     set: function setVals (vals) {
-      var self = this
+      const self = this
       this._vals = []
       if (Array.isArray(vals)) {
         vals.forEach(function (v) {
@@ -81,7 +81,7 @@ Attribute.compare = function compare (a, b) {
   if (a.vals.length < b.vals.length) return -1
   if (a.vals.length > b.vals.length) return 1
 
-  for (var i = 0; i < a.vals.length; i++) {
+  for (let i = 0; i < a.vals.length; i++) {
     if (a.vals[i] < b.vals[i]) return -1
     if (a.vals[i] > b.vals[i]) return 1
   }
@@ -98,7 +98,7 @@ Attribute.prototype.parse = function parse (ber) {
 
   if (ber.peek() === Protocol.LBER_SET) {
     if (ber.readSequence(Protocol.LBER_SET)) {
-      var end = ber.offset + ber.length
+      const end = ber.offset + ber.length
       while (ber.offset < end) { this._vals.push(ber.readString(asn1.Ber.OctetString, true)) }
     }
   }
@@ -116,7 +116,7 @@ Attribute.prototype.toBer = function toBer (ber) {
     this._vals.forEach(function (b) {
       ber.writeByte(asn1.Ber.OctetString)
       ber.writeLength(b.length)
-      for (var i = 0; i < b.length; i++) { ber.writeByte(b[i]) }
+      for (let i = 0; i < b.length; i++) { ber.writeByte(b[i]) }
     })
   } else {
     ber.writeStringArray([])

lib/change.js

@@ -1,8 +1,8 @@
 // Copyright 2011 Mark Cavage, Inc.  All rights reserved.
 
-var assert = require('assert-plus')
+const assert = require('assert-plus')
 
-var Attribute = require('./attribute')
+const Attribute = require('./attribute')
 // var Protocol = require('./protocol')
 
 /// --- API
@@ -68,15 +68,15 @@ Object.defineProperties(Change.prototype, {
         return
       }
 
-      var keys = Object.keys(val)
+      const keys = Object.keys(val)
       if (keys.length > 1) {
         throw new Error('Only one attribute per Change allowed')
       } else if (keys.length === 0) {
         return
       }
 
-      var k = keys[0]
-      var _attr = new Attribute({ type: k })
+      const k = keys[0]
+      const _attr = new Attribute({ type: k })
       if (Array.isArray(val[k])) {
         val[k].forEach(function (v) {
           _attr.addValue(v.toString())
@@ -136,9 +136,9 @@ Change.apply = function apply (change, obj, scalar) {
   assert.ok(Array.isArray(change.modification.vals))
   assert.object(obj)
 
-  var type = change.modification.type
-  var vals = change.modification.vals
-  var data = obj[type]
+  const type = change.modification.type
+  const vals = change.modification.vals
+  let data = obj[type]
   if (data !== undefined) {
     if (!Array.isArray(data)) {
       data = [data]
@@ -156,13 +156,14 @@ Change.apply = function apply (change, obj, scalar) {
         data = vals
       }
       break
-    case 'add':
+    case 'add': {
     // add only new unique entries
-      var newValues = vals.filter(function (entry) {
+      const newValues = vals.filter(function (entry) {
         return (data.indexOf(entry) === -1)
       })
       data = data.concat(newValues)
       break
+    }
     case 'delete':
       data = data.filter(function (entry) {
         return (vals.indexOf(entry) === -1)