imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix registration with email + non-default HS

Browse source 
We were ignoring the hs/is from the query parameters so after
clicking the link, the new client tried to use the wrong server.

Broken by https://github.com/matrix-org/matrix-react-sdk/pull/2941
Fixes https://github.com/vector-im/riot-web/issues/9659
This commit is contained in:
David Baker 2019-06-12 17:42:09 +01:00
parent c425eb83ca
commit 10377b42e9
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/structures/MatrixChat.js
View file

@ -219,6 +219,18 @@ export default React.createClass({
return {serverConfig: props}; return {serverConfig: props};
}, },
getRegisterServerProperties() {
const props = this.getServerProperties();
if (this.state.register_hs_url) {
props.hsUrl = this.state.register_hs_url;
}
if (this.state.register_is_url) {
props.isUrl = this.state.register_is_url;
}
return {serverConfig: props};
},
componentWillMount: function() { componentWillMount: function() {
SdkConfig.put(this.props.config); SdkConfig.put(this.props.config);
@ -1871,7 +1883,7 @@ export default React.createClass({
onLoggedIn={this.onRegistered} onLoggedIn={this.onRegistered}
onLoginClick={this.onLoginClick} onLoginClick={this.onLoginClick}
onServerConfigChange={this.onServerConfigChange} onServerConfigChange={this.onServerConfigChange}
{...this.getServerProperties()} {...this.getRegisterServerProperties()}
/> />
); );
} }