ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-14 09:59:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Accounts: Enable notification for accounts change (#2432)

Browse Source 
* Enable notification for accounts change

* Fixed bugs in extHostAccountManagement.test.ts

* Fixed as commented:
1. Removed AccountWithProviderHandle
2. Use a private dictionary _accounts in ExtHostAccountManagement to cache all accounts and corresponding provider handles.
3. getSecurityToken gets provider handle from _accounts for specified account.
4. Added / changed unit tests for getAllAccounts & getSecurityToken
This commit is contained in:
Vincent Feng
2018-09-07 08:23:28 +08:00
committed by GitHub
parent 197e1c651f
commit 005c28dd3a
6 changed files with 177 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/sql/workbench/api/node/extHostAccountManagement.ts
View File

@@ -14,11 +14,14 @@ import {
SqlMainContext,
} from 'sql/workbench/api/node/sqlExtHost.protocol';
import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import { Event, Emitter } from 'vs/base/common/event';
export class ExtHostAccountManagement extends ExtHostAccountManagementShape {
private _handlePool: number = 0;
private _proxy: MainThreadAccountManagementShape;
private _providers: { [handle: number]: AccountProviderWithMetadata } = {};
private _accounts: { [handle: number]: sqlops.Account[] } = {};
private readonly _onDidChangeAccounts = new Emitter<sqlops.DidChangeAccountsParams>();
constructor(mainContext: IMainContext) {
super();
@@ -31,10 +34,6 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape {
return this._withProvider(handle, (provider: sqlops.AccountProvider) => provider.clear(accountKey));
}
public $getSecurityToken(handle: number, account: sqlops.Account): Thenable<{}> {
return this._withProvider(handle, (provider: sqlops.AccountProvider) => provider.getSecurityToken(account));
}
public $initialize(handle: number, restoredAccounts: sqlops.Account[]): Thenable<sqlops.Account[]> {
return this._withProvider(handle, (provider: sqlops.AccountProvider) => provider.initialize(restoredAccounts));
}
@@ -64,31 +63,49 @@ export class ExtHostAccountManagement extends ExtHostAccountManagementShape {
this._proxy.$accountUpdated(updatedAccount);
}
public $getAllAccounts(): Thenable<sqlops.AccountWithProviderHandle[]> {
public $getAllAccounts(): Thenable<sqlops.Account[]> {
if (Object.keys(this._providers).length === 0) {
throw new Error('No account providers registered.');
}
let accountWithProviderHandles: sqlops.AccountWithProviderHandle[] = [];
let promises: Thenable<void>[] = [];
this._accounts = {};
for (let providerKey in this._providers) {
let providerHandle = parseInt(providerKey);
let provider = this._providers[providerHandle];
const resultAccounts: sqlops.Account[] = [];
const promises: Thenable<void>[] = [];
for (const providerKey in this._providers) {
const providerHandle = parseInt(providerKey);
const provider = this._providers[providerHandle];
promises.push(this._proxy.$getAccountsForProvider(provider.metadata.id).then(
(accounts) => {
accounts.forEach((account) => {
accountWithProviderHandles.push({
account: account,
providerHandle: providerHandle
});
});
this._accounts[providerHandle] = accounts;
resultAccounts.push(...accounts);
}
));
}
return Promise.all(promises).then(() => accountWithProviderHandles);
return Promise.all(promises).then(() => resultAccounts);
}
public $getSecurityToken(account: sqlops.Account): Thenable<{}> {
for (const handle in this._accounts) {
const providerHandle = parseInt(handle);
if (this._accounts[handle].findIndex((acct) => acct.key.accountId === account.key.accountId) !== -1) {
return this._withProvider(providerHandle, (provider: sqlops.AccountProvider) => provider.getSecurityToken(account));
}
}
throw new Error(`Account ${account.key.accountId} not found.`);
}
public get onDidChangeAccounts(): Event<sqlops.DidChangeAccountsParams> {
return this._onDidChangeAccounts.event;
}
public $accountsChanged(handle: number, accounts: sqlops.Account[]): Thenable<void> {
return this._onDidChangeAccounts.fire({ accounts: accounts });
}
public $registerAccountProvider(providerMetadata: sqlops.AccountProviderMetadata, provider: sqlops.AccountProvider): Disposable {

17
src/sql/workbench/api/node/mainThreadAccountManagement.ts
View File

@@ -16,6 +16,7 @@ import {
} from 'sql/workbench/api/node/sqlExtHost.protocol';
import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
import { UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes';
@extHostNamedCustomer(SqlMainContext.MainThreadAccountManagement)
export class MainThreadAccountManagement implements MainThreadAccountManagementShape {
@@ -32,6 +33,20 @@ export class MainThreadAccountManagement implements MainThreadAccountManagementS
this._proxy = extHostContext.getProxy(SqlExtHostContext.ExtHostAccountManagement);
}
this._toDispose = [];
this._accountManagementService.updateAccountListEvent((e: UpdateAccountListEventParams) => {
if (!e) {
return;
}
const providerMetadataIndex = Object.values(this._providerMetadata).findIndex((providerMetadata: sqlops.AccountProviderMetadata) => providerMetadata.id === e.providerId);
if (providerMetadataIndex === -1) {
return;
}
const providerHandle = parseInt(Object.keys(this._providerMetadata)[providerMetadataIndex]);
this._proxy.$accountsChanged(providerHandle, e.accountList);
});
}
public $beginAutoOAuthDeviceCode(providerId: string, title: string, message: string, userCode: string, uri: string): Thenable<void> {
@@ -62,7 +77,7 @@ export class MainThreadAccountManagement implements MainThreadAccountManagementS
return self._proxy.$clear(handle, accountKey);
},
getSecurityToken(account: sqlops.Account): Thenable<{}> {
return self._proxy.$getSecurityToken(handle, account);
return self._proxy.$getSecurityToken(account);
},
initialize(restoredAccounts: sqlops.Account[]): Thenable<sqlops.Account[]> {
return self._proxy.$initialize(handle, restoredAccounts);

9
src/sql/workbench/api/node/sqlExtHost.api.impl.ts
View File

@@ -92,11 +92,14 @@ export function createApiFactory(
accountUpdated(updatedAccount: sqlops.Account): void {
return extHostAccountManagement.$accountUpdated(updatedAccount);
},
getAllAccounts(): Thenable<sqlops.AccountWithProviderHandle[]> {
getAllAccounts(): Thenable<sqlops.Account[]> {
return extHostAccountManagement.$getAllAccounts();
},
getSecurityToken(account: sqlops.AccountWithProviderHandle): Thenable<{}> {
return extHostAccountManagement.$getSecurityToken(account.providerHandle, account.account);
getSecurityToken(account: sqlops.Account): Thenable<{}> {
return extHostAccountManagement.$getSecurityToken(account);
},
onDidChangeAccounts(listener: (e: sqlops.DidChangeAccountsParams) => void, thisArgs?: any, disposables?: extHostTypes.Disposable[]) {
return extHostAccountManagement.onDidChangeAccounts(listener, thisArgs, disposables);
}
};

3
src/sql/workbench/api/node/sqlExtHost.protocol.ts
View File

@@ -27,10 +27,11 @@ import {
export abstract class ExtHostAccountManagementShape {
$autoOAuthCancelled(handle: number): Thenable<void> { throw ni(); }
$clear(handle: number, accountKey: sqlops.AccountKey): Thenable<void> { throw ni(); }
$getSecurityToken(handle: number, account: sqlops.Account): Thenable<{}> { throw ni(); }
$getSecurityToken(account: sqlops.Account): Thenable<{}> { throw ni(); }
$initialize(handle: number, restoredAccounts: sqlops.Account[]): Thenable<sqlops.Account[]> { throw ni(); }
$prompt(handle: number): Thenable<sqlops.Account> { throw ni(); }
$refresh(handle: number, account: sqlops.Account): Thenable<sqlops.Account> { throw ni(); }
$accountsChanged(handle: number, accounts: sqlops.Account[]): Thenable<void> { throw ni(); }
}
export abstract class ExtHostConnectionManagementShape {