From 435e14669b818af449e5cf78789796f6701866a1 Mon Sep 17 00:00:00 2001
From: Elie Michel <elie.michel@ens.fr>
Date: Fri, 1 Sep 2017 11:29:52 +0200
Subject: [PATCH] Change string formatting style

---
 src/plugins/auth/ldap.js  | 16 ++++++++--------
 test/plugins/auth/ldap.js |  7 ++-----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/plugins/auth/ldap.js b/src/plugins/auth/ldap.js
index 2e98c1c9..059d23ce 100644
--- a/src/plugins/auth/ldap.js
+++ b/src/plugins/auth/ldap.js
@@ -12,7 +12,7 @@ function ldapAuthCommon(user, bindDN, password, callback) {
 	});
 
 	ldapclient.on("error", function(err) {
-		log.error("Unable to connect to LDAP server", err);
+		log.error(`Unable to connect to LDAP server: ${err}`);
 		callback(!err);
 	});
 
@@ -30,9 +30,9 @@ function simpleLdapAuth(user, password, callback) {
 	const config = Helper.config;
 
 	const userDN = user.replace(/([,\\/#+<>;"= ])/g, "\\$1");
-	const bindDN = config.ldap.primaryKey + "=" + userDN + "," + config.ldap.baseDN;
+	const bindDN = `${config.ldap.primaryKey}=${userDN},${config.ldap.baseDN}`;
 
-	log.info("Auth against LDAP ", config.ldap.url, " with provided bindDN ", bindDN);
+	log.info(`Auth against LDAP ${config.ldap.url} with provided bindDN ${bindDN}`);
 
 	ldapAuthCommon(user, bindDN, password, callback);
 }
@@ -56,12 +56,12 @@ function advancedLdapAuth(user, password, callback) {
 	const base = config.ldap.searchDN.base;
 	const searchOptions = {
 		scope: config.ldap.searchDN.scope,
-		filter: "(&(" + config.ldap.primaryKey + "=" + userDN + ")" + config.ldap.searchDN.filter + ")",
+		filter: `(&(${config.ldap.primaryKey}=${userDN})${config.ldap.searchDN.filter})`,
 		attributes: ["dn"]
 	};
 
 	ldapclient.on("error", function(err) {
-		log.error("Unable to connect to LDAP server", err);
+		log.error(`Unable to connect to LDAP server: ${err}`);
 		callback(!err);
 	});
 
@@ -73,7 +73,7 @@ function advancedLdapAuth(user, password, callback) {
 		} else {
 			ldapclient.search(base, searchOptions, function(err2, res) {
 				if (err2) {
-					log.warning("User not found: ", userDN);
+					log.warning(`User not found: ${userDN}`);
 					ldapclient.unbind();
 					callback(false);
 				} else {
@@ -81,13 +81,13 @@ function advancedLdapAuth(user, password, callback) {
 					res.on("searchEntry", function(entry) {
 						found = true;
 						const bindDN = entry.objectName;
-						log.info("Auth against LDAP ", config.ldap.url, " with found bindDN ", bindDN);
+						log.info(`Auth against LDAP ${config.ldap.url} with found bindDN ${bindDN}`);
 						ldapclient.unbind();
 
 						ldapAuthCommon(user, bindDN, password, callback);
 					});
 					res.on("error", function(err3) {
-						log.error("LDAP error: ", err3);
+						log.error(`LDAP error: ${err3}`);
 						callback(false);
 					});
 					res.on("end", function() {
diff --git a/test/plugins/auth/ldap.js b/test/plugins/auth/ldap.js
index 56e4fef7..2016defe 100644
--- a/test/plugins/auth/ldap.js
+++ b/test/plugins/auth/ldap.js
@@ -75,11 +75,8 @@ function startLdapServer(callback) {
 		res.end();
 	});
 
-	server.listen(serverPort, function() {
-		console.log("LDAP server listening at %s", server.url);
-		callback();
-	});
-
+	server.listen(serverPort, callback);
+	
 	return server;
 }