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} /> + {(proxyPassword || proxyUsername) && ( + + Some resources, such as map data for geographic visualizations, cannot + currently be loaded through proxies which require authentication. + + )} ); }; diff --git a/packages/compass/src/main/application.ts b/packages/compass/src/main/application.ts index 37207a21ced..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'; @@ -323,19 +322,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);