Merge pull request #3102 from matrix-org/dbkr/nonfatal_errors_are_not…

…_fatal Allow changing servers on nonfatal errors
matrix-org · Jun 13, 2019 · 2a7301f · 2a7301f
2 parents 446b20c + 06a11f4
commit 2a7301f
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/src/components/views/auth/ServerConfig.js b/src/components/views/auth/ServerConfig.js
@@ -101,16 +101,25 @@ 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;
+            }
         }
     }