matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Merge pull request #3588 from matrix-org/jryans/identity-disco-opt

Browse Source 
Relax identity server discovery error handling
This commit is contained in:
J. Ryan Stinnett
2019-11-18 17:09:08 +00:00
committed by GitHub
parent 31b2d263f2 446e21c2e1
commit d5d2f7f936
2 changed files with 32 additions and 14 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,