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 …
This commit is contained in:
David Baker 2016-01-28 16:21:16 +00:00
commit 7301f53807

View file

@ -100,6 +100,10 @@ module.exports = React.createClass({
console.log("Not registering as guest; email invite."); console.log("Not registering as guest; email invite.");
this._autoRegisterAsGuest = false; 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 { else {
this._autoRegisterAsGuest = true; this._autoRegisterAsGuest = true;
} }