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

updated termsOfUse to use registration interstitial instead of being integrated into register template

Browse Source
This commit is contained in:
Julian Lam
2016-06-22 16:47:24 -04:00
parent 041670bfe9
commit a14263349b
7 changed files with 62 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/controllers/authentication.js
View File

@@ -88,11 +88,11 @@ function registerAndLoginUser(req, res, userData, callback) {
}, function(err, data) {
// If interstitials are found, save registration attempt into session and abort
var deferRegistration = data.interstitials.length;
deferRegistration = true;
if (!deferRegistration) {
return next();
} else {
userData.register = true;
req.session.registration = userData;
return res.json({ referrer: nconf.get('relative_path') + '/register/complete' });
}
@@ -142,13 +142,7 @@ authenticationController.registerComplete = function(req, res, next) {
return memo;
}, []);
async.parallel(callbacks, function(err) {
if (err) {
req.flash('error', err.message);
return res.redirect(nconf.get('relative_path') + '/register/complete');
}
// Clear registration data in session
var done = function() {
delete req.session.registration;
if (req.session.returnTo) {
@@ -156,10 +150,32 @@ authenticationController.registerComplete = function(req, res, next) {
} else {
res.redirect(nconf.get('relative_path') + '/');
}
}
async.parallel(callbacks, function(err) {
if (err) {
req.flash('error', err.message);
return res.redirect(nconf.get('relative_path') + '/register/complete');
}
if (req.session.registration.register === true) {
res.locals.processLogin = true;
registerAndLoginUser(req, res, req.session.registration, done);
} else {
// Clear registration data in session
done();
}
});
});
};
authenticationController.registerAbort = function(req, res, next) {
// End the session and redirect to home
req.session.destroy(function() {
res.redirect(nconf.get('relative_path') + '/');
});
};
authenticationController.login = function(req, res, next) {
// Handle returnTo data
if (req.body.hasOwnProperty('returnTo') && !req.session.returnTo) {