Merge pull request #3391 from thelounge/xpaw/fix-3381

Move back to ldapjs dependency
This commit is contained in:
Pavel Djundik 2019-09-16 11:18:03 +03:00 committed by GitHub
commit c4236e0e12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 321 additions and 530 deletions

View file

@ -53,6 +53,7 @@
"got": "9.6.0",
"irc-framework": "4.4.0",
"is-utf8": "0.2.1",
"ldapjs": "2.0.0-pre.2",
"linkify-it": "2.2.0",
"lodash": "4.17.15",
"mime-types": "2.1.24",
@ -61,7 +62,6 @@
"read-chunk": "3.2.0",
"semver": "6.3.0",
"socket.io": "2.2.0",
"thelounge-ldapjs-non-maintained-fork": "1.0.4",
"tlds": "1.203.1",
"ua-parser-js": "0.7.20",
"uuid": "3.3.3",

View file

@ -2,11 +2,7 @@
const log = require("../../log");
const Helper = require("../../helper");
// Forked ldapjs for 2 reasons:
// 1. Removed bunyan https://github.com/joyent/node-ldapjs/pull/399
// 2. Remove dtrace-provider dependency
const ldap = require("thelounge-ldapjs-non-maintained-fork");
const ldap = require("ldapjs");
function ldapAuthCommon(user, bindDN, password, callback) {
const config = Helper.config;

View file

@ -3,7 +3,7 @@
const log = require("../../../src/log");
const ldapAuth = require("../../../src/plugins/auth/ldap");
const Helper = require("../../../src/helper");
const ldap = require("thelounge-ldapjs-non-maintained-fork");
const ldap = require("ldapjs");
const expect = require("chai").expect;
const stub = require("sinon").stub;
const TestUtil = require("../../util");

841
yarn.lock

File diff suppressed because it is too large Load diff