OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow changing servers on nonfatal errors 

Fixes https://github.com/vector-im/riot-web/issues/10016
pull/21833/head
David Baker 2019-06-13 18:23:33 +01:00
parent 446b20c454
commit e884cccabe
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/auth/ServerConfig.js
View File

@ -101,6 +101,14 @@ export default class ServerConfig extends React.PureComponent {
return result; return result;
} catch (e) { } catch (e) {
console.error(e); console.error(e);
const stateForError = AutoDiscoveryUtils.authComponentStateForError(e);
if (!stateForError.isFatalError) {
// carry on anyway
const result = await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl, true);
this.props.onServerConfigChange(result);
return result;
} else {
let message = _t("Unable to validate homeserver/identity server"); let message = _t("Unable to validate homeserver/identity server");
if (e.translatedMessage) { if (e.translatedMessage) {
message = e.translatedMessage; message = e.translatedMessage;
@ -110,9 +118,11 @@ export default class ServerConfig extends React.PureComponent {
errorText: message, errorText: message,
}); });
return null; return null;
} }
} }
}
onHomeserverBlur = (ev) => { onHomeserverBlur = (ev) => {
this._hsTimeoutId = this._waitThenInvoke(this._hsTimeoutId, () => { this._hsTimeoutId = this._waitThenInvoke(this._hsTimeoutId, () => {