From: Johannes Date: Thu, 17 Nov 2016 11:54:21 +0000 (+0100) Subject: Rename auth exports X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FNodejs%2FSurfer.git;a=commitdiff_plain;h=3d716d9ef715d3bfd70631161d022abda0467b71 Rename auth exports --- diff --git a/app.js b/app.js index 3c76344..eaeed17 100755 --- a/app.js +++ b/app.js @@ -22,9 +22,9 @@ var router = new express.Router(); var multipart = multipart({ maxFieldsSize: 2 * 1024, limit: '512mb', timeout: 3 * 60 * 1000 }); -router.get ('/api/files/*', auth.ldap, files.get); -router.put ('/api/files/*', auth.ldap, multipart, files.put); -router.delete('/api/files/*', auth.ldap, files.del); +router.get ('/api/files/*', auth.verify, files.get); +router.put ('/api/files/*', auth.verify, multipart, files.put); +router.delete('/api/files/*', auth.verify, files.del); router.get ('/api/healthcheck', function (req, res) { res.status(200).send(); }); // welcome screen in case / does not serve up any file yet diff --git a/src/auth.js b/src/auth.js index 6ddb125..b56f09f 100644 --- a/src/auth.js +++ b/src/auth.js @@ -24,11 +24,11 @@ var LDAP_USERS_BASE_DN = process.env.LDAP_USERS_BASE_DN; if (LDAP_URL && LDAP_USERS_BASE_DN) { console.log('Enable ldap auth'); - exports.ldap = passport.authenticate('ldap'); + exports.verify = passport.authenticate('ldap'); } else { console.log('Use local user file:', LOCAL_AUTH_FILE); - exports.ldap = function (req, res, next) { + exports.verify = function (req, res, next) { var users = safe.JSON.parse(safe.fs.readFileSync(LOCAL_AUTH_FILE)); if (!users) return res.send(401); if (!users[req.query.username]) return res.send(401);