PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Use new js-sdk properties for getting discovery errors

Browse source 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/899
This commit is contained in:
Travis Ralston 2019-04-15 22:06:24 -06:00
parent f08491cee8
commit 5445632026
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/vector/index.js
View file

@ -448,20 +448,6 @@ async function loadLanguage() {
async function verifyServerConfig() { async function verifyServerConfig() {
console.log("Verifying homeserver configuration"); console.log("Verifying homeserver configuration");
// Errors which can be returned by .well-known lookups. If autodiscovery fails for unexpected reasons,
// the last thing we want is "missing-translation|en:Your error here". The actual strings are also defined
// in the react-sdk, so we don't need them here.
const discoveryErrors = [
"Invalid homeserver discovery response",
"Failed to get autodiscovery configuration from server",
"Invalid base_url for m.homeserver",
"Homeserver URL does not appear to be a valid Matrix homeserver",
"Invalid identity server discovery response",
"Invalid base_url for m.identity_server",
"Identity server URL does not appear to be a valid identity server",
"General failure",
];
const config = SdkConfig.get(); const config = SdkConfig.get();
let wkConfig = config['default_server_config']; // overwritten later under some conditions let wkConfig = config['default_server_config']; // overwritten later under some conditions
const serverName = config['default_server_name']; const serverName = config['default_server_name'];
@ -512,7 +498,7 @@ async function verifyServerConfig() {
const hsResult = result['m.homeserver']; const hsResult = result['m.homeserver'];
if (hsResult.state !== AutoDiscovery.SUCCESS) { if (hsResult.state !== AutoDiscovery.SUCCESS) {
if (discoveryErrors.indexOf(hsResult.error) !== -1) { if (AutoDiscovery.ALL_ERRORS.indexOf(hsResult.error) !== -1) {
throw newTranslatableError(hsResult.error); throw newTranslatableError(hsResult.error);
} }
throw newTranslatableError(_td("Unexpected error resolving homeserver configuration")); throw newTranslatableError(_td("Unexpected error resolving homeserver configuration"));