From dc62b1a86e2bff66925e121bd18e82bf230da9da Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Wed, 26 Oct 2016 11:18:36 +0100 Subject: [PATCH] Remove deprecated endpoint for old delete-user --- .../web/app/coffee/Features/User/UserController.coffee | 8 -------- services/web/app/coffee/router.coffee | 1 - .../UnitTests/coffee/User/UserControllerTests.coffee | 10 ---------- 3 files changed, 19 deletions(-) diff --git a/services/web/app/coffee/Features/User/UserController.coffee b/services/web/app/coffee/Features/User/UserController.coffee index 6c4f51408d..f170250ccf 100644 --- a/services/web/app/coffee/Features/User/UserController.coffee +++ b/services/web/app/coffee/Features/User/UserController.coffee @@ -15,14 +15,6 @@ settings = require "settings-sharelatex" module.exports = UserController = - # TODO: deprecated, remove - deleteUser: (req, res)-> - user_id = AuthenticationController.getLoggedInUserId(req) - UserDeleter.deleteUser user_id, (err)-> - if !err? - req.session?.destroy() - res.sendStatus(200) - tryDeleteUser: (req, res, next) -> user_id = AuthenticationController.getLoggedInUserId(req) password = req.body.password diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 26bfd6618f..a027f6359e 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -92,7 +92,6 @@ module.exports = class Router webRouter.post '/user/sessions/clear', AuthenticationController.requireLogin(), UserController.clearSessions webRouter.delete '/user/newsletter/unsubscribe', AuthenticationController.requireLogin(), UserController.unsubscribe - webRouter.delete '/user', AuthenticationController.requireLogin(), UserController.deleteUser webRouter.post '/user/delete', AuthenticationController.requireLogin(), UserController.tryDeleteUser webRouter.get '/user/personal_info', AuthenticationController.requireLogin(), UserInfoController.getLoggedInUsersPersonalInfo diff --git a/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee b/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee index 052c8caa71..cc1d2190ef 100644 --- a/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee @@ -85,16 +85,6 @@ describe "UserController", -> json: sinon.stub() @next = sinon.stub() - describe "deleteUser", -> - - it "should delete the user", (done)-> - - @res.sendStatus = (code)=> - @UserDeleter.deleteUser.calledWith(@user_id) - code.should.equal 200 - done() - @UserController.deleteUser @req, @res - describe 'tryDeleteUser', -> beforeEach ->