Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 04:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2618

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2015-02-19 13:24:06 -05:00
parent 97c0b130ca
commit da305210e2
5 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/routes/authentication.js
View File

@@ -4,11 +4,12 @@
var passport = require('passport'),
passportLocal = require('passport-local').Strategy,
nconf = require('nconf'),
Password = require('../password'),
winston = require('winston'),
async = require('async'),
validator = require('validator'),
express = require('express'),
Password = require('../password'),
meta = require('../meta'),
user = require('../user'),
plugins = require('../plugins'),
@@ -131,7 +132,9 @@
req.session.returnTo = req.body.returnTo;
}
if (req.body.username && utils.isEmailValid(req.body.username)) {
var loginWith = meta.config.allowLoginWith || 'username-email';
if (req.body.username && utils.isEmailValid(req.body.username) && loginWith.indexOf('email') !== -1) {
user.getUsernameByEmail(req.body.username, function(err, username) {
if (err) {
return next(err);
@@ -139,8 +142,10 @@
req.body.username = username ? username : req.body.username;
continueLogin(req, res, next);
});
} else {
} else if (loginWith.indexOf('username') !== -1 && !validator.isEmail(req.body.username)) {
continueLogin(req, res, next);
} else {
res.status(500).send('[[error:wrong-login-type-' + loginWith + ']]');
}
}