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

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.
pull/21833/head
J. Ryan Stinnett 2019-09-06 11:11:54 +01:00
parent 2ff592c542
commit 19fff51b01
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/views/settings/SetIdServer.js
View File

@ -165,7 +165,18 @@ export default class SetIdServer extends React.Component {
let save = true; let save = true;
// Double check that the identity server even has terms of service. // 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) { if (!terms || !terms["policies"] || Object.keys(terms["policies"]).length <= 0) {
const [confirmed] = await this._showNoTermsWarning(fullUrl); const [confirmed] = await this._showNoTermsWarning(fullUrl);
save &= confirmed; save &= confirmed;
@ -194,10 +205,6 @@ export default class SetIdServer extends React.Component {
} }
} catch (e) { } catch (e) {
console.error(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."); errStr = _t("Terms of service not accepted or the identity server is invalid.");
} }
} }