From 63456b5c0cc043669bfb8cc388fdfd4b97d8b6c0 Mon Sep 17 00:00:00 2001
From: Quentin CHEVALIER <quentin.chevalier@polytechnique.edu>
Date: Wed, 28 Feb 2018 12:25:36 +0100
Subject: [PATCH] fix ES5 et config

---
 src/ldap/ldap_data.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ldap/ldap_data.js b/src/ldap/ldap_data.js
index 2bd475c..fd92921 100644
--- a/src/ldap/ldap_data.js
+++ b/src/ldap/ldap_data.js
@@ -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.
  * @author hawkspar
 */
-import {ldapescape} from 'ldap-escape';
-import ldap from 'ldapjs';
-import fs from 'fs';
+var ldap  = require('ldapjs');
+var fs = require('fs');
+var ldapEscape = require('ldap-escape');
 
 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});
 
@@ -21,7 +21,7 @@ function listGroups(uid) {
     return new Promise(function(resolve, reject) {
         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) {
                 reject(err);
             } else {
@@ -41,7 +41,7 @@ function listMembers(gid) {
     return new Promise(function(resolve, reject) {
         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) {
                 reject(err);
             } else {
-- 
GitLab