Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 19:55:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not require a full refresh on login/logout (#6841)

Browse Source 
* no-refresh login as well, plus lots of fixes for missing config on login

* replace config with new set on logout as well

* passing new payload data into new action:app.loggedIn hook, and old action:app.loggedOut hook

* fixed issues with socket.io not properly representing uid on server

* some light refactoring and cleanup

* minor cleanup, fixed spa logout not working after login

* have reconnection handler for socket.io wait 2s to confirm disconnection before reporting -- stops flicker if reconnecting immediately

* Dynamically replace chat and slideout menu on updateHeader()

... instead of just the menu items.

* more efficient calls to Benchpress and translator /cc @pitaj

* fix: chats and notification handlers not working after login

* fix: accidentally calling cb multiple times
This commit is contained in:
Julian Lam
2018-11-07 12:34:12 -05:00
committed by GitHub
parent 6fb1f97d88
commit 84433f29ab
5 changed files with 109 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/controllers/authentication.js
View File

@@ -14,10 +14,12 @@ var plugins = require('../plugins');
var utils = require('../utils');
var translator = require('../translator');
var helpers = require('./helpers');
var middleware = require('../middleware');
var privileges = require('../privileges');
var sockets = require('../socket.io');
var authenticationController = module.exports;
var apiController = require('./api');
authenticationController.register = function (req, res) {
var registrationType = meta.config.registrationType || 'normal';
@@ -277,10 +279,16 @@ function continueLogin(req, res, next) {
return helpers.noScriptErrors(req, res, err.message, 403);
}
res.status(200).send(nconf.get('relative_path') + '/reset/' + code);
res.status(200).send({
next: nconf.get('relative_path') + '/reset/' + code,
});
});
} else {
authenticationController.doLogin(req, userData.uid, function (err) {
async.parallel({
doLogin: async.apply(authenticationController.doLogin, req, userData.uid),
header: async.apply(middleware.generateHeader, req, res, {}),
config: async.apply(apiController.loadConfig, req),
}, function (err, payload) {
if (err) {
return helpers.noScriptErrors(req, res, err.message, 403);
}
@@ -296,7 +304,11 @@ function continueLogin(req, res, next) {
if (req.body.noscript === 'true') {
res.redirect(destination + '?loggedin');
} else {
res.status(200).send(destination);
res.status(200).send({
next: destination,
header: payload.header,
config: payload.config,
});
}
});
}
@@ -320,6 +332,9 @@ authenticationController.doLogin = function (req, uid, callback) {
authenticationController.onSuccessfulLogin = function (req, uid, callback) {
var uuid = utils.generateUUID();
req.uid = uid;
req.loggedIn = true;
async.waterfall([
function (next) {
meta.blacklist.test(req.ip, next);
@@ -451,7 +466,8 @@ authenticationController.logout = function (req, res, next) {
},
function (next) {
req.logout();
req.session.destroy(function (err) {
req.session.regenerate(function (err) {
req.uid = 0;
next(err);
});
},
@@ -467,7 +483,19 @@ authenticationController.logout = function (req, res, next) {
if (req.body.noscript === 'true') {
res.redirect(nconf.get('relative_path') + '/');
} else {
res.status(200).send('');
async.parallel({
header: async.apply(middleware.generateHeader, req, res, {}),
config: async.apply(apiController.loadConfig, req),
}, function (err, payload) {
if (err) {
return res.status(500);
}
res.status(200).send({
header: payload.header,
config: payload.config,
});
});
}
},
], next);