Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.

Commit 9de9c70

Browse files
committed
Migrate filter extensions (#809)
* Replace presence filter * Replace equality filter * Remove TODO * Fix integration tests * Replace approximate filter * Replace extensible filter * Replace greater-than-equals filter * Replace less-than-equals filter * Replace remaining filters * Remove debug code * Remove transition code * Remove unnecessry isFilter * Remove unused code * Use LDAP filter string parsing from @ldapjs/filter * Move BER filter parsing to @ldapjs/filter * Fully replace internal filters module with @ldapjs/filter
1 parent 5bab39f commit 9de9c70

32 files changed

+27
-1837
lines changed

lib/client/client.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const SearchPager = require('./search_pager')
2323
const Protocol = require('@ldapjs/protocol')
2424
const dn = require('../dn')
2525
const errors = require('../errors')
26-
const filters = require('../filters')
26+
const filters = require('@ldapjs/filter')
2727
const messages = require('../messages')
2828
const url = require('../url')
2929
const CorkedEmitter = require('../corked_emitter')
@@ -572,7 +572,7 @@ Client.prototype.search = function search (base,
572572
options.filter = filters.parseString(options.filter)
573573
} else if (!options.filter) {
574574
options.filter = new PresenceFilter({ attribute: 'objectclass' })
575-
} else if (!filters.isFilter(options.filter)) {
575+
} else if (Object.prototype.toString.call(options.filter) !== '[object FilterString]') {
576576
throw new TypeError('options.filter (Filter) required')
577577
}
578578
if (typeof (controls) === 'function') {

lib/filters/and_filter.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

lib/filters/approx_filter.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

lib/filters/equality_filter.js

Lines changed: 0 additions & 66 deletions
This file was deleted.

lib/filters/escape.js

Lines changed: 0 additions & 44 deletions
This file was deleted.

lib/filters/ext_filter.js

Lines changed: 0 additions & 59 deletions
This file was deleted.

lib/filters/filter.js

Lines changed: 0 additions & 60 deletions
This file was deleted.

lib/filters/ge_filter.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)