From 16416463c6d9e7f308ca477e7f5f56ca388897b3 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Thu, 12 Oct 2017 11:49:02 +0100 Subject: [PATCH] Update `removeUserFromProject` to account for token-access --- .../Features/Collaborators/CollaboratorsHandler.coffee | 6 +++++- .../coffee/Collaborators/CollaboratorsHandlerTests.coffee | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee index 782340d861..9620a09fba 100644 --- a/services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee +++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee @@ -158,7 +158,11 @@ module.exports = CollaboratorsHandler = logger.log user_id: user_id, project_id: project_id, "removing user" conditions = _id:project_id update = $pull:{} - update["$pull"] = collaberator_refs:user_id, readOnly_refs:user_id + update["$pull"] = + collaberator_refs:user_id, + readOnly_refs:user_id + tokenAccessReadOnly_refs:user_id + tokenAccessReadAndWrite_refs:user_id Project.update conditions, update, (err)-> if err? logger.error err: err, "problem removing user from project collaberators" diff --git a/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsHandlerTests.coffee b/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsHandlerTests.coffee index 9bb8958fab..5aa3b449fe 100644 --- a/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsHandlerTests.coffee +++ b/services/web/test/UnitTests/coffee/Collaborators/CollaboratorsHandlerTests.coffee @@ -223,7 +223,10 @@ describe "CollaboratorsHandler", -> .calledWith({ _id: @project_id }, { - "$pull":{collaberator_refs:@user_id, readOnly_refs:@user_id} + "$pull":{ + collaberator_refs:@user_id, readOnly_refs:@user_id, + tokenAccessReadOnly_refs:@user_id, tokenAccessReadAndWrite_refs:@user_id + } }) .should.equal true