From 8e31cc5c23dd139d6961ab841dde9a96da128812 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Thu, 20 Aug 2020 16:23:57 +0100 Subject: [PATCH] [Router] _handleError: joinProject error-context may not have project_id The ol_context patch changed the priority of client context and rpc context. This lead to the (possibly missing) project_id of the client context overwriting the project_id of the rpc context. REF: f1d55c0a5437a518e9f4617473caed9ba928e648 --- services/real-time/app/js/Router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/real-time/app/js/Router.js b/services/real-time/app/js/Router.js index dca3794368..4fe3eef5e0 100644 --- a/services/real-time/app/js/Router.js +++ b/services/real-time/app/js/Router.js @@ -28,7 +28,7 @@ module.exports = Router = { _handleError(callback, error, client, method, attrs) { attrs = attrs || {} for (const key of ['project_id', 'user_id']) { - attrs[key] = client.ol_context[key] + attrs[key] = attrs[key] || client.ol_context[key] } attrs.client_id = client.id attrs.err = error