From 5e39b1c7edd4515c9b0d11dc7945675be70c6674 Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Fri, 30 Apr 2021 13:27:42 -0700 Subject: [PATCH] fix secrets api issue (#15300) --- .../platform/credentials/common/credentialsService.ts | 2 +- src/vs/workbench/api/browser/mainThreadSecretState.ts | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/sql/platform/credentials/common/credentialsService.ts b/src/sql/platform/credentials/common/credentialsService.ts index 1686e5e32e..50a6120f4c 100644 --- a/src/sql/platform/credentials/common/credentialsService.ts +++ b/src/sql/platform/credentials/common/credentialsService.ts @@ -8,7 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import * as azdata from 'azdata'; import { Deferred } from 'sql/base/common/promise'; -export const SERVICE_ID = 'credentialsService'; +export const SERVICE_ID = 'sqlCredentialsService'; export interface CredentialManagementEvents { onSaveCredential(credentialId: string, password: string): Thenable; diff --git a/src/vs/workbench/api/browser/mainThreadSecretState.ts b/src/vs/workbench/api/browser/mainThreadSecretState.ts index 6c7a76ee49..0e15ee20a0 100644 --- a/src/vs/workbench/api/browser/mainThreadSecretState.ts +++ b/src/vs/workbench/api/browser/mainThreadSecretState.ts @@ -8,11 +8,11 @@ import { IProductService } from 'vs/platform/product/common/productService'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; import { ICredentialsService } from 'vs/workbench/services/credentials/common/credentials'; import { IEncryptionService } from 'vs/workbench/services/encryption/common/encryptionService'; -import { IExtHostContext, MainContext, MainThreadSecretStateShape } from '../common/extHost.protocol'; +import { ExtHostContext, ExtHostSecretStateShape, IExtHostContext, MainContext, MainThreadSecretStateShape } from '../common/extHost.protocol'; @extHostNamedCustomer(MainContext.MainThreadSecretState) export class MainThreadSecretState extends Disposable implements MainThreadSecretStateShape { - // private readonly _proxy: ExtHostSecretStateShape; + private readonly _proxy: ExtHostSecretStateShape; constructor( extHostContext: IExtHostContext, @@ -21,13 +21,12 @@ export class MainThreadSecretState extends Disposable implements MainThreadSecre @IProductService private readonly productService: IProductService ) { super(); - // this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSecretState); + this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSecretState); - // {{SQL CARBON EDIT}} - throws null - /* this._register(this.credentialsService.onDidChangePassword(e => { + this._register(this.credentialsService.onDidChangePassword(e => { const extensionId = e.service.substring(this.productService.urlProtocol.length); this._proxy.$onDidChangePassword({ extensionId, key: e.account }); - })); */ + })); } private getFullKey(extensionId: string): string {