Ensure account preference set after login flow completes

Rachel Macfarlane · Rachel Macfarlane · commit 357fe6956c84 · 2020-07-20T14:23:14.000-07:00
diff --git a/src/vs/workbench/api/browser/mainThreadAuthentication.ts b/src/vs/workbench/api/browser/mainThreadAuthentication.ts
@@ -294,7 +294,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 				}
 
 				const session = await this.authenticationService.login(providerId, scopes);
-				await this.$setTrustedExtension(providerId, session.account.label, extensionId, extensionName);
+				await this.$setTrustedExtensionAndAccountPreference(providerId, session.account.label, extensionId, extensionName, session.id);
 				return session;
 			} else {
 				await this.$requestNewSession(providerId, scopes, extensionId, extensionName);
@@ -427,11 +427,13 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu
 		return choice === 0;
 	}
 
-	async $setTrustedExtension(providerId: string, accountName: string, extensionId: string, extensionName: string): Promise<void> {
+	async $setTrustedExtensionAndAccountPreference(providerId: string, accountName: string, extensionId: string, extensionName: string, sessionId: string): Promise<void> {
 		const allowList = readAllowedExtensions(this.storageService, providerId, accountName);
 		if (!allowList.find(allowed => allowed.id === extensionId)) {
 			allowList.push({ id: extensionId, name: extensionName });
 			this.storageService.store(`${providerId}-${accountName}`, JSON.stringify(allowList), StorageScope.GLOBAL);
 		}
+
+		this.storageService.store(`${extensionName}-${providerId}`, sessionId, StorageScope.GLOBAL);
 	}
 }
diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts
@@ -165,7 +165,7 @@ export interface MainThreadAuthenticationShape extends IDisposable {
 	$selectSession(providerId: string, providerName: string, extensionId: string, extensionName: string, potentialSessions: modes.AuthenticationSession[], scopes: string[], clearSessionPreference: boolean): Promise<modes.AuthenticationSession>;
 	$getSessionsPrompt(providerId: string, accountName: string, providerName: string, extensionId: string, extensionName: string): Promise<boolean>;
 	$loginPrompt(providerName: string, extensionName: string): Promise<boolean>;
-	$setTrustedExtension(providerId: string, accountName: string, extensionId: string, extensionName: string): Promise<void>;
+	$setTrustedExtensionAndAccountPreference(providerId: string, accountName: string, extensionId: string, extensionName: string, sessionId: string): Promise<void>;
 	$requestNewSession(providerId: string, scopes: string[], extensionId: string, extensionName: string): Promise<void>;
 
 	$getSessions(providerId: string): Promise<ReadonlyArray<modes.AuthenticationSession>>;
diff --git a/src/vs/workbench/api/common/extHostAuthentication.ts b/src/vs/workbench/api/common/extHostAuthentication.ts
@@ -75,7 +75,7 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {
 				}
 
 				const session = await provider.login(scopes);
-				await this._proxy.$setTrustedExtension(providerId, session.account.label, extensionId, extensionName);
+				await this._proxy.$setTrustedExtensionAndAccountPreference(providerId, session.account.label, extensionId, extensionName, session.id);
 				return session;
 			} else {
 				await this._proxy.$requestNewSession(providerId, scopes, extensionId, extensionName);

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`const session = await this.authenticationService.login(providerId, scopes);`
`297`		`- await this.$setTrustedExtension(providerId, session.account.label, extensionId, extensionName);`
	`297`	`+ await this.$setTrustedExtensionAndAccountPreference(providerId, session.account.label, extensionId, extensionName, session.id);`
`298`	`298`	`return session;`
`299`	`299`	`} else {`
`300`	`300`	`await this.$requestNewSession(providerId, scopes, extensionId, extensionName);`
`@@ -427,11 +427,13 @@ export class MainThreadAuthentication extends Disposable implements MainThreadAu`
`427`	`427`	`return choice === 0;`
`428`	`428`	`}`
`429`	`429`
`430`		`- async $setTrustedExtension(providerId: string, accountName: string, extensionId: string, extensionName: string): Promise<void> {`
	`430`	`+ async $setTrustedExtensionAndAccountPreference(providerId: string, accountName: string, extensionId: string, extensionName: string, sessionId: string): Promise<void> {`
`431`	`431`	`const allowList = readAllowedExtensions(this.storageService, providerId, accountName);`
`432`	`432`	`if (!allowList.find(allowed => allowed.id === extensionId)) {`
`433`	`433`	`allowList.push({ id: extensionId, name: extensionName });`
`434`	`434`	this.storageService.store(`${providerId}-${accountName}`, JSON.stringify(allowList), StorageScope.GLOBAL);
`435`	`435`	`}`
	`436`	`+`
	`437`	+ this.storageService.store(`${extensionName}-${providerId}`, sessionId, StorageScope.GLOBAL);
`436`	`438`	`}`
`437`	`439`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ export class ExtHostAuthentication implements ExtHostAuthenticationShape {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`const session = await provider.login(scopes);`
`78`		`- await this._proxy.$setTrustedExtension(providerId, session.account.label, extensionId, extensionName);`
	`78`	`+ await this._proxy.$setTrustedExtensionAndAccountPreference(providerId, session.account.label, extensionId, extensionName, session.id);`
`79`	`79`	`return session;`
`80`	`80`	`} else {`
`81`	`81`	`await this._proxy.$requestNewSession(providerId, scopes, extensionId, extensionName);`