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

closes #5533

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-12-05 13:18:37 -05:00
parent e7a6326b2f
commit fd78eb6d57
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/controllers/authentication.js
View File

@@ -57,18 +57,7 @@ authenticationController.register = function (req, res) {
user.isPasswordValid(userData.password, next);
},
function (next) {
user.shouldQueueUser(req.ip, next);
},
function (queue, next) {
res.locals.processLogin = true; // set it to false in plugin if you wish to just register only
plugins.fireHook('filter:register.check', { req: req, res: res, userData: userData, queue: queue }, next);
},
function (data, next) {
if (data.queue) {
addToApprovalQueue(req, userData, next);
} else {
registerAndLoginUser(req, res, userData, next);
}
registerAndLoginUser(req, res, userData, next);
},
], function (err, data) {
if (err) {
@@ -108,7 +97,18 @@ function registerAndLoginUser(req, res, userData, callback) {
return res.json({ referrer: nconf.get('relative_path') + '/register/complete' });
},
function (next) {
user.create(userData, next);
user.shouldQueueUser(req.ip, next);
},
function (queue, next) {
res.locals.processLogin = true; // set it to false in plugin if you wish to just register only
plugins.fireHook('filter:register.check', { req: req, res: res, userData: userData, queue: queue }, next);
},
function (data, next) {
if (data.queue) {
addToApprovalQueue(req, userData, callback);
} else {
user.create(userData, next);
}
},
function (_uid, next) {
uid = _uid;
@@ -155,9 +155,11 @@ authenticationController.registerComplete = function (req, res, next) {
return memo;
}, []);
var done = function () {
var done = function (err, data) {
delete req.session.registration;
if (!err && data && data.message) {
return res.redirect(nconf.get('relative_path') + '/?register=' + encodeURIComponent(data.message));
}
if (req.session.returnTo) {
res.redirect(req.session.returnTo);
} else {