Skip to content
Snippets Groups Projects
Commit 63456b5c authored by Quentin CHEVALIER's avatar Quentin CHEVALIER
Browse files

fix ES5 et config

parent aa37fa10
No related branches found
No related tags found
No related merge requests found
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
* @file Ce fichier gère les requêtes LDAP de type données ; liste des groupe d'un individu, liste des membres d'un groupe... A ne pas confondre avec ldap_auth qui lui gère l'authentification. * @file Ce fichier gère les requêtes LDAP de type données ; liste des groupe d'un individu, liste des membres d'un groupe... A ne pas confondre avec ldap_auth qui lui gère l'authentification.
* @author hawkspar * @author hawkspar
*/ */
import {ldapescape} from 'ldap-escape'; var ldap = require('ldapjs');
import ldap from 'ldapjs'; var fs = require('fs');
import fs from 'fs'; var ldapEscape = require('ldap-escape');
var ensureLoggedin = require('connect-ensure-login').ensureLoggedIn; var ensureLoggedin = require('connect-ensure-login').ensureLoggedIn;
let config = JSON.parse(fs.readFileSync('config.json', 'utf8')); let config = JSON.parse(fs.readFileSync('../../config.json', 'utf8'));
var client = ldap.createClient({ url: config.ldap.server, timeout: 10000, idleTimeout: 10000}); var client = ldap.createClient({ url: config.ldap.server, timeout: 10000, idleTimeout: 10000});
...@@ -21,7 +21,7 @@ function listGroups(uid) { ...@@ -21,7 +21,7 @@ function listGroups(uid) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var groupsList=[]; var groupsList=[];
client.search(config.ldap_data_gl.searchBase, {scope: "sub", attributes: "uid", filter: ldapescape.filter(config.ldap_data_gl.searchFilter, {id: uid})}, function(err, res) { client.search(config.ldap_data_gl.searchBase, {scope: "sub", attributes: "uid", filter: ldapEscape.filter(config.ldap_data_gl.searchFilter, {id: uid})}, function(err, res) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
...@@ -41,7 +41,7 @@ function listMembers(gid) { ...@@ -41,7 +41,7 @@ function listMembers(gid) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
var membersList=[]; var membersList=[];
client.search(config.ldap_data_ml.searchBase, {scope: "sub", attributes: "uid", filter: ldapescape.filter(config.ldap_data_ml.searchFilter, {id: gid})}, function(err, res) { client.search(config.ldap_data_ml.searchBase, {scope: "sub", attributes: "uid", filter: ldapEscape.filter(config.ldap_data_ml.searchFilter, {id: gid})}, function(err, res) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment