From cc5f794f3d33941204282201d2c617d5bb8381d7 Mon Sep 17 00:00:00 2001 From: Alys Date: Sat, 27 Feb 2016 18:48:41 +1000 Subject: [PATCH] prevent party inviter's email address being used as a Reply-To --- test/server_side/controllers/groups.test.js | 3 +-- website/src/controllers/api-v2/groups.js | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/server_side/controllers/groups.test.js b/test/server_side/controllers/groups.test.js index 6a75c75c78..2dd69c2a87 100644 --- a/test/server_side/controllers/groups.test.js +++ b/test/server_side/controllers/groups.test.js @@ -111,8 +111,7 @@ describe('Groups Controller', function() { 'invite-friend', [ { name: 'LINK', content: '?partyInvite=http://link.com' }, - { name: 'INVITER', content: 'inviter' }, - { name: 'REPLY_TO_ADDRESS', content: 'inviter@example.com' } + { name: 'INVITER', content: 'inviter' } ] ); }); diff --git a/website/src/controllers/api-v2/groups.js b/website/src/controllers/api-v2/groups.js index cd01d1b27e..25b1cd52da 100644 --- a/website/src/controllers/api-v2/groups.js +++ b/website/src/controllers/api-v2/groups.js @@ -587,8 +587,7 @@ var inviteByUUIDs = function(uuids, group, req, res, next){ if(invite.preferences.emailNotifications['invited' + (group.type == 'guild' ? 'Guild' : 'Party')] !== false){ var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']); var emailVars = [ - {name: 'INVITER', content: inviterVars.name}, - {name: 'REPLY_TO_ADDRESS', content: inviterVars.email} + {name: 'INVITER', content: inviterVars.name} ]; if(group.type == 'guild'){ @@ -653,8 +652,7 @@ var inviteByEmails = function(invites, group, req, res, next){ var inviterVars = utils.getUserInfo(res.locals.user, ['name', 'email']); var variables = [ {name: 'LINK', content: link}, - {name: 'INVITER', content: req.body.inviter || inviterVars.name}, - {name: 'REPLY_TO_ADDRESS', content: inviterVars.email} + {name: 'INVITER', content: req.body.inviter || inviterVars.name} ]; if(group.type == 'guild'){ @@ -954,7 +952,6 @@ api.questAccept = function(req, res, next) { utils.txnEmail(membersToEmail, ('invite-' + (quest.boss ? 'boss' : 'collection') + '-quest'), [ {name: 'QUEST_NAME', content: quest.text()}, {name: 'INVITER', content: inviterVars.name}, - {name: 'REPLY_TO_ADDRESS', content: inviterVars.email}, {name: 'PARTY_URL', content: '/#/options/groups/party'} ]);