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

3 files changed, 77 insertions, 97 deletions

diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index c41cdd56a..23c667b82 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -144,7 +144,6 @@ export default @observer class EditServiceForm extends Component {
     openRecipeFile: PropTypes.func.isRequired,
     isSaving: PropTypes.bool.isRequired,
     isDeleting: PropTypes.bool.isRequired,
-    isProxyFeatureEnabled: PropTypes.bool.isRequired,
   };
 
   static defaultProps = {
@@ -206,7 +205,6 @@ export default @observer class EditServiceForm extends Component {
       isDeleting,
       onDelete,
       openRecipeFile,
-      isProxyFeatureEnabled,
     } = this.props;
     const { intl } = this.context;
 
@@ -370,42 +368,40 @@ export default @observer class EditServiceForm extends Component {
               </div>
             )}
 
-            {isProxyFeatureEnabled && (
-              <div className="settings__settings-group">
-                <h3>
-                  {intl.formatMessage(messages.headlineProxy)}
-                  <span className="badge badge--success">beta</span>
-                </h3>
-                <Toggle field={form.$('proxy.isEnabled')} />
-                {form.$('proxy.isEnabled').value && (
-                  <>
-                    <div className="grid">
-                      <div className="grid__row">
-                        <Input field={form.$('proxy.host')} className="proxyHost" />
-                        <Input field={form.$('proxy.port')} />
-                      </div>
+            <div className="settings__settings-group">
+              <h3>
+                {intl.formatMessage(messages.headlineProxy)}
+                <span className="badge badge--success">beta</span>
+              </h3>
+              <Toggle field={form.$('proxy.isEnabled')} />
+              {form.$('proxy.isEnabled').value && (
+                <>
+                  <div className="grid">
+                    <div className="grid__row">
+                      <Input field={form.$('proxy.host')} className="proxyHost" />
+                      <Input field={form.$('proxy.port')} />
                     </div>
-                    <div className="grid">
-                      <div className="grid__row">
-                        <Input field={form.$('proxy.user')} />
-                        <Input
-                          field={form.$('proxy.password')}
-                          showPasswordToggle
-                        />
-                      </div>
+                  </div>
+                  <div className="grid">
+                    <div className="grid__row">
+                      <Input field={form.$('proxy.user')} />
+                      <Input
+                        field={form.$('proxy.password')}
+                        showPasswordToggle
+                      />
                     </div>
-                    <p>
-                      <span className="mdi mdi-information" />
-                      {intl.formatMessage(messages.proxyRestartInfo)}
-                    </p>
-                    <p>
-                      <span className="mdi mdi-information" />
-                      {intl.formatMessage(messages.proxyInfo)}
-                    </p>
-                  </>
-                )}
-              </div>
-            )}
+                  </div>
+                  <p>
+                    <span className="mdi mdi-information" />
+                    {intl.formatMessage(messages.proxyRestartInfo)}
+                  </p>
+                  <p>
+                    <span className="mdi mdi-information" />
+                    {intl.formatMessage(messages.proxyInfo)}
+                  </p>
+                </>
+              )}
+            </div>
 
             <div className="user-agent">
               <Input field={form.$('userAgentPref')} />
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index c880e97ae..3a66a27e6 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -18,8 +18,6 @@ import ErrorBoundary from '../../components/util/ErrorBoundary';
 import { required, url, oneRequired } from '../../helpers/validation-helpers';
 import { getSelectOptions } from '../../helpers/i18n-helpers';
 
-import { config as proxyFeature } from '../../features/serviceProxy';
-
 import { SPELLCHECKER_LOCALES } from '../../i18n/languages';
 
 import globalMessages from '../../i18n/globalMessages';
@@ -131,7 +129,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     }
   }
 
-  prepareForm(recipe, service, proxy) {
+  prepareForm(recipe, service) {
     const {
       intl,
     } = this.context;
@@ -275,44 +273,42 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
       });
     }
 
-    if (proxy.isEnabled) {
-      const serviceProxyConfig = stores.settings.proxy[service.id] || {};
-
-      Object.assign(config.fields, {
-        proxy: {
-          name: 'proxy',
-          label: 'proxy',
-          fields: {
-            isEnabled: {
-              label: intl.formatMessage(messages.enableProxy),
-              value: serviceProxyConfig.isEnabled,
-              default: false,
-            },
-            host: {
-              label: intl.formatMessage(messages.proxyHost),
-              value: serviceProxyConfig.host,
-              default: '',
-            },
-            port: {
-              label: intl.formatMessage(messages.proxyPort),
-              value: serviceProxyConfig.port,
-              default: '',
-            },
-            user: {
-              label: intl.formatMessage(messages.proxyUser),
-              value: serviceProxyConfig.user,
-              default: '',
-            },
-            password: {
-              label: intl.formatMessage(messages.proxyPassword),
-              value: serviceProxyConfig.password,
-              default: '',
-              type: 'password',
-            },
+    const serviceProxyConfig = stores.settings.proxy[service.id] || {};
+
+    Object.assign(config.fields, {
+      proxy: {
+        name: 'proxy',
+        label: 'proxy',
+        fields: {
+          isEnabled: {
+            label: intl.formatMessage(messages.enableProxy),
+            value: serviceProxyConfig.isEnabled,
+            default: false,
+          },
+          host: {
+            label: intl.formatMessage(messages.proxyHost),
+            value: serviceProxyConfig.host,
+            default: '',
+          },
+          port: {
+            label: intl.formatMessage(messages.proxyPort),
+            value: serviceProxyConfig.port,
+            default: '',
+          },
+          user: {
+            label: intl.formatMessage(messages.proxyUser),
+            value: serviceProxyConfig.user,
+            default: '',
+          },
+          password: {
+            label: intl.formatMessage(messages.proxyPassword),
+            value: serviceProxyConfig.password,
+            default: '',
+            type: 'password',
           },
         },
-      });
-    }
+      },
+    });
 
     return new Form(config);
   }
@@ -381,7 +377,7 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
       );
     }
 
-    const form = this.prepareForm(recipe, service, proxyFeature);
+    const form = this.prepareForm(recipe, service);
 
     return (
       <ErrorBoundary>
@@ -397,7 +393,6 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           onSubmit={(d) => this.onSubmit(d)}
           onDelete={() => this.deleteService()}
           openRecipeFile={(file) => this.openRecipeFile(file)}
-          isProxyFeatureEnabled={proxyFeature.isEnabled}
         />
       </ErrorBoundary>
     );
diff --git a/src/features/serviceProxy/index.js b/src/features/serviceProxy/index.js
index eb7116651..125b4729f 100644
--- a/src/features/serviceProxy/index.js
+++ b/src/features/serviceProxy/index.js
@@ -1,37 +1,26 @@
-import { autorun, observable } from 'mobx';
+import { autorun } 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 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})`);
-          });
-        }
+      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})`);
+        });
       }
     });
   });