Hook up the command again (#9587)

This commit is contained in:
Amir Omidi
2020-03-12 12:26:28 -07:00
committed by GitHub
parent 8196f86386
commit c9170aaf0e
6 changed files with 17 additions and 2 deletions

View File

@@ -44,6 +44,10 @@ export class AzureAccountProvider implements azdata.AccountProvider {
constructor(private metadata: AzureAccountProviderMetadata, private _tokenCache: TokenCache, private _context: vscode.ExtensionContext) { constructor(private metadata: AzureAccountProviderMetadata, private _tokenCache: TokenCache, private _context: vscode.ExtensionContext) {
this.commonAuthorityUrl = url.resolve(this.metadata.settings.host, AzureAccountProvider.AadCommonTenant); this.commonAuthorityUrl = url.resolve(this.metadata.settings.host, AzureAccountProvider.AadCommonTenant);
} }
// interface method
clearTokenCache(): Thenable<void> {
return this._tokenCache.clear();
}
// interface method // interface method
initialize(storedAccounts: azdata.Account[]): Thenable<azdata.Account[]> { initialize(storedAccounts: azdata.Account[]): Thenable<azdata.Account[]> {

View File

@@ -70,8 +70,7 @@ export class AzureAccountProviderService implements vscode.Disposable {
// let self = this; // let self = this;
let promises: Thenable<void>[] = providerSettings.map(provider => { let promises: Thenable<void>[] = providerSettings.map(provider => {
// return self._accountProviders[provider.metadata.id].clearTokenCache(); return this._accountProviders[provider.metadata.id]?.clearTokenCache();
return Promise.resolve();
}); });
return Promise.all(promises) return Promise.all(promises)

5
src/sql/azdata.d.ts vendored
View File

@@ -2300,6 +2300,11 @@ declare module 'azdata' {
* and call the end OAuth method. * and call the end OAuth method.
*/ */
autoOAuthCancelled(): Thenable<void>; autoOAuthCancelled(): Thenable<void>;
/**
* Clears token cache
*/
clearTokenCache(): Thenable<void>;
} }
// Resource provider interfaces ----------------------------------------------------------------------- // Resource provider interfaces -----------------------------------------------------------------------

View File

@@ -77,6 +77,9 @@ export class TestAccountManagementService implements IAccountManagementService {
} }
export class AccountProviderStub implements azdata.AccountProvider { export class AccountProviderStub implements azdata.AccountProvider {
clearTokenCache(): Thenable<void> {
return Promise.resolve();
}
autoOAuthCancelled(): Thenable<void> { autoOAuthCancelled(): Thenable<void> {
return Promise.resolve(); return Promise.resolve();
} }

View File

@@ -86,6 +86,9 @@ export class MainThreadAccountManagement extends Disposable implements MainThrea
}, },
refresh(account: azdata.Account): Thenable<azdata.Account | azdata.PromptFailedResult> { refresh(account: azdata.Account): Thenable<azdata.Account | azdata.PromptFailedResult> {
return self._proxy.$refresh(handle, account); return self._proxy.$refresh(handle, account);
},
clearTokenCache(): Thenable<void> {
return self._proxy.$clearTokenCache();
} }
}; };
this._accountManagementService.registerProvider(providerMetadata, accountProvider); this._accountManagementService.registerProvider(providerMetadata, accountProvider);

View File

@@ -35,6 +35,7 @@ export abstract class ExtHostAccountManagementShape {
$prompt(handle: number): Thenable<azdata.Account | azdata.PromptFailedResult> { throw ni(); } $prompt(handle: number): Thenable<azdata.Account | azdata.PromptFailedResult> { throw ni(); }
$refresh(handle: number, account: azdata.Account): Thenable<azdata.Account | azdata.PromptFailedResult> { throw ni(); } $refresh(handle: number, account: azdata.Account): Thenable<azdata.Account | azdata.PromptFailedResult> { throw ni(); }
$accountsChanged(handle: number, accounts: azdata.Account[]): Thenable<void> { throw ni(); } $accountsChanged(handle: number, accounts: azdata.Account[]): Thenable<void> { throw ni(); }
$clearTokenCache(): Thenable<void> { throw ni(); }
} }
export abstract class ExtHostConnectionManagementShape { export abstract class ExtHostConnectionManagementShape {