Merge pull request #3102 from matrix-org/dbkr/nonfatal_errors_are_not_fatal

Allow changing servers on nonfatal errors

src/components/views/auth/ServerConfig.js

@@ -101,6 +101,14 @@ export default class ServerConfig extends React.PureComponent {
             return result;
         } catch (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");
                 if (e.translatedMessage) {
                     message = e.translatedMessage;
@@ -113,6 +121,7 @@ export default class ServerConfig extends React.PureComponent {
                 return null;
             }
         }
+    }
 
     onHomeserverBlur = (ev) => {
         this._hsTimeoutId = this._waitThenInvoke(this._hsTimeoutId, () => {