Revert "chore: proxy feature is always turned on: remove 'enabled' flag"

This reverts commit 2772cb2e3e75f16b3dc96a2441518ed0772e3ba1.

1 files changed, 20 insertions, 9 deletions

diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index 125b4729f..eb7116651 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -1,26 +1,37 @@
-import { autorun } from 'mobx';
+import { autorun, observable } from 'mobx';
 import { session } from '@electron/remote';
 
 const debug = require('debug')('Ferdi:feature:serviceProxy');
 
+export const config = observable({
+  isEnabled: true,
+});
+
 export default function init(stores) {
   debug('Initializing `serviceProxy` feature');
 
   autorun(() => {
+    config.isEnabled = true;
+
     const services = stores.services.enabled;
     const proxySettings = stores.settings.proxy;
 
     debug('Service Proxy autorun');
 
     services.forEach((service) => {
-      const serviceProxyConfig = proxySettings[service.id];
-      if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
-        const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`;
-        debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
-
-        session.fromPartition(`persist:service-${service.id}`).setProxy({ proxyRules: proxyHost }, () => {
-          debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`);
-        });
+      const s = session.fromPartition(`persist:service-${service.id}`);
+
+      if (config.isEnabled) {
+        const serviceProxyConfig = proxySettings[service.id];
+
+        if (serviceProxyConfig && serviceProxyConfig.isEnabled && serviceProxyConfig.host) {
+          const proxyHost = `${serviceProxyConfig.host}${serviceProxyConfig.port ? `:${serviceProxyConfig.port}` : ''}`;
+          debug(`Setting proxy config from service settings for "${service.name}" (${service.id}) to`, proxyHost);
+
+          s.setProxy({ proxyRules: proxyHost }, () => {
+            debug(`Using proxy "${proxyHost}" for "${service.name}" (${service.id})`);
+          });
+        }
       }
     });
   });