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

Merge branch 'jpa-backport-126' into jpa-backport-113

Browse source
This commit is contained in:
Jakob Ackermann 2020-06-22 17:04:40 +01:00
commit 7a114937a7
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
services/real-time/app/coffee/Router.coffee
View file

@ -55,6 +55,8 @@ module.exports = Router =
app.post "/client/:client_id/disconnect", httpAuth, HttpApiController.disconnectClient app.post "/client/:client_id/disconnect", httpAuth, HttpApiController.disconnectClient
session.on 'connection', (error, client, session) -> session.on 'connection', (error, client, session) ->
# init client context, we may access it in Router._handleError before
# setting any values
client.ol_context = {} client.ol_context = {}
client?.on "error", (err) -> client?.on "error", (err) ->
@ -113,13 +115,9 @@ module.exports = Router =
metrics.inc('socket-io.disconnect') metrics.inc('socket-io.disconnect')
metrics.gauge('socket-io.clients', io.sockets.clients()?.length - 1) metrics.gauge('socket-io.clients', io.sockets.clients()?.length - 1)
cleanup = () ->
delete client.ol_context
WebsocketController.leaveProject io, client, (err) -> WebsocketController.leaveProject io, client, (err) ->
if err? if err?
Router._handleError cleanup, err, client, "leaveProject" Router._handleError (() ->), err, client, "leaveProject"
else
cleanup()
# Variadic. The possible arguments: # Variadic. The possible arguments:
# doc_id, callback # doc_id, callback

1
services/real-time/app/coffee/WebsocketController.coffee
View file

@ -33,6 +33,7 @@ module.exports = WebsocketController =
logger.warn {err, project_id, user_id, client_id: client.id}, "user is not authorized to join project" logger.warn {err, project_id, user_id, client_id: client.id}, "user is not authorized to join project"
return callback(err) return callback(err)
client.ol_context = {}
client.ol_context["privilege_level"] = privilegeLevel client.ol_context["privilege_level"] = privilegeLevel
client.ol_context["user_id"] = user_id client.ol_context["user_id"] = user_id
client.ol_context["project_id"] = project_id client.ol_context["project_id"] = project_id