Bump manifest format

[perso/Immae/Projets/Nodejs/Surfer.git] / src / auth.js

diff --git a/src/auth.js b/src/auth.js
index e148fb75043529c3049b98d6dd4595d8929ca801..96f304561dc496339edd6801eb622a1d4bc04b3f 100644 (file)
--- a/src/auth.js
+++ b/src/auth.js
@@ -12,8 +12,8 @@ var passport = require('passport'),
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     webdavErrors = require('webdav-server').v2.Errors;
 
-const LDAP_URL = process.env.LDAP_URL;
-const LDAP_USERS_BASE_DN = process.env.LDAP_USERS_BASE_DN;
+const LDAP_URL = process.env.CLOUDRON_LDAP_URL;
+const LDAP_USERS_BASE_DN = process.env.CLOUDRON_LDAP_USERS_BASE_DN;
 const LOCAL_AUTH_FILE = path.resolve(process.env.LOCAL_AUTH_FILE || './.users.json');
 const TOKENSTORE_FILE = path.resolve(process.env.TOKENSTORE_FILE || './.tokens.json');
 const AUTH_METHOD = (LDAP_URL && LDAP_USERS_BASE_DN) ? 'ldap' : 'local';
@@ -79,16 +79,16 @@ passport.deserializeUser(function (id, done) {
 
 function verifyUser(username, password, callback) {
     if (AUTH_METHOD === 'ldap') {
-        var ldapClient = ldapjs.createClient({ url: process.env.LDAP_URL });
+        var ldapClient = ldapjs.createClient({ url: process.env.CLOUDRON_LDAP_URL });
         ldapClient.on('error', function (error) {
             console.error('LDAP error', error);
         });
 
-        ldapClient.bind(process.env.LDAP_BIND_DN, process.env.LDAP_BIND_PASSWORD, function (error) {
+        ldapClient.bind(process.env.CLOUDRON_LDAP_BIND_DN, process.env.CLOUDRON_LDAP_BIND_PASSWORD, function (error) {
             if (error) return callback(error);
 
             var filter = `(|(uid=${username})(mail=${username})(username=${username})(sAMAccountName=${username}))`;
-            ldapClient.search(process.env.LDAP_USERS_BASE_DN, { filter: filter }, function (error, result) {
+            ldapClient.search(process.env.CLOUDRON_LDAP_USERS_BASE_DN, { filter: filter }, function (error, result) {
                 if (error) return callback(error);
 
                 var items = [];
@@ -96,7 +96,7 @@ function verifyUser(username, password, callback) {
                 result.on('searchEntry', function(entry) { items.push(entry.object); });
                 result.on('error', callback);
                 result.on('end', function (result) {
-                    if (result.status !== 0 || items.length === 0) return callback(error);
+                    if (result.status !== 0 || items.length === 0) return callback('Invalid credentials');
 
                     // pick the first found
                     var user = items[0];