diff --git a/lib/filters/and_filter.js b/lib/filters/and_filter.js index d87e4cd..a56016b 100644 --- a/lib/filters/and_filter.js +++ b/lib/filters/and_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/lib/filters/approx_filter.js b/lib/filters/approx_filter.js index 3b906aa..d44b240 100644 --- a/lib/filters/approx_filter.js +++ b/lib/filters/approx_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/lib/filters/equality_filter.js b/lib/filters/equality_filter.js index e3a9b1f..8135198 100644 --- a/lib/filters/equality_filter.js +++ b/lib/filters/equality_filter.js @@ -4,7 +4,7 @@ const assert = require('assert-plus') const util = require('util') const ASN1 = require('@ldapjs/asn1').Ber -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') @@ -20,7 +20,7 @@ module.exports = EqualityFilter EqualityFilter.prototype.matches = function (target, strictAttrCase) { assert.object(target, 'target') - const tv = parents.getAttrValue(target, this.attribute, strictAttrCase) + const tv = parents.getAttrValue({ sourceObject: target, attributeName: this.attribute, strictCase: strictAttrCase }) let value = this.value if (this.attribute.toLowerCase() === 'objectclass') { @@ -29,13 +29,19 @@ EqualityFilter.prototype.matches = function (target, strictAttrCase) { * implementation behaves in this manner. */ value = value.toLowerCase() - return parents.testValues(function (v) { - return value === v.toLowerCase() - }, tv) + return parents.testValues({ + rule: function (v) { + return value === v.toLowerCase() + }, + value: tv + }) } else { - return parents.testValues(function (v) { - return value === v - }, tv) + return parents.testValues({ + rule: function (v) { + return value === v + }, + value: tv + }) } } diff --git a/lib/filters/ext_filter.js b/lib/filters/ext_filter.js index 5ce3bd2..f8463bc 100644 --- a/lib/filters/ext_filter.js +++ b/lib/filters/ext_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/lib/filters/ge_filter.js b/lib/filters/ge_filter.js index 3f5e485..afb9fbb 100644 --- a/lib/filters/ge_filter.js +++ b/lib/filters/ge_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/lib/filters/index.js b/lib/filters/index.js index 7cbe9eb..d819e5c 100644 --- a/lib/filters/index.js +++ b/lib/filters/index.js @@ -4,7 +4,7 @@ const assert = require('assert') const asn1 = require('@ldapjs/asn1') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Protocol = require('@ldapjs/protocol') diff --git a/lib/filters/le_filter.js b/lib/filters/le_filter.js index 3d9f2c2..a383210 100644 --- a/lib/filters/le_filter.js +++ b/lib/filters/le_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/lib/filters/not_filter.js b/lib/filters/not_filter.js index 7815b88..d1e9f86 100644 --- a/lib/filters/not_filter.js +++ b/lib/filters/not_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/lib/filters/or_filter.js b/lib/filters/or_filter.js index 09ed797..085e514 100644 --- a/lib/filters/or_filter.js +++ b/lib/filters/or_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/lib/filters/presence_filter.js b/lib/filters/presence_filter.js index 81ced23..a99638d 100644 --- a/lib/filters/presence_filter.js +++ b/lib/filters/presence_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/lib/filters/substr_filter.js b/lib/filters/substr_filter.js index ad8ca6c..8241f49 100644 --- a/lib/filters/substr_filter.js +++ b/lib/filters/substr_filter.js @@ -3,7 +3,7 @@ const assert = require('assert') const util = require('util') -const parents = require('ldap-filter') +const parents = require('@ldapjs/filter') const Filter = require('./filter') diff --git a/package.json b/package.json index edcdec7..741a5e6 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,11 @@ "dependencies": { "@ldapjs/asn1": "^1.0.0", "@ldapjs/controls": "^1.0.0", + "@ldapjs/filter": "^1.0.0-rc.1", "@ldapjs/protocol": "^1.0.0", "abstract-logging": "^2.0.0", "assert-plus": "^1.0.0", "backoff": "^2.5.0", - "ldap-filter": "^0.3.3", "once": "^1.4.0", "vasync": "^2.2.0", "verror": "^1.8.1"