Skip to content

fix(proxy): do not lock users out of Compass when using authenticated proxies COMPASS-8382 #6385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2024
Merged

fix(proxy): do not lock users out of Compass when using authenticated proxies COMPASS-8382 #6385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0169ac
fix(proxy): do not lock users out of Compass when using authenticated…
addaleax Oct 22, 2024
c0bd794
fixup: check
addaleax Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/compass-settings/src/components/settings/proxy-settings-custom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
Banner,
Description,
FormFieldContainer,
Label,
Expand Down Expand Up @@ -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>
);
};
15 changes: 1 addition & 14 deletions packages/compass/src/main/application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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);
Expand Down
Loading