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

Update eslint, fix lint issues

Browse Source
This commit is contained in:
Berkeley Martinez
2016-03-02 20:54:14 -08:00
parent c50510db71
commit 74592e72b4
30 changed files with 141 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ module.exports = function(app) {
if (!id) {
return next();
}
Observable.combineLatest(
return Observable.combineLatest(
destroyAllRelated(id, UserIdentity),
destroyAllRelated(id, UserCredential),
function(identData, credData) {
@@ -30,19 +30,20 @@ module.exports = function(app) {
credData: credData
};
}
).subscribe(
function(data) {
debug('deleted', data);
},
function(err) {
debug('error deleting user %s stuff', id, err);
next(err);
},
function() {
debug('user stuff deleted for user %s', id);
next();
}
);
)
.subscribe(
function(data) {
debug('deleted', data);
},
function(err) {
debug('error deleting user %s stuff', id, err);
next(err);
},
function() {
debug('user stuff deleted for user %s', id);
next();
}
);
});
// set email varified false on user email signup
@@ -82,15 +83,15 @@ module.exports = function(app) {
};
debug('sending welcome email');
Email.send(mailOptions, function(err) {
return Email.send(mailOptions, function(err) {
if (err) { return next(err); }
req.logIn(user, function(err) {
return req.logIn(user, function(err) {
if (err) { return next(err); }
req.flash('success', {
msg: [ "Welcome to Free Code Camp! We've created your account." ]
});
res.redirect(redirect);
return res.redirect(redirect);
});
});
});