Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1306

Browse Source
This commit is contained in:
barisusakli
2015-06-27 21:26:19 -04:00
parent de228fa67d
commit 57c2418157
21 changed files with 343 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/controllers/authentication.js
View File

@@ -16,7 +16,9 @@ var async = require('async'),
authenticationController = {};
authenticationController.register = function(req, res, next) {
if (parseInt(meta.config.allowRegistration, 10) === 0) {
var registrationType = meta.config.registrationType || 'normal';
if (registrationType === 'disabled') {
return res.sendStatus(403);
}
@@ -53,7 +55,26 @@ authenticationController.register = function(req, res, next) {
plugins.fireHook('filter:register.check', {req: req, res: res, userData: userData}, next);
},
function(data, next) {
user.create(data.userData, next);
if (registrationType === 'normal') {
registerAndLoginUser(req, res, userData, next);
} else if (registrationType === 'admin-approval') {
addToApprovalQueue(req, res, userData, next);
}
}
], function(err, data) {
if (err) {
return res.status(400).send(err.message);
}
res.json(data);
});
};
function registerAndLoginUser(req, res, userData, callback) {
var uid;
async.waterfall([
function(next) {
user.create(userData, next);
},
function(_uid, next) {
uid = _uid;
@@ -64,16 +85,22 @@ authenticationController.register = function(req, res, next) {
user.notifications.sendWelcomeNotification(uid);
plugins.fireHook('filter:register.complete', {uid: uid, referrer: req.body.referrer}, next);
}
], function(err, data) {
if (err) {
return res.status(400).send(err.message);
plugins.fireHook('filter:register.complete', {uid: uid, referrer: req.body.referrer || nconf.get('relative_path') + '/'}, next);
}
], callback);
}
res.status(200).send(data.referrer ? data.referrer : nconf.get('relative_path') + '/');
});
};
function addToApprovalQueue(req, res, userData, callback) {
async.waterfall([
function(next) {
userData.ip = req.ip;
user.addToApprovalQueue(userData, next);
},
function(next) {
next(null, {message: '[[register:registration-added-to-queue]]'});
}
], callback);
}
authenticationController.login = function(req, res, next) {
// Handle returnTo data