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

Add scope parameter to getSessions, fixes #91571

Browse source
This commit is contained in:
Rachel Macfarlane 2020-03-09 12:41:48 -07:00
parent 514f564257
commit 5551d73be9
3 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/vscode.proposed.d.ts vendored
View file

@ -50,7 +50,7 @@ declare module 'vscode' {
readonly displayName: string;
/**
* A [event](#Event) which fires when the array of sessions has changed, or data
* An [event](#Event) which fires when the array of sessions has changed, or data
* within a session has changed.
*/
readonly onDidChangeSessions: Event<void>;
@ -85,7 +85,7 @@ declare module 'vscode' {
* registered, or if the user does not consent to sharing authentication information with
* the extension.
*/
export function getSessions(providerId: string): Thenable<readonly AuthenticationSession[]>;
export function getSessions(providerId: string, scopes: string[]): Thenable<readonly AuthenticationSession[]>;
/**
* Prompt a user to login to create a new authenticaiton session. Rejects if a provider with
@ -95,7 +95,7 @@ declare module 'vscode' {
export function login(providerId: string, scopes: string[]): Thenable<AuthenticationSession>;
/**
* A [event](#Event) which fires when the array of sessions has changed, or data
* An [event](#Event) which fires when the array of sessions has changed, or data
* within a session has changed for a provider. Fires with the ids of the providers
* that have had session data change.
*/

4
src/vs/workbench/api/common/extHost.api.impl.ts
View file

@ -191,8 +191,8 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
hasProvider(providerId: string): boolean {
return extHostAuthentication.hasProvider(providerId);
},
getSessions(providerId: string): Thenable<readonly vscode.AuthenticationSession[]> {
return extHostAuthentication.getSessions(extension, providerId);
getSessions(providerId: string, scopes: string[]): Thenable<readonly vscode.AuthenticationSession[]> {
return extHostAuthentication.getSessions(extension, providerId, scopes);
},
login(providerId: string, scopes: string[]): Thenable<vscode.AuthenticationSession> {
return extHostAuthentication.login(extension, providerId, scopes);

41
src/vs/workbench/api/common/extHostAuthentication.ts
View file

@ -28,32 +28,35 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
return !!this._authenticationProviders.get(providerId);
}
async getSessions(requestingExtension: IExtensionDescription, providerId: string): Promise<readonly vscode.AuthenticationSession[]> {
async getSessions(requestingExtension: IExtensionDescription, providerId: string, scopes: string[]): Promise<readonly vscode.AuthenticationSession[]> {
const provider = this._authenticationProviders.get(providerId);
if (!provider) {
throw new Error(`No authentication provider with id '${providerId}' is currently registered.`);
}
return (await provider.getSessions()).map(session => {
return {
id: session.id,
accountName: session.accountName,
scopes: session.scopes,
getAccessToken: async () => {
const isAllowed = await this._proxy.$getSessionsPrompt(
provider.id,
provider.displayName,
ExtensionIdentifier.toKey(requestingExtension.identifier),
requestingExtension.displayName || requestingExtension.name);
const orderedScopes = scopes.sort().join(' ');
return (await provider.getSessions())
.filter(session => session.scopes.sort().join(' ') === orderedScopes)
.map(session => {
return {
id: session.id,
accountName: session.accountName,
scopes: session.scopes,
getAccessToken: async () => {
const isAllowed = await this._proxy.$getSessionsPrompt(
provider.id,
provider.displayName,
ExtensionIdentifier.toKey(requestingExtension.identifier),
requestingExtension.displayName || requestingExtension.name);
if (!isAllowed) {
throw new Error('User did not consent to token access.');
if (!isAllowed) {
throw new Error('User did not consent to token access.');
}
return session.getAccessToken();
}
return session.getAccessToken();
}
};
});
};
});
}
async login(requestingExtension: IExtensionDescription, providerId: string, scopes: string[]): Promise<vscode.AuthenticationSession> {