From 26874877ba5ea4df4db57898006a3541b848cad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Wed, 6 May 2020 14:03:47 +0200 Subject: [PATCH] Provide roomId to logout for load balanced scenarios, fixes #275 --- app/src/RoomClient.js | 4 ++-- app/src/components/JoinDialog.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js index 1c93794..9f7dd10 100644 --- a/app/src/RoomClient.js +++ b/app/src/RoomClient.js @@ -475,9 +475,9 @@ export default class RoomClient window.open(url, 'loginWindow'); } - logout() + logout(roomId = this._roomId) { - window.open('/auth/logout', 'logoutWindow'); + window.open(`/auth/logout?peerId=${this._peerId}&roomId=${roomId}`, 'logoutWindow'); } receiveLoginChildWindow(data) diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js index 3d2596f..0ad8ef8 100644 --- a/app/src/components/JoinDialog.js +++ b/app/src/components/JoinDialog.js @@ -224,7 +224,7 @@ const JoinDialog = ({ myPicture={myPicture} onLogin={() => { - loggedIn ? roomClient.logout() : roomClient.login(roomId); + loggedIn ? roomClient.logout(roomId) : roomClient.login(roomId); }} loggedIn={loggedIn} >