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

Merge pull request #121 from matrix-org/dbkr/fix_registration_guest_access 

Fix registration: don't auto-log in as a guest if we have a URL from …
pull/21833/head
David Baker 2016-01-28 16:21:16 +00:00
parent 6bb69ef2d1 401d18bcc6
commit 7301f53807
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,10 @@ module.exports = React.createClass({
console.log("Not registering as guest; email invite.");
this._autoRegisterAsGuest = false;
}
else if (this.props.startingQueryParams.client_secret && this.props.startingQueryParams.sid) {
console.log("Not registering as guest; registration.");
this._autoRegisterAsGuest = false;
}
else {
this._autoRegisterAsGuest = true;
}