agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-31 04:41:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't return a user if there is no entry

Browse Source 
ioredis returns a blank object, {}, if there is no key with hgetall.
Previously, node-redis returned nil. So we need to check for a blank
object as well as a nil object.
This commit is contained in:
James Allen
2017-05-16 11:06:05 +01:00
parent 5cd5b7e110
commit 642134da79
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/real-time/app/coffee/ConnectedUsersManager.coffee
View File

@@ -50,7 +50,7 @@ module.exports =
_getConnectedUser: (project_id, client_id, callback)->
rclient.hgetall Keys.connectedUser({project_id, client_id}), (err, result)->
if !result?
if !result? or Object.keys(result).length == 0
result =
connected : false
client_id:client_id

13
services/real-time/test/unit/coffee/ConnectedUsersManagerTests.coffee
View File

@@ -122,7 +122,7 @@ describe "ConnectedUsersManager", ->
describe "_getConnectedUser", ->
it "should get the user returning connected if there is a value", (done)->
it "should return a connected user if there is a user object", (done)->
cursorData = JSON.stringify(cursorData:{row:1})
@rClient.hgetall.callsArgWith(1, null, {connected_at:new Date(), cursorData})
@ConnectedUsersManager._getConnectedUser @project_id, @client_id, (err, result)=>
@@ -130,8 +130,15 @@ describe "ConnectedUsersManager", ->
result.client_id.should.equal @client_id
done()
it "should get the user returning connected if there is a value", (done)->
@rClient.hgetall.callsArgWith(1)
it "should return a not connected user if there is no object", (done)->
@rClient.hgetall.callsArgWith(1, null, null)
@ConnectedUsersManager._getConnectedUser @project_id, @client_id, (err, result)=>
result.connected.should.equal false
result.client_id.should.equal @client_id
done()
it "should return a not connected user if there is an empty object", (done)->
@rClient.hgetall.callsArgWith(1, null, {})
@ConnectedUsersManager._getConnectedUser @project_id, @client_id, (err, result)=>
result.connected.should.equal false
result.client_id.should.equal @client_id