Add 'key' to onDidChange of secrets API, #112249

src/vs/platform/native/common/native.ts

@@ -49,7 +49,7 @@ export interface ICommonNativeHostService {
 
 	readonly onDidChangeColorScheme: Event<IColorScheme>;
 
-	readonly onDidChangePassword: Event<void>;
+	readonly onDidChangePassword: Event<{ service: string, account: string }>;
 
 	// Window
 	getWindows(): Promise<IOpenedWindow[]>;

src/vs/platform/native/electron-main/nativeHostMainService.ts

@@ -90,7 +90,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 	private readonly _onDidChangeColorScheme = this._register(new Emitter<IColorScheme>());
 	readonly onDidChangeColorScheme = this._onDidChangeColorScheme.event;
 
-	private readonly _onDidChangePassword = this._register(new Emitter<void>());
+	private readonly _onDidChangePassword = this._register(new Emitter<{ account: string, service: string }>());
 	readonly onDidChangePassword = this._onDidChangePassword.event;
 
 	//#endregion
@@ -705,7 +705,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 			await keytar.setPassword(service, account, password);
 		}
 
-		this._onDidChangePassword.fire();
+		this._onDidChangePassword.fire({ service, account });
 	}
 
 	async deletePassword(windowId: number | undefined, service: string, account: string): Promise<boolean> {
@@ -713,7 +713,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
 
 		const didDelete = await keytar.deletePassword(service, account);
 		if (didDelete) {
-			this._onDidChangePassword.fire();
+			this._onDidChangePassword.fire({ service, account });
 		}
 
 		return didDelete;

src/vs/vscode.proposed.d.ts

@@ -2424,6 +2424,16 @@ declare module 'vscode' {
 
 	//#region https://github.com/microsoft/vscode/issues/112249
 
+	/**
+	 * The event data that is fired when a secret is added or removed.
+	 */
+	export interface SecretStorageChangeEvent {
+		/**
+		 * The key of the secret that has changed.
+		 */
+		key: string;
+	}
+
 	/**
 	 * Represents a storage utility for secrets, information that is
 	 * sensitive.
@@ -2453,7 +2463,7 @@ declare module 'vscode' {
 		/**
 		 * Fires when a secret is set or deleted.
 		 */
-		onDidChange: Event<void>;
+		onDidChange: Event<SecretStorageChangeEvent>;
 	}
 
 	export interface ExtensionContext {

src/vs/workbench/api/browser/mainThreadSecretState.ts

@@ -23,8 +23,9 @@ export class MainThreadSecretState extends Disposable implements MainThreadSecre
 		super();
 		this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSecretState);
 
-		this._register(this.credentialsService.onDidChangePassword(_ => {
-			this._proxy.$onDidChangePassword();
+		this._register(this.credentialsService.onDidChangePassword(e => {
+			const extensionId = e.service.substring(this.productService.urlProtocol.length);
+			this._proxy.$onDidChangePassword({ extensionId, key: e.account });
 		}));
 	}
 

src/vs/workbench/api/common/exHostSecretState.ts

@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ExtHostSecretStateShape, MainContext, MainThreadSecretStateShape } from 'vs/workbench/api/common/extHost.protocol';
-import { Emitter, Event } from 'vs/base/common/event';
+import { Emitter } from 'vs/base/common/event';
 import { IExtHostRpcService } from 'vs/workbench/api/common/extHostRpcService';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
 export class ExtHostSecretState implements ExtHostSecretStateShape {
 	private _proxy: MainThreadSecretStateShape;
-	private _onDidChangePassword = new Emitter<void>();
-	readonly onDidChangePassword: Event<void> = this._onDidChangePassword.event;
+	private _onDidChangePassword = new Emitter<{ extensionId: string, key: string }>();
+	readonly onDidChangePassword = this._onDidChangePassword.event;
 
 	constructor(mainContext: IExtHostRpcService) {
 		this._proxy = mainContext.getProxy(MainContext.MainThreadSecretState);
 	}
 
-	async $onDidChangePassword(): Promise<void> {
-		this._onDidChangePassword.fire();
+	async $onDidChangePassword(e: { extensionId: string, key: string }): Promise<void> {
+		this._onDidChangePassword.fire(e);
 	}
 
 	get(extensionId: string, key: string): Promise<string | undefined> {

src/vs/workbench/api/common/extHost.protocol.ts

@@ -1130,7 +1130,7 @@ export interface ExtHostAuthenticationShape {
 }
 
 export interface ExtHostSecretStateShape {
-	$onDidChangePassword(): Promise<void>;
+	$onDidChangePassword(e: { extensionId: string, key: string }): Promise<void>;
 }
 
 export interface ExtHostSearchShape {

src/vs/workbench/api/common/extHostSecrets.ts

@@ -14,15 +14,19 @@ export class ExtensionSecrets implements vscode.SecretStorage {
 	protected readonly _id: string;
 	protected readonly _secretState: ExtHostSecretState;
 
-	private _onDidChange = new Emitter<void>();
-	readonly onDidChange: Event<void> = this._onDidChange.event;
+	private _onDidChange = new Emitter<vscode.SecretStorageChangeEvent>();
+	readonly onDidChange: Event<vscode.SecretStorageChangeEvent> = this._onDidChange.event;
 
 
 	constructor(extensionDescription: IExtensionDescription, secretState: ExtHostSecretState) {
 		this._id = ExtensionIdentifier.toKey(extensionDescription.identifier);
 		this._secretState = secretState;
 
-		this._secretState.onDidChangePassword(_ => this._onDidChange.fire());
+		this._secretState.onDidChangePassword(e => {
+			if (e.extensionId === this._id) {
+				this._onDidChange.fire({ key: e.key });
+			}
+		});
 	}
 
 	get(key: string): Promise<string | undefined> {

src/vs/workbench/services/credentials/browser/credentialsService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICredentialsService, ICredentialsProvider } from 'vs/workbench/services/credentials/common/credentials';
+import { ICredentialsService, ICredentialsProvider, ICredentialsChangeEvent } from 'vs/workbench/services/credentials/common/credentials';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { Emitter } from 'vs/base/common/event';
@@ -13,7 +13,7 @@ export class BrowserCredentialsService extends Disposable implements ICredential
 
 	declare readonly _serviceBrand: undefined;
 
-	private _onDidChangePassword = this._register(new Emitter<void>());
+	private _onDidChangePassword = this._register(new Emitter<ICredentialsChangeEvent>());
 	readonly onDidChangePassword = this._onDidChangePassword.event;
 
 	private credentialsProvider: ICredentialsProvider;
@@ -35,13 +35,13 @@ export class BrowserCredentialsService extends Disposable implements ICredential
 	async setPassword(service: string, account: string, password: string): Promise<void> {
 		await this.credentialsProvider.setPassword(service, account, password);
 
-		this._onDidChangePassword.fire();
+		this._onDidChangePassword.fire({ service, account });
 	}
 
 	deletePassword(service: string, account: string): Promise<boolean> {
 		const didDelete = this.credentialsProvider.deletePassword(service, account);
 		if (didDelete) {
-			this._onDidChangePassword.fire();
+			this._onDidChangePassword.fire({ service, account });
 		}
 
 		return didDelete;

src/vs/workbench/services/credentials/common/credentials.ts

@@ -16,7 +16,12 @@ export interface ICredentialsProvider {
 	findCredentials(service: string): Promise<Array<{ account: string, password: string }>>;
 }
 
+export interface ICredentialsChangeEvent {
+	service: string
+	account: string;
+}
+
 export interface ICredentialsService extends ICredentialsProvider {
 	readonly _serviceBrand: undefined;
-	readonly onDidChangePassword: Event<void>;
+	readonly onDidChangePassword: Event<ICredentialsChangeEvent>;
 }

src/vs/workbench/services/credentials/electron-sandbox/credentialsService.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ICredentialsService } from 'vs/workbench/services/credentials/common/credentials';
+import { ICredentialsChangeEvent, ICredentialsService } from 'vs/workbench/services/credentials/common/credentials';
 import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { Emitter } from 'vs/base/common/event';
@@ -13,7 +13,7 @@ export class KeytarCredentialsService extends Disposable implements ICredentials
 
 	declare readonly _serviceBrand: undefined;
 
-	private _onDidChangePassword: Emitter<void> = this._register(new Emitter());
+	private _onDidChangePassword: Emitter<ICredentialsChangeEvent> = this._register(new Emitter());
 	readonly onDidChangePassword = this._onDidChangePassword.event;
 
 	constructor(@INativeHostService private readonly nativeHostService: INativeHostService) {