Matrix/element-web
Matrix/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-09-09 22:55:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't repackage the ValidatedDiscoveryConfig

Browse source 
It's usable as-is, and we can add things to it when we need to (ie: integrations).
This commit is contained in:
Travis Ralston 2019-04-17 21:44:52 -06:00
parent c8caf6797d
commit e7bf643d8b
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vector/index.js
View file

@ -494,30 +494,13 @@ async function verifyServerConfig() {
}
const validatedConfig = AutoDiscoveryUtils.buildValidatedConfigFromDiscovery(serverName, result);
// Just in case we ever have to debug this
console.log("Using homeserver config:", validatedConfig);
// Build our own discovery result for distribution within the app
const configResult = {
"m.homeserver": {
"base_url": validatedConfig.hsUrl,
"server_name": validatedConfig.hsName,
"server_name_different": validatedConfig.hsNameIsDifferent,
},
"m.identity_server": {
"base_url": validatedConfig.isUrl,
"enabled": validatedConfig.identityEnabled,
},
};
// Copy over any other keys that may be of interest
for (const key of Object.keys(result)) {
if (key === "m.homeserver" || key === "m.identity_server") continue;
configResult[key] = JSON.parse(JSON.stringify(result[key])); // deep clone
}
// Add the newly built config to the actual config for use by the app
console.log("Updating SdkConfig with validated discovery information");
SdkConfig.add({"validated_discovery_config": configResult});
SdkConfig.add({"validated_discovery_config": validatedConfig});
return SdkConfig.get();
}