From 3d5e4419940f984dabee1e783aba07242a20f05b Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 24 Feb 2022 18:31:33 +0100
Subject: [PATCH] load settings.json in electron app

---
 app/src/electron.js         | 9 +++++++++
 packages/web/src/App.svelte | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/electron.js b/app/src/electron.js
index 4566c30ec..bbd1ac7c2 100644
--- a/app/src/electron.js
+++ b/app/src/electron.js
@@ -30,6 +30,15 @@ try {
   initialConfig = {};
 }
 
+let settingsJson = {};
+try {
+  const datadir = path.join(os.homedir(), 'dbgate-data');
+  settingsJson = JSON.parse(fs.readFileSync(path.join(datadir, 'settings.json'), { encoding: 'utf-8' }));
+} catch (err) {
+  console.log('Error loading settings.json:', err.message);
+  settingsJson = {};
+}
+
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte
index 6271eea7b..a53fd590d 100644
--- a/packages/web/src/App.svelte
+++ b/packages/web/src/App.svelte
@@ -15,7 +15,7 @@
   import { subscribeConnectionPingers } from './utility/connectionsPinger';
   import { subscribePermissionCompiler } from './utility/hasPermission';
   import { apiCall } from './utility/api';
-  import { getUsedApps } from './utility/metadataLoaders';
+  import { getConfig, getUsedApps } from './utility/metadataLoaders';
   import AppTitleProvider from './utility/AppTitleProvider.svelte';
   import { initTitleBarVisibility } from './utility/common';
 
@@ -34,7 +34,7 @@
 
       const settings = await apiCall('config/get-settings');
       const connections = await apiCall('connections/list');
-      const config = await apiCall('config/get');
+      const config = await getConfig();
       const apps = await getUsedApps();
       loadedApi = settings && connections && config && apps;