PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Clear the login busy state after .well-known discovery

Browse source 
This always clear the login busy state after .well-known discovery without
waiting for the resulting server config. This is important for the case where
the HS that a full MXID resolves to matches the default HS, as without it we'd
be stuck in a busy state forever.

Fixes https://github.com/vector-im/riot-web/issues/10014
This commit is contained in:
J. Ryan Stinnett 2019-06-11 15:41:47 +01:00
parent f07aff2816
commit 21099052fc
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/structures/auth/Login.js
View file

@ -241,7 +241,7 @@ module.exports = React.createClass({
const doWellknownLookup = username[0] === "@";
this.setState({
username: username,
busy: doWellknownLookup, // unset later by the result of onServerConfigChange
busy: doWellknownLookup,
errorText: null,
canTryLogin: true,
});
@ -250,6 +250,16 @@ module.exports = React.createClass({
try {
const result = await AutoDiscoveryUtils.validateServerName(serverName);
this.props.onServerConfigChange(result);
// We'd like to rely on new props coming in via `onServerConfigChange`
// so that we know the servers have definitely updated before clearing
// the busy state. In the case of a full MXID that resolves to the same
// HS as Riot's default HS though, there may not be any server change.
// To avoid this trap, we clear busy here. For cases where the server
// actually has changed, `_initLoginLogic` will be called and manages
// busy state for its own liveness check.
this.setState({
busy: false,
});
} catch (e) {
console.error("Problem parsing URL or unhandled error doing .well-known discovery:", e);