gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix user redirect on email account creation

Browse Source
This commit is contained in:
Berkeley Martinez
2015-12-29 11:57:12 -08:00
parent d745e3a254
commit 2a48f42313
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/boot/a-extendUser.js
View File

@ -56,9 +56,12 @@ module.exports = function(app) {
}); });
// send welcome email to new camper // send welcome email to new camper
User.afterRemote('create', function(ctx, user, next) { User.afterRemote('create', function({ req, res }, user, next) {
debug('user created, sending email'); debug('user created, sending email');
if (!user.email) { return next(); } if (!user.email) { return next(); }
const redirect = req.session && req.session.returnTo ?
req.session.returnTo :
'/';
var mailOptions = { var mailOptions = {
type: 'email', type: 'email',
@ -81,13 +84,13 @@ module.exports = function(app) {
debug('sending welcome email'); debug('sending welcome email');
Email.send(mailOptions, function(err) { Email.send(mailOptions, function(err) {
if (err) { return next(err); } if (err) { return next(err); }
ctx.req.logIn(user, function(err) { req.logIn(user, function(err) {
if (err) { return next(err); } if (err) { return next(err); }
ctx.req.flash('success', { req.flash('success', {
msg: [ "Welcome to Free Code Camp! We've created your account." ] msg: [ "Welcome to Free Code Camp! We've created your account." ]
}); });
ctx.res.redirect('/'); res.redirect(redirect);
}); });
}); });
}); });