From 7e292b29c1f7b3c485f9b0318472db8ac7ef11d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Thu, 24 Oct 2019 10:32:28 +0200 Subject: [PATCH] User can login without joining. --- app/src/RoomClient.js | 7 +++++-- server/server.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js index 128c56b..47a04af 100644 --- a/app/src/RoomClient.js +++ b/app/src/RoomClient.js @@ -324,8 +324,11 @@ export default class RoomClient const { displayName, picture } = data; - this.changeDisplayName(displayName); - this.changeProfilePicture(picture); + if (store.getState().room.joined) + { + this.changeDisplayName(displayName); + this.changeProfilePicture(picture); + } store.dispatch(stateActions.setPicture(picture)); store.dispatch(stateActions.loggedIn()); diff --git a/server/server.js b/server/server.js index be40826..839029f 100755 --- a/server/server.js +++ b/server/server.js @@ -280,7 +280,7 @@ async function setupAuth(oidcIssuer) const room = rooms.get(state.roomId); - room.peerAuthenticated(state.peerId); + room && room.peerAuthenticated(state.peerId); res.send(httpHelper({ success : true,