BugFix

lib/routes/login-passport.js

@@ -33,16 +33,6 @@ module.exports = function(crowi, app) {
     return res.redirect('/login');
   };
 
-  /**
-   * failure handler
-   * @param {*} req
-   * @param {*} res
-   */
-  const loginFailureByDBError = (req, res) => {
-    req.flash('warningMessage', 'DB Error');
-    return res.redirect('/login');
-  };
-
   const loginWithLdap = (req, res, next) => {
     const loginForm = req.body.loginForm;
 
@@ -63,7 +53,7 @@ module.exports = function(crowi, app) {
 
       if (err) {  // DB Error
         console.log('An Error occured: ', err);
-        return loginFailureByDBError(req, res);
+        return next(err);
       }
       if (!user) { return next(); }
       req.logIn(user, (err) => {
@@ -96,7 +86,7 @@ module.exports = function(crowi, app) {
 
       if (err) {  // DB Error
         console.log('An Error occured: ', err);
-        return loginFailureByDBError(req, res);
+        return next(err);
       }
       if (!user) { return next(); }
       req.logIn(user, (err) => {

lib/service/passport.js

@@ -95,10 +95,10 @@ class PassportService {
           bindCredentials: 'secret',
           searchBase: 'ou=...,dc=weseek,dc=co,dc=jp',
           searchFilter: '(uid={{username}})'
-        }
+        },
       },
       (user, done) => {
-        debug("LDAP authentication has successed");
+        debug("LDAP authentication has succeeded");
         return done(null, user);
       }
     ));