Allow changing servers on nonfatal errors

Fixes element-hq/element-web#10016
matrix-org · Jun 13, 2019 · e884ccc · e884ccc
1 parent 446b20c
commit e884ccc
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
@@ -101,16 +101,26 @@ export default class ServerConfig extends React.PureComponent {
             return result;
         } catch (e) {
             console.error(e);
-            let message = _t("Unable to validate homeserver/identity server");
-            if (e.translatedMessage) {
-                message = e.translatedMessage;
-            }
-            this.setState({
-                busy: false,
-                errorText: message,
-            });
 
-            return null;
+            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;
+                }
+                this.setState({
+                    busy: false,
+                    errorText: message,
+                });
+
+
+                return null;
+            }
         }
     }