From 0f2600b1987ef6a946d74915347f1b74d8962329 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Thu, 21 Jul 2016 09:32:14 +0100 Subject: [PATCH] finish out skeleton of invite controller --- .../CollaboratorsInviteController.coffee | 11 ++++++++++- .../Features/Collaborators/CollaboratorsRouter.coffee | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee index 95f8e35e97..beac6f2b45 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee @@ -42,6 +42,7 @@ module.exports = CollaboratorsInviteController = viewInvite: (req, res, next) -> projectId = req.params.Project_id token = req.params.token + currentUser = req.session.user CollaboratorsInviteHandler.getInviteByToken projectId, token, (err, invite) -> if err? logger.err {projectId, token}, "error getting invite by token" @@ -51,5 +52,13 @@ module.exports = CollaboratorsInviteController = return res.redirect("/") res.render "project/invite", {invite} - acceptInvite: (req, res, next) -> + projectId = req.params.Project_id + inviteId = req.params.inviteId + currentUser = req.session.user + logger.log {projectId, inviteId}, "accepting invite" + CollaboratorsInviteHandler.acceptInvite projectId, inviteId, currentUser, (err) -> + if err? + logger.err {projectId, token}, "error getting invite by token" + return next(err) + rest.status(201).send() diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsRouter.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsRouter.coffee index c687a1e487..9412f794ba 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsRouter.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsRouter.coffee @@ -25,10 +25,12 @@ module.exports = webRouter.get( '/project/:Project_id/invite/token/:token', + AuthenticationController.requireLogin(), CollaboratorsInviteController.viewInvite ) webRouter.post( '/project/:Project_id/invite/:invite_id/accept', + AuthenticationController.requireLogin(), CollaboratorsInviteController.acceptInvite )