From 11394447904b4166e797b94a35a1daa7800a5555 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 22 Jul 2016 09:27:00 +0100 Subject: [PATCH] add token to body of `acceptInvite` action. --- .../Collaborators/CollaboratorsInviteController.coffee | 3 ++- .../Collaborators/CollaboratorsInviteControllerTests.coffee | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee index bb9e013abe..4b48ce01c9 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee @@ -55,9 +55,10 @@ module.exports = CollaboratorsInviteController = acceptInvite: (req, res, next) -> projectId = req.params.Project_id inviteId = req.params.inviteId + {token} = req.body currentUser = req.session.user logger.log {projectId, inviteId}, "accepting invite" - CollaboratorsInviteHandler.acceptInvite projectId, inviteId, currentUser, (err) -> + CollaboratorsInviteHandler.acceptInvite projectId, inviteId, token, currentUser, (err) -> if err? logger.err {projectId, inviteId}, "error getting invite by token" return next(err) diff --git a/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee b/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee index aa8261f881..5ee04aeadf 100644 --- a/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsInviteControllerTests.coffee @@ -239,9 +239,11 @@ describe "CollaboratorsInviteController", -> invite_id: @invite_id = "thuseoautoh" @req.session = user: _id: @current_user_id = "current-user-id" + @req.body = + token: "thsueothaueotauahsuet" @res.render = sinon.stub() @res.sendStatus = sinon.stub() - @CollaboratorsInviteHandler.acceptInvite = sinon.stub().callsArgWith(3, null) + @CollaboratorsInviteHandler.acceptInvite = sinon.stub().callsArgWith(4, null) @callback = sinon.stub() @next = sinon.stub() @@ -261,7 +263,7 @@ describe "CollaboratorsInviteController", -> beforeEach -> @err = new Error('woops') - @CollaboratorsInviteHandler.acceptInvite = sinon.stub().callsArgWith(3, @err) + @CollaboratorsInviteHandler.acceptInvite = sinon.stub().callsArgWith(4, @err) @CollaboratorsInviteController.acceptInvite @req, @res, @next it 'should not produce a 201 response', ->