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

Merge pull request #3218 from matrix-org/travis/check-when-dead

Browse source 
Check for liveliness on submission when the server was previously dead
This commit is contained in:
Travis Ralston 2019-07-15 14:46:55 -06:00 committed by GitHub
commit 2471f92331
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,9 +145,31 @@ module.exports = React.createClass({
return this.state.busy || this.props.busy;
},
onPasswordLogin: function(username, phoneCountry, phoneNumber, password) {
onPasswordLogin: async function(username, phoneCountry, phoneNumber, password) {
if (!this.state.serverIsAlive) {
this.setState({busy: true});
// Do a quick liveliness check on the URLs
let aliveAgain = true;
try {
await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(
this.props.serverConfig.hsUrl,
this.props.serverConfig.isUrl,
);
this.setState({serverIsAlive: true, errorText: ""});
} catch (e) {
const componentState = AutoDiscoveryUtils.authComponentStateForError(e);
this.setState({
busy: false,
...componentState,
});
aliveAgain = !componentState.serverErrorIsFatal;
}
// Prevent people from submitting their password when something isn't right.
if (this.isBusy()) return;
if (!aliveAgain) {
return;
}
}
this.setState({
busy: true,