Merge branch 'refactor-default-settings'

2 files changed, 73 insertions, 67 deletions

diff --git a/gui/src/main/default-settings.ts b/gui/src/main/default-settings.ts
new file mode 100644
index 0000000000..13650926a4
--- /dev/null
+++ b/gui/src/main/default-settings.ts
@@ -0,0 +1,70 @@
+import { ISettings, ObfuscationType, Ownership } from '../shared/daemon-rpc-types';
+
+export function getDefaultSettings(): ISettings {
+  return {
+    allowLan: false,
+    autoConnect: false,
+    blockWhenDisconnected: false,
+    showBetaReleases: false,
+    splitTunnel: {
+      enableExclusions: false,
+      appsList: [],
+    },
+    relaySettings: {
+      normal: {
+        location: 'any',
+        tunnelProtocol: 'any',
+        providers: [],
+        ownership: Ownership.any,
+        openvpnConstraints: {
+          port: 'any',
+          protocol: 'any',
+        },
+        wireguardConstraints: {
+          port: 'any',
+          ipVersion: 'any',
+          useMultihop: false,
+          entryLocation: 'any',
+        },
+      },
+    },
+    bridgeSettings: {
+      normal: {
+        location: 'any',
+        providers: [],
+        ownership: Ownership.any,
+      },
+    },
+    bridgeState: 'auto',
+    tunnelOptions: {
+      generic: {
+        enableIpv6: false,
+      },
+      openvpn: {
+        mssfix: undefined,
+      },
+      wireguard: {
+        mtu: undefined,
+      },
+      dns: {
+        state: 'default',
+        defaultOptions: {
+          blockAds: false,
+          blockTrackers: false,
+          blockMalware: false,
+          blockAdultContent: false,
+          blockGambling: false,
+        },
+        customOptions: {
+          addresses: [],
+        },
+      },
+    },
+    obfuscationSettings: {
+      selectedObfuscation: ObfuscationType.auto,
+      udp2tcpSettings: {
+        port: 'any',
+      },
+    },
+  };
+}
diff --git a/gui/src/main/settings.ts b/gui/src/main/settings.ts
index 3a12852011..26fd14e0fa 100644
--- a/gui/src/main/settings.ts
+++ b/gui/src/main/settings.ts
@@ -1,9 +1,10 @@
 import BridgeSettingsBuilder from '../shared/bridge-settings-builder';
-import { ISettings, ObfuscationType, Ownership } from '../shared/daemon-rpc-types';
+import { ISettings } from '../shared/daemon-rpc-types';
 import { ICurrentAppVersionInfo } from '../shared/ipc-types';
 import log from '../shared/logging';
 import { getOpenAtLogin, setOpenAtLogin } from './autostart';
 import { DaemonRpc } from './daemon-rpc';
+import { getDefaultSettings } from './default-settings';
 import GuiSettings from './gui-settings';
 import { IpcMainEventChannel } from './ipc-event-channel';
 
@@ -15,72 +16,7 @@ export interface SettingsDelegate {
 export default class Settings implements Readonly<ISettings> {
   private guiSettings = new GuiSettings();
 
-  private settingsValue: ISettings = {
-    allowLan: false,
-    autoConnect: false,
-    blockWhenDisconnected: false,
-    showBetaReleases: false,
-    splitTunnel: {
-      enableExclusions: false,
-      appsList: [],
-    },
-    relaySettings: {
-      normal: {
-        location: 'any',
-        tunnelProtocol: 'any',
-        providers: [],
-        ownership: Ownership.any,
-        openvpnConstraints: {
-          port: 'any',
-          protocol: 'any',
-        },
-        wireguardConstraints: {
-          port: 'any',
-          ipVersion: 'any',
-          useMultihop: false,
-          entryLocation: 'any',
-        },
-      },
-    },
-    bridgeSettings: {
-      normal: {
-        location: 'any',
-        providers: [],
-        ownership: Ownership.any,
-      },
-    },
-    bridgeState: 'auto',
-    tunnelOptions: {
-      generic: {
-        enableIpv6: false,
-      },
-      openvpn: {
-        mssfix: undefined,
-      },
-      wireguard: {
-        mtu: undefined,
-      },
-      dns: {
-        state: 'default',
-        defaultOptions: {
-          blockAds: false,
-          blockTrackers: false,
-          blockMalware: false,
-          blockAdultContent: false,
-          blockGambling: false,
-        },
-        customOptions: {
-          addresses: [],
-        },
-      },
-    },
-    obfuscationSettings: {
-      selectedObfuscation: ObfuscationType.auto,
-      udp2tcpSettings: {
-        port: 'any',
-      },
-    },
-  };
+  private settingsValue = getDefaultSettings();
 
   public constructor(
     private delegate: SettingsDelegate,