github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Handle null, undefined and false in isUserLoggedIn

Browse source
This commit is contained in:
Shane Kilkelly 2016-09-23 16:53:07 +01:00
parent f9030a0a38
commit dd14e51713
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/coffee/Features/Authentication/AuthenticationController.coffee
View file

@ -94,7 +94,7 @@ module.exports = AuthenticationController =
isUserLoggedIn: (req) ->
user_id = AuthenticationController.getLoggedInUserId(req)
return user_id != null
return (user_id not in [null, undefined, false])
# TODO: perhaps should produce an error if the current user is not present
getLoggedInUserId: (req) ->

20
services/web/test/UnitTests/coffee/Authentication/AuthenticationControllerTests.coffee
View file

@ -44,6 +44,24 @@ describe "AuthenticationController", ->
afterEach ->
tk.reset()
describe 'isUserLoggedIn', () ->
beforeEach ->
@stub = sinon.stub(@AuthenticationController, 'getLoggedInUserId')
afterEach ->
@stub.restore()
it 'should do the right thing in all cases', () ->
@AuthenticationController.getLoggedInUserId.returns('some_id')
expect(@AuthenticationController.isUserLoggedIn(@req)).to.equal true
@AuthenticationController.getLoggedInUserId.returns(null)
expect(@AuthenticationController.isUserLoggedIn(@req)).to.equal false
@AuthenticationController.getLoggedInUserId.returns(false)
expect(@AuthenticationController.isUserLoggedIn(@req)).to.equal false
@AuthenticationController.getLoggedInUserId.returns(undefined)
expect(@AuthenticationController.isUserLoggedIn(@req)).to.equal false
describe 'setInSessionUser', () ->
beforeEach ->
@ -361,7 +379,7 @@ describe "AuthenticationController", ->
describe "with a user session", ->
beforeEach ->
@req.session =
user: {"mock": "user"}
user: {"mock": "user", "_id": "some_id"}
@AuthenticationController.requireGlobalLogin @req, @res, @next
it "should call next() directly", ->