development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix select session behavior, fixes #117266

Browse source
This commit is contained in:
Rachel Macfarlane 2021-02-22 09:39:52 -08:00
parent 31aa03fcc8
commit 42e8d3eeb8
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/vs/workbench/api/browser/mainThreadAuthentication.ts
View file

@ -177,7 +177,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
}
private async selectSession(providerId: string, extensionId: string, extensionName: string, potentialSessions: readonly modes.AuthenticationSession[], clearSessionPreference: boolean): Promise<modes.AuthenticationSession> {
private async selectSession(providerId: string, extensionId: string, extensionName: string, potentialSessions: readonly modes.AuthenticationSession[], clearSessionPreference: boolean, silent: boolean): Promise<modes.AuthenticationSession | undefined> {
if (!potentialSessions.length) {
throw new Error('No potential sessions found');
}
@ -191,9 +191,14 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
if (matchingSession) {
const allowed = this.authenticationService.isAccessAllowed(providerId, matchingSession.account.label, extensionId);
if (!allowed) {
const didAcceptPrompt = await this.authenticationService.showGetSessionPrompt(providerId, matchingSession.account.label, extensionId, extensionName);
if (!didAcceptPrompt) {
throw new Error('User did not consent to login.');
if (!silent) {
const didAcceptPrompt = await this.authenticationService.showGetSessionPrompt(providerId, matchingSession.account.label, extensionId, extensionName);
if (!didAcceptPrompt) {
throw new Error('User did not consent to login.');
}
} else {
this.authenticationService.requestSessionAccess(providerId, extensionId, extensionName, potentialSessions);
return undefined;
}
}
@ -202,6 +207,11 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
}
}
if (silent) {
this.authenticationService.requestSessionAccess(providerId, extensionId, extensionName, potentialSessions);
return undefined;
}
return this.authenticationService.selectSession(providerId, extensionId, extensionName, potentialSessions);
}
@ -228,12 +238,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
}
}
} else {
if (!silent) {
session = await this.selectSession(providerId, extensionId, extensionName, sessions, !!options.clearSessionPreference);
} else {
this.authenticationService.requestSessionAccess(providerId, extensionId, extensionName, sessions);
return undefined;
}
return this.selectSession(providerId, extensionId, extensionName, sessions, !!options.clearSessionPreference, silent);
}
} else {
if (!silent) {