From ee6ca2c5ae7fd533182d663acc76fc37348e1875 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Tue, 15 Mar 2016 11:22:54 -0700 Subject: [PATCH] address eslint errors from refactor --- server/boot/randomAPIs.js | 36 ++++++++++++++++++--------- server/boot/user.js | 52 +++++++++++++++++++++++++-------------- 2 files changed, 58 insertions(+), 30 deletions(-) diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js index 34adb26487d..d9ef88f7bad 100644 --- a/server/boot/randomAPIs.js +++ b/server/boot/randomAPIs.js @@ -282,31 +282,43 @@ module.exports = function(app) { } function unsubscribeMonthly(req, res, next) { - User.findOne({ where: { email: req.params.email } }, function(err, user) { - user.updateAttribute('sendMonthlyEmail', false, function(err) { + req.checkParams('email', 'Must send a valid email').isEmail(); + return User.findOne({ where: { email: req.params.email } }, (err, user) => { + if (err) { return next(err); } + return user.updateAttribute('sendMonthlyEmail', false, (err) => { if (err) { return next(err); } - req.flash('info', { msg: 'We\'ve successfully updated your Email preferences.' }); - res.redirect('/unsubscribed'); + req.flash('info', { + msg: 'We\'ve successfully updated your Email preferences.' + }); + return res.redirect('/unsubscribed'); }); }); } function unsubscribeNotifications(req, res, next) { - User.findOne({ where: { email: req.params.email } }, function(err, user) { - user.updateAttribute('sendNotificationEmail', false, function(err) { + req.checkParams('email', 'Must send a valid email').isEmail(); + return User.findOne({ where: { email: req.params.email } }, (err, user) => { + if (err) { return next(err); } + return user.updateAttribute('sendNotificationEmail', false, (err) => { if (err) { return next(err); } - req.flash('info', { msg: 'We\'ve successfully updated your Email preferences.' }); - res.redirect('/unsubscribed'); + req.flash('info', { + msg: 'We\'ve successfully updated your Email preferences.' + }); + return res.redirect('/unsubscribed'); }); }); } function unsubscribeQuincy(req, res, next) { - User.findOne({ where: { email: req.params.email } }, function(err, user) { - user.updateAttribute('sendQuincyEmail', false, function(err) { + req.checkParams('email', 'Must send a valid email').isEmail(); + return User.findOne({ where: { email: req.params.email } }, (err, user) => { + if (err) { return next(err); } + return user.updateAttribute('sendQuincyEmail', false, (err) => { if (err) { return next(err); } - req.flash('info', { msg: 'We\'ve successfully updated your Email preferences.' }); - res.redirect('/unsubscribed'); + req.flash('info', { + msg: 'We\'ve successfully updated your Email preferences.' + }); + return res.redirect('/unsubscribed'); }); }); } diff --git a/server/boot/user.js b/server/boot/user.js index 95fda41240e..fc3986d54c0 100644 --- a/server/boot/user.js +++ b/server/boot/user.js @@ -248,7 +248,7 @@ module.exports = function(app) { return res.redirect('/' + username); } - function getSettings(req, res, next) { + function getSettings(req, res) { res.render('account/settings'); } @@ -420,10 +420,12 @@ module.exports = function(app) { function toggleLockdownMode(req, res, next) { return User.findById(req.accessToken.userId, function(err, user) { if (err) { return next(err); } - user.updateAttribute('isLocked', typeof user.isLocked !== "undefined" ? !user.isLocked : true, function(err) { + return user.updateAttribute('isLocked', !user.isLocked, function(err) { if (err) { return next(err); } - req.flash('info', { msg: 'We\'ve successfully updated your Privacy preferences.' }); - res.redirect('/settings'); + req.flash('info', { + msg: 'We\'ve successfully updated your Privacy preferences.' + }); + return res.redirect('/settings'); }); }); } @@ -431,32 +433,46 @@ module.exports = function(app) { function toggleReceivesAnnouncementEmails(req, res, next) { return User.findById(req.accessToken.userId, function(err, user) { if (err) { return next(err); } - user.updateAttribute('sendMonthlyEmail', typeof user.sendMonthlyEmail !== "undefined" ? !user.sendMonthlyEmail : true, function(err) { - if (err) { return next(err); } - req.flash('info', { msg: 'We\'ve successfully updated your Email preferences.' }); - res.redirect('/settings'); - }); + return user.updateAttribute( + 'sendMonthlyEmail', + !user.sendMonthlyEmail, + (err) => { + if (err) { return next(err); } + req.flash('info', { + msg: 'We\'ve successfully updated your Email preferences.' + }); + return res.redirect('/settings'); + }); }); } function toggleReceivesQuincyEmails(req, res, next) { return User.findById(req.accessToken.userId, function(err, user) { if (err) { return next(err); } - user.updateAttribute('sendQuincyEmail', typeof user.sendQuincyEmail !== "undefined" ? !user.sendQuincyEmail : true, function(err) { - if (err) { return next(err); } - req.flash('info', { msg: 'We\'ve successfully updated your Email preferences.' }); - res.redirect('/settings'); - }); + return user.updateAttribute('sendQuincyEmail', !user.sendQuincyEmail, + (err) => { + if (err) { return next(err); } + req.flash('info', { + msg: 'We\'ve successfully updated your Email preferences.' + }); + return res.redirect('/settings'); + } + ); }); } function toggleReceivesNotificationEmails(req, res, next) { return User.findById(req.accessToken.userId, function(err, user) { if (err) { return next(err); } - user.updateAttribute('sendNotificationEmail', typeof user.sendNotificationEmail !== "undefined" ? !user.sendNotificationEmail : true, function(err) { - if (err) { return next(err); } - req.flash('info', { msg: 'We\'ve successfully updated your Email preferences.' }); - res.redirect('/settings'); + return user.updateAttribute( + 'sendNotificationEmail', + !user.sendNotificationEmail, + function(err) { + if (err) { return next(err); } + req.flash('info', { + msg: 'We\'ve successfully updated your Email preferences.' + }); + return res.redirect('/settings'); }); }); }