From 19fff51b01a1494dfca432d00ed3c0a91cdbad61 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 6 Sep 2019 11:11:54 +0100
Subject: [PATCH] Rework handling for terms CORS error

Earlier changes in this branch removed the "next step" of saving from the
dialogs, so we need to fold in the CORS error case.
---
 src/components/views/settings/SetIdServer.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index ebd97cebc1..20524d8ae3 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -165,7 +165,18 @@ export default class SetIdServer extends React.Component {
                 let save = true;
 
                 // Double check that the identity server even has terms of service.
-                const terms = await MatrixClientPeg.get().getTerms(SERVICE_TYPES.IS, fullUrl);
+                let terms;
+                try {
+                    terms = await MatrixClientPeg.get().getTerms(SERVICE_TYPES.IS, fullUrl);
+                } catch (e) {
+                    console.error(e);
+                    if (e.cors === "rejected" || e.httpStatus === 404) {
+                        terms = null;
+                    } else {
+                        throw e;
+                    }
+                }
+
                 if (!terms || !terms["policies"] || Object.keys(terms["policies"]).length <= 0) {
                     const [confirmed] = await this._showNoTermsWarning(fullUrl);
                     save &= confirmed;
@@ -194,10 +205,6 @@ export default class SetIdServer extends React.Component {
                 }
             } catch (e) {
                 console.error(e);
-                if (e.cors === "rejected" || e.httpStatus === 404) {
-                    this._showNoTermsWarning(fullUrl);
-                    return;
-                }
                 errStr = _t("Terms of service not accepted or the identity server is invalid.");
             }
         }