gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use domain config json as override instead of one or the other 

fixes #6843

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2018-06-06 12:40:00 +01:00
parent 10881587e9
commit 88c2158474
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/vector/index.js
View File

@ -234,19 +234,34 @@ async function loadApp() {
// set the platform for react sdk (our Platform object automatically picks the right one)
PlatformPeg.set(new Platform());
// Load the config file. First try to load up a domain-specific config of the
// form "config.$domain.json" and if that fails, fall back to config.json.
// Load `config.json` and `config.$domain.json`, with 2 overriding 1 if both exist,
// otherwise using whichever of the 2 exists.
let configJson;
let configError;
// Load both config files concurrently
const configDomainPromise = getConfig(`config.${document.domain}.json`);
const configPromise = getConfig('config.json');
// try and use the base `config.json`
try {
try {
configJson = await getConfig(`config.${document.domain}.json`);
// 404s succeed with an empty json config, so check that there are keys
if (Object.keys(configJson).length === 0) {
throw new Error(); // throw to enter the catch
configJson = await configPromise;
if (Object.keys(configJson).length === 0) throw new Error();
} catch (e) {
configError = e;
}
// If domain-specific exists, use it to override values from `config.json` if that loaded.
try {
const config = await configDomainPromise;
// 404s succeed with an empty json config, so check that there are keys
if (Object.keys(config).length > 0) {
if (configError) {
// if configError is set at this point then we can't override fields so lets just try domain config
configJson = config;
// use the domain config as sole config, clear previous error
configError = undefined;
} else {
configJson = Object.assign(configJson, config);
}
} catch (e) {
configJson = await getConfig("config.json");
}
} catch (e) {
configError = e;