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

Simplify the unsubscribe routes and handlers.

Browse Source 
The intention of issue #8115 seems to be to consolidate unsubscribe
behaviour. This commit attempts to formalize this by handling all
unsubscribe routes with the same exact handler.

It changes the behaviour of unsubscribe-notifications to be consistent
as discussed in pull request #8135.
This commit is contained in:
Allon Hadaya
2016-08-04 16:03:56 -04:00
parent 952ea3a3e2
commit bf564a5023
1 changed files with 4 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
server/boot/randomAPIs.js
View File

@ -12,12 +12,9 @@ module.exports = function(app) {
noLangRouter.get('/api/github', githubCalls); noLangRouter.get('/api/github', githubCalls);
noLangRouter.get('/chat', chat); noLangRouter.get('/chat', chat);
noLangRouter.get('/twitch', twitch); noLangRouter.get('/twitch', twitch);
noLangRouter.get('/unsubscribe/:email', unsubscribeMonthly); noLangRouter.get('/unsubscribe/:email', unsubscribeAll);
noLangRouter.get( noLangRouter.get('/unsubscribe-notifications/:email', unsubscribeAll);
'/unsubscribe-notifications/:email', noLangRouter.get('/unsubscribe-quincy/:email', unsubscribeAll);
unsubscribeNotifications
);
noLangRouter.get('/unsubscribe-quincy/:email', unsubscribeQuincy);
noLangRouter.get('/submit-cat-photo', submitCatPhoto); noLangRouter.get('/submit-cat-photo', submitCatPhoto);
noLangRouter.get( noLangRouter.get(
'/the-fastest-web-page-on-the-internet', '/the-fastest-web-page-on-the-internet',
@ -172,53 +169,7 @@ module.exports = function(app) {
res.redirect('https://twitch.tv/freecodecamp'); res.redirect('https://twitch.tv/freecodecamp');
} }
function unsubscribeMonthly(req, res, next) { function unsubscribeAll(req, res, next) {
req.checkParams('email', 'Must send a valid email').isEmail();
return User.findOne({ where: { email: req.params.email } }, (err, user) => {
if (err) { return next(err); }
if (!user) {
req.flash('info', {
msg: 'Email address not found. ' +
'Please update your Email preferences from your profile.'
});
return res.redirect('/map');
}
return user.updateAttributes({
sendMonthlyEmail: false,
sendQuincyEmail: false,
sendNotificationEmail: false
}, (err) => {
if (err) { return next(err); }
req.flash('info', {
msg: 'We\'ve successfully updated your Email preferences.'
});
return res.redirect('/unsubscribed');
});
});
}
function unsubscribeNotifications(req, res, next) {
req.checkParams('email', 'Must send a valid email').isEmail();
return User.findOne({ where: { email: req.params.email } }, (err, user) => {
if (err) { return next(err); }
if (!user) {
req.flash('info', {
msg: 'Email address not found. ' +
'Please update your Email preferences from your profile.'
});
return res.redirect('/map');
}
return user.updateAttribute('sendNotificationEmail', false, (err) => {
if (err) { return next(err); }
req.flash('info', {
msg: 'We\'ve successfully updated your Email preferences.'
});
return res.redirect('/unsubscribed');
});
});
}
function unsubscribeQuincy(req, res, next) {
req.checkParams('email', 'Must send a valid email').isEmail(); req.checkParams('email', 'Must send a valid email').isEmail();
return User.findOne({ where: { email: req.params.email } }, (err, user) => { return User.findOne({ where: { email: req.params.email } }, (err, user) => {
if (err) { return next(err); } if (err) { return next(err); }