Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-22 23:42:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
barisusakli
2014-10-14 13:29:26 -04:00
parent 62503c16c6 b5481ceed2
commit be287740f9
2 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/src/client/login.js
View File

@@ -33,6 +33,16 @@ define('forum/login', function() {
});
$('#content #username').focus();
// Add "returnTo" data if present
if (app.previousUrl) {
var returnToEl = document.createElement('input');
returnToEl.type = 'hidden';
returnToEl.name = 'returnTo';
returnToEl.value = app.previousUrl.replace(window.location.origin + RELATIVE_PATH, '');
$(returnToEl).appendTo(formEl);
console.log('appended');
}
};
return Login;

79
src/routes/authentication.js
View File

@@ -34,55 +34,60 @@
function login(req, res, next) {
var continueLogin = function() {
passport.authenticate('local', function(err, userData, info) {
if (err) {
req.flash('error', info);
return res.redirect(nconf.get('relative_path') + '/login');
}
if (!userData) {
if (typeof info === 'object') {
info = '[[error:invalid-username-or-password]]';
passport.authenticate('local', function(err, userData, info) {
if (err) {
req.flash('error', info);
return res.redirect(nconf.get('relative_path') + '/login');
}
req.flash('error', info);
return res.redirect(nconf.get('relative_path') + '/login');
}
if (!userData) {
if (typeof info === 'object') {
info = '[[error:invalid-username-or-password]]';
}
// Alter user cookie depending on passed-in option
if (req.body.remember === 'on') {
var duration = 1000*60*60*24*parseInt(meta.config.loginDays || 14, 10);
req.session.cookie.maxAge = duration;
req.session.cookie.expires = new Date(Date.now() + duration);
} else {
req.session.cookie.maxAge = false;
req.session.cookie.expires = false;
}
req.login({
uid: userData.uid
}, function() {
if (userData.uid) {
user.logIP(userData.uid, req.ip);
plugins.fireHook('action:user.loggedIn', userData.uid);
req.flash('error', info);
return res.redirect(nconf.get('relative_path') + '/login');
}
if (!req.session.returnTo) {
res.redirect(nconf.get('relative_path') + '/');
// Alter user cookie depending on passed-in option
if (req.body.remember === 'on') {
var duration = 1000*60*60*24*parseInt(meta.config.loginDays || 14, 10);
req.session.cookie.maxAge = duration;
req.session.cookie.expires = new Date(Date.now() + duration);
} else {
var next = req.session.returnTo;
delete req.session.returnTo;
res.redirect(nconf.get('relative_path') + next);
req.session.cookie.maxAge = false;
req.session.cookie.expires = false;
}
});
})(req, res, next);
};
req.login({
uid: userData.uid
}, function() {
if (userData.uid) {
user.logIP(userData.uid, req.ip);
plugins.fireHook('action:user.loggedIn', userData.uid);
}
if (!req.session.returnTo) {
res.redirect(nconf.get('relative_path') + '/');
} else {
var next = req.session.returnTo;
delete req.session.returnTo;
res.redirect(nconf.get('relative_path') + next);
}
});
})(req, res, next);
};
if(meta.config.allowLocalLogin !== undefined && parseInt(meta.config.allowLocalLogin, 10) === 0) {
return res.status(404).send('');
}
// Handle returnTo data
if (req.body.hasOwnProperty('returnTo') && !req.session.returnTo) {
req.session.returnTo = req.body.returnTo;
}
if (req.body.username && utils.isEmailValid(req.body.username)) {
user.getUsernameByEmail(req.body.username, function(err, username) {
if (err) {