ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix secrets api issue (#15300)

Browse Source
This commit is contained in:
Alan Ren
2021-04-30 13:27:42 -07:00
committed by GitHub
parent 4ec3779be4
commit 5e39b1c7ed
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/platform/credentials/common/credentialsService.ts
View File

@@ -8,7 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
import * as azdata from 'azdata'; import * as azdata from 'azdata';
import { Deferred } from 'sql/base/common/promise'; import { Deferred } from 'sql/base/common/promise';
export const SERVICE_ID = 'credentialsService'; export const SERVICE_ID = 'sqlCredentialsService';
export interface CredentialManagementEvents { export interface CredentialManagementEvents {
onSaveCredential(credentialId: string, password: string): Thenable<boolean>; onSaveCredential(credentialId: string, password: string): Thenable<boolean>;

11
src/vs/workbench/api/browser/mainThreadSecretState.ts
View File

@@ -8,11 +8,11 @@ import { IProductService } from 'vs/platform/product/common/productService';
import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
import { ICredentialsService } from 'vs/workbench/services/credentials/common/credentials'; import { ICredentialsService } from 'vs/workbench/services/credentials/common/credentials';
import { IEncryptionService } from 'vs/workbench/services/encryption/common/encryptionService'; 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) @extHostNamedCustomer(MainContext.MainThreadSecretState)
export class MainThreadSecretState extends Disposable implements MainThreadSecretStateShape { export class MainThreadSecretState extends Disposable implements MainThreadSecretStateShape {
// private readonly _proxy: ExtHostSecretStateShape; private readonly _proxy: ExtHostSecretStateShape;
constructor( constructor(
extHostContext: IExtHostContext, extHostContext: IExtHostContext,
@@ -21,13 +21,12 @@ export class MainThreadSecretState extends Disposable implements MainThreadSecre
@IProductService private readonly productService: IProductService @IProductService private readonly productService: IProductService
) { ) {
super(); 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); const extensionId = e.service.substring(this.productService.urlProtocol.length);
this._proxy.$onDidChangePassword({ extensionId, key: e.account }); this._proxy.$onDidChangePassword({ extensionId, key: e.account });
})); */ }));
} }
private getFullKey(extensionId: string): string { private getFullKey(extensionId: string): string {