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

Merge pull request #882 from matrix-org/luke/new-guest-access-welcome-user 

Invite the welcome user after registration if configured
pull/21833/head
Luke Barnard 2017-05-15 15:06:44 +01:00 committed by GitHub
parent 81806e23bf 683f1b8a1a
commit 5584a5cdfd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -578,7 +578,7 @@ module.exports = React.createClass({
this.setState({loggingIn: true}); this.setState({loggingIn: true});
break; break;
case 'on_logged_in': case 'on_logged_in':
this._onLoggedIn(payload.teamToken, payload.isPasswordStored); this._onLoggedIn(payload.teamToken);
break; break;
case 'on_logged_out': case 'on_logged_out':
this._onLoggedOut(); this._onLoggedOut();
@ -801,8 +801,12 @@ module.exports = React.createClass({
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) {
if (this.props.config.welcomeUserId) {
createRoom({dmUserId: this.props.config.welcomeUserId});
return;
}
// The user has just logged in after registering // The user has just logged in after registering
dis.dispatch({action: 'view_user_settings'}); dis.dispatch({action: 'view_room_directory'});
} else { } else {
this._showScreenAfterLogin(); this._showScreenAfterLogin();
} }