From a0169ac939e0984e1116caff72ce968fe9a0aff1 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Tue, 22 Oct 2024 12:19:47 +0200
Subject: [PATCH 1/2] fix(proxy): do not lock users out of Compass when using
 authenticated proxies COMPASS-8382

---
 .../components/settings/proxy-settings-custom.tsx  |  7 +++++++
 packages/compass/src/main/application.ts           | 14 +-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/packages/compass-settings/src/components/settings/proxy-settings-custom.tsx b/packages/compass-settings/src/components/settings/proxy-settings-custom.tsx
index c3c7a85a5d4..3e123e20e5d 100644
--- a/packages/compass-settings/src/components/settings/proxy-settings-custom.tsx
+++ b/packages/compass-settings/src/components/settings/proxy-settings-custom.tsx
@@ -1,4 +1,5 @@
 import {
+  Banner,
   Description,
   FormFieldContainer,
   Label,
@@ -197,6 +198,12 @@ export const ProxySettingsCustom: React.FunctionComponent<
           disabled={disabled}
         />
       </FormFieldContainer>
+      {(proxyPassword || proxyUsername) && (
+        <Banner variant="warning">
+          Some resources, such as map data for geographic visualizations, cannot
+          currently be loaded through proxies which require authentication.
+        </Banner>
+      )}
     </div>
   );
 };
diff --git a/packages/compass/src/main/application.ts b/packages/compass/src/main/application.ts
index 37207a21ced..fe64f95b9eb 100644
--- a/packages/compass/src/main/application.ts
+++ b/packages/compass/src/main/application.ts
@@ -323,19 +323,7 @@ class CompassApplication {
               error: headline,
             }
           );
-
-          const sep = path.sep;
-          const configPath = `${app.getPath(
-            'userData'
-          )}${sep}AppPreferences${sep}General.json`;
-
-          dialog.showErrorBox(
-            'Unsupported proxy configuration',
-            `${headline}\n\n
-            To reset the proxy configuration, remove the "proxy" key in ${configPath} and restart Compass.`
-          );
-
-          app.quit();
+          await target.setProxy({});
         }
 
         const agent = createAgent(proxyOptions);

From c0bd7942fc9c45d8b8f8d7d158f7d0dff5a3679c Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Tue, 22 Oct 2024 12:48:30 +0200
Subject: [PATCH 2/2] fixup: check

---
 packages/compass/src/main/application.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/compass/src/main/application.ts b/packages/compass/src/main/application.ts
index fe64f95b9eb..be6e8e8e605 100644
--- a/packages/compass/src/main/application.ts
+++ b/packages/compass/src/main/application.ts
@@ -2,7 +2,6 @@ import './disable-node-deprecations'; // Separate module so it runs first
 import path from 'path';
 import { EventEmitter } from 'events';
 import type { BrowserWindow, Event, ProxyConfig } from 'electron';
-import { dialog } from 'electron';
 import { app, safeStorage, session } from 'electron';
 import { ipcMain } from 'hadron-ipc';
 import type { AutoUpdateManagerState } from './auto-update-manager';