maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

proxy - various login dialog fixes

Browse source
This commit is contained in:
Benjamin Pasero 2020-12-01 11:42:07 +01:00
parent c5ffc57ee6
commit d531b6dfe9
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/code/electron-main/app.ts
View file

@ -455,7 +455,7 @@ export class CodeApplication extends Disposable {
}
// Setup Auth Handler (TODO@ben remove old auth handler eventually)
if (this.configurationService.getValue('window.enableExperimentalProxyLoginDialog') !== true) {
if (this.configurationService.getValue('window.enableExperimentalProxyLoginDialog') === false) {
this._register(new ProxyAuthHandler());
} else {
this._register(appInstantiationService.createInstance(ProxyAuthHandler2));

2
src/vs/workbench/contrib/relauncher/browser/relauncher.contribution.ts
View file

@ -36,7 +36,7 @@ export class SettingsChangeRelauncher extends Disposable implements IWorkbenchCo
private updateMode: string | undefined;
private debugConsoleWordWrap: boolean | undefined;
private accessibilitySupport: 'on' | 'off' | 'auto' | undefined;
private enableExperimentalProxyLoginDialog: boolean | undefined;
private enableExperimentalProxyLoginDialog = true; // default
constructor(
@IHostService private readonly hostService: IHostService,

21
src/vs/workbench/electron-sandbox/parts/dialogs/dialog.contribution.ts
View file

@ -60,20 +60,29 @@ export class DialogHandlerContribution extends Disposable implements IWorkbenchC
this.currentDialog = this.model.dialogs[0];
let result: IDialogResult | undefined = undefined;
// Confirm
if (this.currentDialog.args.confirmArgs) {
const args = this.currentDialog.args.confirmArgs;
result = this.useCustomDialog ? await this.browserImpl.confirm(args.confirmation) : await this.nativeImpl.confirm(args.confirmation);
} else if (this.currentDialog.args.inputArgs) {
}
// Input (custom only)
else if (this.currentDialog.args.inputArgs) {
const args = this.currentDialog.args.inputArgs;
result = this.useCustomDialog ?
await this.browserImpl.input(args.severity, args.message, args.buttons, args.inputs, args.options) :
await this.nativeImpl.input(args.severity, args.message, args.buttons, args.inputs, args.options);
} else if (this.currentDialog.args.showArgs) {
result = await this.browserImpl.input(args.severity, args.message, args.buttons, args.inputs, args.options);
}
// Message
else if (this.currentDialog.args.showArgs) {
const args = this.currentDialog.args.showArgs;
result = this.useCustomDialog ?
await this.browserImpl.show(args.severity, args.message, args.buttons, args.options) :
await this.nativeImpl.show(args.severity, args.message, args.buttons, args.options);
} else {
}
// About
else {
await this.nativeImpl.about();
}