Code Layering Accounts (#4882)

* code layering for accounts

* formatting

* formatting

* formatting

src/sqltest/parts/accountManagement/accountActions.test.ts

@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
-import { AddAccountAction, RemoveAccountAction } from 'sql/parts/accountManagement/common/accountActions';
+import { AddAccountAction, RemoveAccountAction } from 'sql/platform/accounts/common/accountActions';
 import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
 // import { MessageServiceStub } from 'sqltest/stubs/messageServiceStub';
 import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';

src/sqltest/parts/accountManagement/accountDialogController.test.ts

@@ -8,13 +8,13 @@
 import * as assert from 'assert';
 import * as TypeMoq from 'typemoq';
 import { Emitter } from 'vs/base/common/event';
-import { AccountDialog } from 'sql/parts/accountManagement/accountDialog/accountDialog';
-import { AccountDialogController } from 'sql/parts/accountManagement/accountDialog/accountDialogController';
-import { AccountViewModel } from 'sql/parts/accountManagement/accountDialog/accountViewModel';
+import { AccountDialog } from 'sql/platform/accounts/browser/accountDialog';
+import { AccountDialogController } from 'sql/platform/accounts/browser/accountDialogController';
+import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel';
 import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
 import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
-import { AccountListRenderer } from 'sql/parts/accountManagement/common/accountListRenderer';
+import { AccountListRenderer } from 'sql/platform/accounts/browser/accountListRenderer';
 import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub';
 
 // TESTS ///////////////////////////////////////////////////////////////////
@@ -102,4 +102,4 @@ function createInstantiationService(addAccountFailureEmitter?: Emitter<string>):
 		.returns(() => mockAccountDialog.object);
 
 	return instantiationService.object;
-}
+}

src/sqltest/parts/accountManagement/accountPickerService.test.ts

@@ -9,9 +9,9 @@ import * as assert from 'assert';
 import * as TypeMoq from 'typemoq';
 import { EventVerifierSingle } from 'sqltest/utils/eventVerifier';
 import { Emitter } from 'vs/base/common/event';
-import { AccountPicker } from 'sql/platform/accountManagement/browser/accountPicker';
-import { AccountPickerService } from 'sql/platform/accountManagement/browser/accountPickerService';
-import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/accountPickerViewModel';
+import { AccountPicker } from 'sql/platform/accounts/browser/accountPicker';
+import { AccountPickerService } from 'sql/platform/accounts/browser/accountPickerService';
+import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel';
 import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 
@@ -117,4 +117,4 @@ function createInstantiationService(): InstantiationService {
 		.returns(() => mockAccountDialog.object);
 
 	return instantiationService.object;
-}
+}

src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts

@@ -9,8 +9,8 @@ import * as assert from 'assert';
 import * as TypeMoq from 'typemoq';
 import { EventVerifierSingle } from 'sqltest/utils/eventVerifier';
 import { Emitter } from 'vs/base/common/event';
-import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/accountPickerViewModel';
-import { UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes';
+import { AccountPickerViewModel } from 'sql/platform/accounts/common/accountPickerViewModel';
+import { UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
 import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
 
 // SUITE STATE /////////////////////////////////////////////////////////////
@@ -91,8 +91,8 @@ suite('Account picker view model tests', () => {
 				assert.equal(results.length, 2);
 				assert.equal(results, accounts);
 			}).then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -117,8 +117,8 @@ suite('Account picker view model tests', () => {
 				assert.equal(result.length, 0);
 				assert.equal(result, []);
 			}).then(
-			() => done(),
-			err => done()
+				() => done(),
+				err => done()
 			);
 	});
 });

src/sqltest/parts/accountManagement/accountViewModel.test.ts

@@ -10,8 +10,8 @@ import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
 import { EventVerifierSingle } from 'sqltest/utils/eventVerifier';
 import { Emitter } from 'vs/base/common/event';
-import { AccountViewModel } from 'sql/parts/accountManagement/accountDialog/accountViewModel';
-import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes';
+import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel';
+import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
 import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
 
 // SUITE STATE /////////////////////////////////////////////////////////////
@@ -116,8 +116,8 @@ suite('Account Management Dialog ViewModel Tests', () => {
 				assert.equal(results[0].addedProvider, providers[0]);
 				assert.equal(results[0].initialAccounts, accounts);
 			}).then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -145,8 +145,8 @@ suite('Account Management Dialog ViewModel Tests', () => {
 				assert.equal(results.length, 0);
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -175,8 +175,8 @@ suite('Account Management Dialog ViewModel Tests', () => {
 				assert.equal(result[0].addedProvider, providers[0]);
 				assert.equal(result[0].initialAccounts, accounts);
 			}).then(
-			() => done(),
-			err => done()
+				() => done(),
+				err => done()
 			);
 	});
 });
@@ -221,4 +221,4 @@ function assertNoEventsFired(
 	evAdd.assertNotFired();
 	evRemove.assertNotFired();
 	evUpdate.assertNotFired();
-}
+}

src/sqltest/parts/accountManagement/autoOAuthDialogController.test.ts

@@ -8,8 +8,8 @@ import * as TypeMoq from 'typemoq';
 import { Emitter } from 'vs/base/common/event';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 
-import { AutoOAuthDialog } from 'sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog';
-import { AutoOAuthDialogController } from 'sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialogController';
+import { AutoOAuthDialog } from 'sql/platform/accounts/browser/autoOAuthDialog';
+import { AutoOAuthDialogController } from 'sql/platform/accounts/browser/autoOAuthDialogController';
 import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
 import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';
 import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub';
@@ -82,7 +82,7 @@ suite('auto OAuth dialog controller tests', () => {
 
 		// If: a oauth flyout is already open
 		autoOAuthDialogController.openAutoOAuthDialog(providerId, title, message, userCode, uri)
-		.then(success => done('Failure: Expected error on 2nd dialog open'), error => done());
+			.then(success => done('Failure: Expected error on 2nd dialog open'), error => done());
 
 		// Then: An error dialog should have been opened
 		mockErrorMessageService.verify(x => x.showDialog(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny()), TypeMoq.Times.once());

src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts

@@ -8,9 +8,9 @@ import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
 import { Emitter } from 'vs/base/common/event';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { FirewallRuleDialog } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog';
-import { FirewallRuleViewModel } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel';
-import { FirewallRuleDialogController } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController';
+import { FirewallRuleDialog } from 'sql/platform/accounts/browser/firewallRuleDialog';
+import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel';
+import { FirewallRuleDialogController } from 'sql/platform/accounts/browser/firewallRuleDialogController';
 import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs';
 import { ResourceProviderStub } from 'sqltest/stubs/resourceProviderServiceStub';
 import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub';
@@ -252,4 +252,4 @@ function getMockErrorMessageService(deferredPromise: Deferred<{}>): TypeMoq.Mock
 		deferredPromise.resolve(true);
 	});
 	return mockErrorMessageService;
-}
+}

src/sqltest/parts/accountManagement/firewallRuleViewModel.test.ts

@@ -5,7 +5,7 @@
 
 'use strict';
 import * as assert from 'assert';
-import { FirewallRuleViewModel } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel';
+import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel';
 
 suite('Firewall rule view model tests', () => {
 	let viewModel: FirewallRuleViewModel;
@@ -41,4 +41,4 @@ suite('Firewall rule view model tests', () => {
 		assert.equal('250.222.155.100', viewModel.fromSubnetIPRange);
 		assert.equal('250.222.155.220', viewModel.toSubnetIPRange);
 	});
-});
+});

src/sqltest/services/accountManagement/accountManagementService.test.ts

@@ -8,11 +8,11 @@
 import * as assert from 'assert';
 import * as azdata from 'azdata';
 import * as TypeMoq from 'typemoq';
-import AccountStore from 'sql/platform/accountManagement/common/accountStore';
-import { AccountDialogController } from 'sql/parts/accountManagement/accountDialog/accountDialogController';
+import AccountStore from 'sql/platform/accounts/common/accountStore';
+import { AccountDialogController } from 'sql/platform/accounts/browser/accountDialogController';
 import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService';
-import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes';
-import { IAccountStore } from 'sql/platform/accountManagement/common/interfaces';
+import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
+import { IAccountStore } from 'sql/platform/accounts/common/interfaces';
 import { AccountProviderStub } from 'sqltest/stubs/accountManagementStubs';
 import { EventVerifierSingle } from 'sqltest/utils/eventVerifier';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
@@ -86,8 +86,8 @@ suite('Account Management Service Tests:', () => {
 				state.mockAccountStore.verify(x => x.remove(TypeMoq.It.isAny()), TypeMoq.Times.once());
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -125,8 +125,8 @@ suite('Account Management Service Tests:', () => {
 				});
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -168,8 +168,8 @@ suite('Account Management Service Tests:', () => {
 				});
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -211,8 +211,8 @@ suite('Account Management Service Tests:', () => {
 				});
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -240,8 +240,8 @@ suite('Account Management Service Tests:', () => {
 		// Then: Nothing should have happened and the promise should be resolved
 		return state.accountManagementService.addAccount(noAccountProvider.id)
 			.then(
-			() => done('Add account promise resolved when it should have rejected'),
-			() => done()
+				() => done('Add account promise resolved when it should have rejected'),
+				() => done()
 			);
 	});
 
@@ -255,8 +255,8 @@ suite('Account Management Service Tests:', () => {
 		// Then: Nothing should have happened and the promise should be resolved
 		return state.accountManagementService.addAccount(noAccountProvider.id)
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -278,8 +278,8 @@ suite('Account Management Service Tests:', () => {
 				assert.equal(result[0], noAccountProvider);
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -295,8 +295,8 @@ suite('Account Management Service Tests:', () => {
 				assert.equal(result.length, 0);
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -331,8 +331,8 @@ suite('Account Management Service Tests:', () => {
 				assert.equal(result.length, 0);
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -352,8 +352,8 @@ suite('Account Management Service Tests:', () => {
 				assert.equal(result, accountList);
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -394,8 +394,8 @@ suite('Account Management Service Tests:', () => {
 				});
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -433,8 +433,8 @@ suite('Account Management Service Tests:', () => {
 				state.eventVerifierUpdate.assertNotFired();
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -460,8 +460,8 @@ suite('Account Management Service Tests:', () => {
 				mockDialogController.verify(x => x.openAccountDialog(), TypeMoq.Times.once());
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -488,8 +488,8 @@ suite('Account Management Service Tests:', () => {
 				mockDialogController.verify(x => x.openAccountDialog(), TypeMoq.Times.exactly(2));
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 
@@ -525,8 +525,8 @@ suite('Account Management Service Tests:', () => {
 				});
 			})
 			.then(
-			() => done(),
-			err => done(err)
+				() => done(),
+				err => done(err)
 			);
 	});
 

src/sqltest/services/accountManagement/accountStore.test.ts

@@ -7,7 +7,7 @@
 
 import * as assert from 'assert';
 import * as azdata from 'azdata';
-import AccountStore from 'sql/platform/accountManagement/common/accountStore';
+import AccountStore from 'sql/platform/accounts/common/accountStore';
 import { EventVerifierSingle } from 'sqltest/utils/eventVerifier';
 
 suite('Account Store Tests', () => {
@@ -31,8 +31,8 @@ suite('Account Store Tests', () => {
 				assertAccountEqual(memento[AccountStore.MEMENTO_KEY][0], account1);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -57,8 +57,8 @@ suite('Account Store Tests', () => {
 				assertAccountEqual(memento[AccountStore.MEMENTO_KEY][0], account1);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -88,8 +88,8 @@ suite('Account Store Tests', () => {
 				assertAccountEqual(memento[AccountStore.MEMENTO_KEY][1], param);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -110,8 +110,8 @@ suite('Account Store Tests', () => {
 				assert.equal(Object.keys(memento).length, 0);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -129,8 +129,8 @@ suite('Account Store Tests', () => {
 				assert.equal(result.length, 0);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -147,8 +147,8 @@ suite('Account Store Tests', () => {
 				assert.equal(result.length, 0);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -167,8 +167,8 @@ suite('Account Store Tests', () => {
 				assertAccountEqual(result[1], memento[AccountStore.MEMENTO_KEY][1]);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -189,8 +189,8 @@ suite('Account Store Tests', () => {
 				assert.equal(Object.keys(memento).length, 0);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -208,8 +208,8 @@ suite('Account Store Tests', () => {
 				assert.equal(result.length, 0);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -228,8 +228,8 @@ suite('Account Store Tests', () => {
 				assertAccountEqual(result[1], memento[AccountStore.MEMENTO_KEY][1]);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -250,8 +250,8 @@ suite('Account Store Tests', () => {
 				assert.equal(memento[AccountStore.MEMENTO_KEY].length, 0);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -273,8 +273,8 @@ suite('Account Store Tests', () => {
 				assert.equal(memento[AccountStore.MEMENTO_KEY].length, 0);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -296,8 +296,8 @@ suite('Account Store Tests', () => {
 				assertAccountEqual(memento[AccountStore.MEMENTO_KEY][0], account2);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -325,8 +325,8 @@ suite('Account Store Tests', () => {
 				updateCallback.assertNotFired();
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -354,8 +354,8 @@ suite('Account Store Tests', () => {
 				updateCallback.assertNotFired();
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 
@@ -388,8 +388,8 @@ suite('Account Store Tests', () => {
 				assertAccountEqual(memento[AccountStore.MEMENTO_KEY][1], account2);
 			})
 			.then(
-			() => done(),
-			e => done(e)
+				() => done(),
+				e => done(e)
 			);
 	});
 

src/sqltest/stubs/accountManagementStubs.ts

@@ -7,8 +7,8 @@
 
 import * as azdata from 'azdata';
 import { Event } from 'vs/base/common/event';
-import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces';
-import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes';
+import { IAccountManagementService } from 'sql/platform/accounts/common/interfaces';
+import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accounts/common/eventTypes';
 
 export class AccountManagementTestService implements IAccountManagementService {
 	_serviceBrand: any;

src/sqltest/workbench/api/extHostAccountManagement.test.ts

@@ -15,7 +15,7 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/
 import { IRPCProtocol } from 'vs/workbench/services/extensions/common/proxyIdentifier';
 import { SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol';
 import { MainThreadAccountManagement } from 'sql/workbench/api/node/mainThreadAccountManagement';
-import { IAccountManagementService, AzureResource } from 'sql/platform/accountManagement/common/interfaces';
+import { IAccountManagementService, AzureResource } from 'sql/platform/accounts/common/interfaces';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
 const IRPCProtocol = createDecorator<IRPCProtocol>('rpcProtocol');