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

Merge branch 'develop' into t3chguy/remove_bluebird

Browse source
This commit is contained in:
Michael Telatynski 2019-11-20 15:21:23 +00:00 • committed by GitHub
commit 6121420113
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 1838 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -378,8 +378,19 @@ module.exports = createReactClass({
// Do a quick liveliness check on the URLs
try {
await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
this.setState({serverIsAlive: true, errorText: ""});
const { warning } =
await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
if (warning) {
this.setState({
...AutoDiscoveryUtils.authComponentStateForError(warning),
errorText: "",
});
} else {
this.setState({
serverIsAlive: true,
errorText: "",
});
}
} catch (e) {
this.setState({
busy: false,