This commit is contained in:
barisusakli
2015-06-28 21:54:21 -04:00
parent 54226a86b4
commit 5ee1951245
14 changed files with 221 additions and 39 deletions

View File

@@ -33,6 +33,14 @@ authenticationController.register = function(req, res, next) {
var uid;
async.waterfall([
function(next) {
if (registrationType === 'invite-only') {
user.verifyInvitation(userData, next);
} else {
next();
}
},
function(next) {
console.log(userData);
if (!userData.email) {
return next(new Error('[[error:invalid-email]]'));
}
@@ -55,7 +63,7 @@ authenticationController.register = function(req, res, next) {
plugins.fireHook('filter:register.check', {req: req, res: res, userData: userData}, next);
},
function(data, next) {
if (registrationType === 'normal') {
if (registrationType === 'normal' || registrationType === 'invite-only') {
registerAndLoginUser(req, res, userData, next);
} else if (registrationType === 'admin-approval') {
addToApprovalQueue(req, res, userData, next);
@@ -83,6 +91,8 @@ function registerAndLoginUser(req, res, userData, callback) {
function(next) {
user.logIP(uid, req.ip);
user.deleteInvitation(userData.email);
user.notifications.sendWelcomeNotification(uid);
plugins.fireHook('filter:register.complete', {uid: uid, referrer: req.body.referrer || nconf.get('relative_path') + '/'}, next);