OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #793 from matrix-org/luke/fix-guest-team-token-home-page 

Fix issue where teamTokenMap was ignored for guests
pull/21833/head
Luke Barnard 2017-04-07 11:53:00 +01:00 committed by GitHub
parent 73bdfe8f74 a815788af8
commit 4342a2ad47
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/structures/MatrixChat.js
View File

@ -763,9 +763,11 @@ module.exports = React.createClass({
}); });
if (teamToken) { if (teamToken) {
// A team member has logged in, not a guest
this._teamToken = teamToken; this._teamToken = teamToken;
dis.dispatch({action: 'view_home_page'}); dis.dispatch({action: 'view_home_page'});
} else if (this._is_registered) { } else if (this._is_registered) {
// The user has just logged in after registering
dis.dispatch({action: 'view_user_settings'}); dis.dispatch({action: 'view_user_settings'});
} else { } else {
this._showScreenAfterLogin(); this._showScreenAfterLogin();
@ -788,6 +790,10 @@ module.exports = React.createClass({
action: 'view_room', action: 'view_room',
room_id: localStorage.getItem('mx_last_room_id'), room_id: localStorage.getItem('mx_last_room_id'),
}); });
} else if (this._teamToken) {
// Team token might be set if we're a guest.
// Guests do not call _onLoggedIn with a teamToken
dis.dispatch({action: 'view_home_page'});
} else { } else {
dis.dispatch({action: 'view_room_directory'}); dis.dispatch({action: 'view_room_directory'});
} }