Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 12:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
psychobunny
2014-03-17 16:09:22 -04:00
parent 6262312747 012480c2e1
commit c6a89b504f
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/middleware/index.js
View File

@@ -144,7 +144,7 @@ function handleErrors(err, req, res, next) {
function catch404(req, res, next) {
var isLanguage = new RegExp('^' + nconf.get('relative_path') + '/language/[\\w]{2,}/.*.json'),
isClientScript = new RegExp('^' + nconf.get('relative_path') + '\\/src\\/forum(\\/admin)?\\/[\\w]+\\.js');
isClientScript = new RegExp('^' + nconf.get('relative_path') + '\\/src\\/forum(\\/admin)?\\/.+\\.js');
res.status(404);

3
src/routes/authentication.js
View File

@@ -138,6 +138,9 @@
app.post('/login', function(req, res, next) {
if (req.body.username && utils.isEmailValid(req.body.username)) {
user.getUsernameByEmail(req.body.username, function(err, username) {
if (err) {
return next(err);
}
req.body.username = username ? username : req.body.username;
login(req, res, next);
});

3
src/user.js
View File

@@ -414,6 +414,9 @@ var bcrypt = require('bcryptjs'),
User.getUsernameByEmail = function(email, callback) {
db.getObjectField('email:uid', email, function(err, uid) {
if (err) {
return callback(err);
}
User.getUserField(uid, 'username', callback);
});
};