From 311ebf89c44b27bcae33afeeeb6af7d511ba54fa Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 20 Nov 2017 10:10:23 +0000 Subject: [PATCH] Refactor to always use req.externalAuthenticationSystemUsed --- services/web/app/coffee/Features/User/UserController.coffee | 3 +-- .../test/UnitTests/coffee/User/UserControllerTests.coffee | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/services/web/app/coffee/Features/User/UserController.coffee b/services/web/app/coffee/Features/User/UserController.coffee index d64883b23b..7dc82c1a7b 100644 --- a/services/web/app/coffee/Features/User/UserController.coffee +++ b/services/web/app/coffee/Features/User/UserController.coffee @@ -51,7 +51,6 @@ module.exports = UserController = updateUserSettings : (req, res)-> user_id = AuthenticationController.getLoggedInUserId(req) - usingExternalAuth = settings.ldap? or settings.saml? logger.log user_id: user_id, "updating account settings" User.findById user_id, (err, user)-> if err? or !user? @@ -84,7 +83,7 @@ module.exports = UserController = user.ace.syntaxValidation = req.body.syntaxValidation user.save (err)-> newEmail = req.body.email?.trim().toLowerCase() - if !newEmail? or newEmail == user.email or usingExternalAuth + if !newEmail? or newEmail == user.email or req.externalAuthenticationSystemUsed() # end here, don't update email AuthenticationController.setInSessionUser(req, {first_name: user.first_name, last_name: user.last_name}) return res.sendStatus 200 diff --git a/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee b/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee index a71fe4bb91..c358f35b22 100644 --- a/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/User/UserControllerTests.coffee @@ -187,6 +187,7 @@ describe "UserController", -> describe "updateUserSettings", -> beforeEach -> @newEmail = "hello@world.com" + @req.externalAuthenticationSystemUsed = sinon.stub().returns(false) it "should call save", (done)-> @req.body = {} @@ -280,10 +281,7 @@ describe "UserController", -> beforeEach -> @UserUpdater.changeEmailAddress.callsArgWith(2) @newEmail = 'someone23@example.com' - @settings.ldap = {active: true} - - afterEach -> - delete @settings.ldap + @req.externalAuthenticationSystemUsed = sinon.stub().returns(true) it 'should not set a new email', (done) -> @req.body.email = @newEmail