greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge conflicts and clean up lint errors.

pull/936/head
terakilobyte 2015-06-11 21:08:40 -04:00
parent 223ea2a393
commit a5092d379d
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/models/user.js
View File

@ -44,7 +44,7 @@ module.exports = function(User) {
});
});
User.afterRemote('confirm', function(ctx, instance, next) {
User.afterRemote('confirm', function(ctx) {
ctx.req.flash('success', {
msg: [
'You\'re email has been confirmed!'
@ -96,21 +96,8 @@ module.exports = function(User) {
});
});
return res.redirect('/');
}
var config = {
signed: !!req.signedCookies,
maxAge: 1000 * accessToken.ttl
};
if (accessToken && accessToken.id) {
res.cookie('access_token', accessToken.id, config);
res.cookie('userId', accessToken.userId, config);
}
res.redirect('/');
});
User.afterRemote('logout', function(ctx, result, next) {
var res = ctx.result;
res.clearCookie('access_token');