ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add more to strict nulls (#11871)

Browse Source 
* add more to strict nulls

* maintain error handling properly

* fix lint
This commit is contained in:
Anthony Dresser
2020-08-19 18:38:34 -07:00
committed by GitHub
parent 69a96a7d5d
commit 9327624930
22 changed files with 393 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/sql/workbench/services/accountManagement/browser/accountManagementService.ts
View File

@@ -35,9 +35,9 @@ export class AccountManagementService implements IAccountManagementService {
public _providers: { [id: string]: AccountProviderWithMetadata } = {};
public _serviceBrand: undefined;
private _accountStore: AccountStore;
private _accountDialogController: AccountDialogController;
private _autoOAuthDialogController: AutoOAuthDialogController;
private _mementoContext: Memento;
private _accountDialogController?: AccountDialogController;
private _autoOAuthDialogController?: AutoOAuthDialogController;
private _mementoContext?: Memento;
// EVENT EMITTERS //////////////////////////////////////////////////////
private _addAccountProviderEmitter: Emitter<AccountProviderAddedEventParams>;
@@ -57,7 +57,7 @@ export class AccountManagementService implements IAccountManagementService {
@IClipboardService private _clipboardService: IClipboardService,
@IOpenerService private _openerService: IOpenerService,
@ILogService private readonly _logService: ILogService,
@INotificationService private readonly _notificationService,
@INotificationService private readonly _notificationService: INotificationService
) {
// Create the account store
if (!this._mementoObj) {
@@ -88,7 +88,7 @@ export class AccountManagementService implements IAccountManagementService {
* account's properties have been updated (usually when the account goes stale).
* @param updatedAccount Account with the updated properties
*/
public accountUpdated(updatedAccount: azdata.Account): Thenable<void> {
public accountUpdated(updatedAccount: azdata.Account): Promise<void> {
let self = this;
// 1) Update the account in the store
@@ -119,7 +119,7 @@ export class AccountManagementService implements IAccountManagementService {
* @param providerId ID of the provider to ask to prompt for an account
* @return Promise to return an account
*/
public addAccount(providerId: string): Thenable<void> {
public addAccount(providerId: string): Promise<void> {
const closeAction: Action = new Action('closeAddingAccount', localize('accountManagementService.close', "Close"), undefined, true);
const loginNotification: INotification = {
@@ -166,7 +166,7 @@ export class AccountManagementService implements IAccountManagementService {
* @param account account to refresh
* @return Promise to return an account
*/
public refreshAccount(account: azdata.Account): Thenable<azdata.Account> {
public refreshAccount(account: azdata.Account): Promise<azdata.Account> {
let self = this;
return this.doWithProvider(account.key.providerId, async (provider) => {
@@ -181,20 +181,20 @@ export class AccountManagementService implements IAccountManagementService {
let result = await self._accountStore.addOrUpdate(account);
if (result.accountAdded) {
// Add the account to the list
provider.accounts.push(result.changedAccount);
provider.accounts.push(result.changedAccount!);
}
if (result.accountModified) {
// Find the updated account and splice the updated on in
let indexToRemove: number = firstIndex(provider.accounts, account => {
return account.key.accountId === result.changedAccount.key.accountId;
return account.key.accountId === result.changedAccount!.key.accountId;
});
if (indexToRemove >= 0) {
provider.accounts.splice(indexToRemove, 1, result.changedAccount);
provider.accounts.splice(indexToRemove, 1, result.changedAccount!);
}
}
self.fireAccountListUpdate(provider, result.accountAdded);
return result.changedAccount;
return result.changedAccount!;
});
}
@@ -202,7 +202,7 @@ export class AccountManagementService implements IAccountManagementService {
* Retrieves metadata of all providers that have been registered
* @returns Registered account providers
*/
public getAccountProviderMetadata(): Thenable<azdata.AccountProviderMetadata[]> {
public getAccountProviderMetadata(): Promise<azdata.AccountProviderMetadata[]> {
return Promise.resolve(values(this._providers).map(provider => provider.metadata));
}
@@ -211,7 +211,7 @@ export class AccountManagementService implements IAccountManagementService {
* @param providerId ID of the provider the returned accounts belong to
* @returns Promise to return a list of accounts
*/
public getAccountsForProvider(providerId: string): Thenable<azdata.Account[]> {
public getAccountsForProvider(providerId: string): Promise<azdata.Account[]> {
let self = this;
// 1) Get the accounts from the store
@@ -228,7 +228,7 @@ export class AccountManagementService implements IAccountManagementService {
/**
* Retrieves all the accounts registered with ADS.
*/
public getAccounts(): Thenable<azdata.Account[]> {
public getAccounts(): Promise<azdata.Account[]> {
return this._accountStore.getAllAccounts();
}
@@ -238,9 +238,9 @@ export class AccountManagementService implements IAccountManagementService {
* @param resource The resource to get the security token for
* @return Promise to return the security token
*/
public getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}> {
public getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Promise<{} | undefined> {
return this.doWithProvider(account.key.providerId, provider => {
return provider.provider.getSecurityToken(account, resource);
return Promise.resolve(provider.provider.getSecurityToken(account, resource));
});
}
@@ -251,9 +251,9 @@ export class AccountManagementService implements IAccountManagementService {
* @param resource The resource to get the security token for
* @return Promise to return the security token
*/
public getAccountSecurityToken(account: azdata.Account, tenant: string, resource: azdata.AzureResource): Thenable<{ token: string }> {
public getAccountSecurityToken(account: azdata.Account, tenant: string, resource: azdata.AzureResource): Promise<{ token: string } | undefined> {
return this.doWithProvider(account.key.providerId, provider => {
return provider.provider.getAccountSecurityToken(account, tenant, resource);
return Promise.resolve(provider.provider.getAccountSecurityToken(account, tenant, resource));
});
}
@@ -263,7 +263,7 @@ export class AccountManagementService implements IAccountManagementService {
* @returns Promise with result of account removal, true if account was
* removed, false otherwise.
*/
public removeAccount(accountKey: azdata.AccountKey): Thenable<boolean> {
public removeAccount(accountKey: azdata.AccountKey): Promise<boolean> {
// Step 1) Remove the account
// Step 2) Clear the sensitive data from the provider (regardless of whether the account was removed)
@@ -316,7 +316,7 @@ export class AccountManagementService implements IAccountManagementService {
* Opens the account list dialog
* @return Promise that finishes when the account list dialog closes
*/
public openAccountListDialog(): Thenable<void> {
public openAccountListDialog(): Promise<void> {
let self = this;
return new Promise((resolve, reject) => {
@@ -326,7 +326,7 @@ export class AccountManagementService implements IAccountManagementService {
self._accountDialogController = self._instantiationService.createInstance(AccountDialogController);
}
self._accountDialogController.openAccountDialog();
self._accountDialogController.accountDialog.onCloseEvent(resolve);
self._accountDialogController.accountDialog!.onCloseEvent(resolve);
} catch (e) {
reject(e);
}
@@ -337,7 +337,7 @@ export class AccountManagementService implements IAccountManagementService {
* Begin auto OAuth device code open add account dialog
* @return Promise that finishes when the account list dialog opens
*/
public beginAutoOAuthDeviceCode(providerId: string, title: string, message: string, userCode: string, uri: string): Thenable<void> {
public beginAutoOAuthDeviceCode(providerId: string, title: string, message: string, userCode: string, uri: string): Promise<void> {
let self = this;
return this.doWithProvider(providerId, provider => {
@@ -356,9 +356,9 @@ export class AccountManagementService implements IAccountManagementService {
* Called from the UI when a user cancels the auto OAuth dialog
*/
public cancelAutoOAuthDeviceCode(providerId: string): void {
this.doWithProvider(providerId, provider => provider.provider.autoOAuthCancelled())
void this.doWithProvider(providerId, provider => Promise.resolve(provider.provider.autoOAuthCancelled()))
.then( // Swallow errors
null,
undefined,
err => { this._logService.warn(`Error when cancelling auto OAuth: ${err}`); }
)
.then(() => this.autoOAuthDialogController.closeAutoOAuthDialog());
@@ -408,7 +408,7 @@ export class AccountManagementService implements IAccountManagementService {
* @param providerMetadata Metadata of the provider that is being registered
* @param provider References to the methods of the provider
*/
public registerProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): Thenable<void> {
public registerProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): Promise<void> {
return this._registerProvider(providerMetadata, provider);
}
@@ -432,7 +432,7 @@ export class AccountManagementService implements IAccountManagementService {
// TODO: Support for orphaned accounts (accounts with no provider)
// PRIVATE HELPERS /////////////////////////////////////////////////////
private doWithProvider<T>(providerId: string, op: (provider: AccountProviderWithMetadata) => Thenable<T>): Thenable<T> {
private doWithProvider<T>(providerId: string, op: (provider: AccountProviderWithMetadata) => Promise<T>): Promise<T> {
let provider = this._providers[providerId];
if (!provider) {
// If the provider doesn't already exist wait until it gets registered