BEEEP: Refactor services DI (#1313)

src/app/accounts/lock.component.ts

@@ -1,6 +1,6 @@
 import {
     Component,
-    NgZone
+    NgZone,
 } from '@angular/core';
 import { Router } from '@angular/router';
 

src/app/app.component.ts

@@ -21,11 +21,8 @@ import {
     Router,
 } from '@angular/router';
 
-import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
-
-import { StorageService } from 'jslib-common/abstractions/storage.service';
-
 import { AuthService } from 'jslib-common/abstractions/auth.service';
+import { BroadcasterService } from 'jslib-common/abstractions/broadcaster.service';
 import { CipherService } from 'jslib-common/abstractions/cipher.service';
 import { CollectionService } from 'jslib-common/abstractions/collection.service';
 import { CryptoService } from 'jslib-common/abstractions/crypto.service';
@@ -40,6 +37,7 @@ import { PolicyService } from 'jslib-common/abstractions/policy.service';
 import { SearchService } from 'jslib-common/abstractions/search.service';
 import { SettingsService } from 'jslib-common/abstractions/settings.service';
 import { StateService } from 'jslib-common/abstractions/state.service';
+import { StorageService } from 'jslib-common/abstractions/storage.service';
 import { SyncService } from 'jslib-common/abstractions/sync.service';
 import { TokenService } from 'jslib-common/abstractions/token.service';
 import { UserService } from 'jslib-common/abstractions/user.service';

src/app/services/services.module.ts

@@ -1,65 +1,35 @@
 import {
     APP_INITIALIZER,
-    LOCALE_ID,
+    Injector,
     NgModule,
 } from '@angular/core';
-
 import { ToasterModule } from 'angular2-toaster';
 
 import { BroadcasterMessagingService } from '../../services/broadcasterMessaging.service';
 import { HtmlStorageService } from '../../services/htmlStorage.service';
 import { I18nService } from '../../services/i18n.service';
 import { MemoryStorageService } from '../../services/memoryStorage.service';
-import { PasswordRepromptService } from '../../services/passwordReprompt.service';
 import { WebPlatformUtilsService } from '../../services/webPlatformUtils.service';
 
 import { EventService } from './event.service';
+import { ModalService } from './modal.service';
 import { OrganizationGuardService } from './organization-guard.service';
 import { OrganizationTypeGuardService } from './organization-type-guard.service';
 import { PolicyListService } from './policy-list.service';
 import { RouterService } from './router.service';
 
-import { AuthGuardService } from 'jslib-angular/services/auth-guard.service';
+import { JslibServicesModule } from 'jslib-angular/services/jslib-services.module';
-import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
-import { LockGuardService } from 'jslib-angular/services/lock-guard.service';
 import { ModalService as ModalServiceAbstraction } from 'jslib-angular/services/modal.service';
-import { UnauthGuardService } from 'jslib-angular/services/unauth-guard.service';
-import { ValidationService } from 'jslib-angular/services/validation.service';
 
-import { ApiService } from 'jslib-common/services/api.service';
-import { AppIdService } from 'jslib-common/services/appId.service';
-import { AuditService } from 'jslib-common/services/audit.service';
 import { AuthService } from 'jslib-common/services/auth.service';
-import { CipherService } from 'jslib-common/services/cipher.service';
-import { CollectionService } from 'jslib-common/services/collection.service';
-import { ConsoleLogService } from 'jslib-common/services/consoleLog.service';
 import { ConstantsService } from 'jslib-common/services/constants.service';
 import { ContainerService } from 'jslib-common/services/container.service';
 import { CryptoService } from 'jslib-common/services/crypto.service';
-import { EnvironmentService } from 'jslib-common/services/environment.service';
 import { EventService as EventLoggingService } from 'jslib-common/services/event.service';
-import { ExportService } from 'jslib-common/services/export.service';
-import { FileUploadService } from 'jslib-common/services/fileUpload.service';
-import { FolderService } from 'jslib-common/services/folder.service';
 import { ImportService } from 'jslib-common/services/import.service';
-import { KeyConnectorService } from 'jslib-common/services/keyConnector.service';
-import { NotificationsService } from 'jslib-common/services/notifications.service';
-import { PasswordGenerationService } from 'jslib-common/services/passwordGeneration.service';
-import { PolicyService } from 'jslib-common/services/policy.service';
-import { SearchService } from 'jslib-common/services/search.service';
-import { SendService } from 'jslib-common/services/send.service';
-import { SettingsService } from 'jslib-common/services/settings.service';
-import { StateService } from 'jslib-common/services/state.service';
-import { SyncService } from 'jslib-common/services/sync.service';
-import { TokenService } from 'jslib-common/services/token.service';
-import { TotpService } from 'jslib-common/services/totp.service';
-import { UserService } from 'jslib-common/services/user.service';
-import { UserVerificationService } from 'jslib-common/services/userVerification.service';
 import { VaultTimeoutService } from 'jslib-common/services/vaultTimeout.service';
-import { WebCryptoFunctionService } from 'jslib-common/services/webCryptoFunction.service';
 
 import { ApiService as ApiServiceAbstraction } from 'jslib-common/abstractions/api.service';
-import { AuditService as AuditServiceAbstraction } from 'jslib-common/abstractions/audit.service';
 import { AuthService as AuthServiceAbstraction } from 'jslib-common/abstractions/auth.service';
 import { CipherService as CipherServiceAbstraction } from 'jslib-common/abstractions/cipher.service';
 import { CollectionService as CollectionServiceAbstraction } from 'jslib-common/abstractions/collection.service';
@@ -67,94 +37,24 @@ import { CryptoService as CryptoServiceAbstraction } from 'jslib-common/abstract
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from 'jslib-common/abstractions/cryptoFunction.service';
 import { EnvironmentService as EnvironmentServiceAbstraction, Urls } from 'jslib-common/abstractions/environment.service';
 import { EventService as EventLoggingServiceAbstraction } from 'jslib-common/abstractions/event.service';
-import { ExportService as ExportServiceAbstraction } from 'jslib-common/abstractions/export.service';
-import { FileUploadService as FileUploadServiceAbstraction }  from 'jslib-common/abstractions/fileUpload.service';
 import { FolderService as FolderServiceAbstraction } from 'jslib-common/abstractions/folder.service';
 import { I18nService as I18nServiceAbstraction } from 'jslib-common/abstractions/i18n.service';
 import { ImportService as ImportServiceAbstraction } from 'jslib-common/abstractions/import.service';
-import { KeyConnectorService as KeyConnectorServiceAbstraction } from 'jslib-common/abstractions/keyConnector.service';
 import { LogService } from 'jslib-common/abstractions/log.service';
 import { MessagingService as MessagingServiceAbstraction } from 'jslib-common/abstractions/messaging.service';
 import { NotificationsService as NotificationsServiceAbstraction } from 'jslib-common/abstractions/notifications.service';
-import {
-    PasswordGenerationService as PasswordGenerationServiceAbstraction,
-} from 'jslib-common/abstractions/passwordGeneration.service';
-import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from 'jslib-common/abstractions/passwordReprompt.service';
 import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from 'jslib-common/abstractions/platformUtils.service';
-import { PolicyService as PolicyServiceAbstraction } from 'jslib-common/abstractions/policy.service';
-import { SearchService as SearchServiceAbstraction } from 'jslib-common/abstractions/search.service';
-import { SendService as SendServiceAbstraction } from 'jslib-common/abstractions/send.service';
-import { SettingsService as SettingsServiceAbstraction } from 'jslib-common/abstractions/settings.service';
 import { StateService as StateServiceAbstraction } from 'jslib-common/abstractions/state.service';
 import { StorageService as StorageServiceAbstraction } from 'jslib-common/abstractions/storage.service';
-import { SyncService as SyncServiceAbstraction } from 'jslib-common/abstractions/sync.service';
-import { TokenService as TokenServiceAbstraction } from 'jslib-common/abstractions/token.service';
-import { TotpService as TotpServiceAbstraction } from 'jslib-common/abstractions/totp.service';
-import { UserService as UserServiceAbstraction } from 'jslib-common/abstractions/user.service';
-import { UserVerificationService as UserVerificationServiceAbstraction } from 'jslib-common/abstractions/userVerification.service';
 import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from 'jslib-common/abstractions/vaultTimeout.service';
-import { ModalService } from './modal.service';
 
 import { ThemeType } from 'jslib-common/enums/themeType';
 
-const i18nService = new I18nService(window.navigator.language, 'locales');
+export function initFactory(window: Window, storageService: StorageServiceAbstraction,
-const stateService = new StateService();
+    environmentService: EnvironmentServiceAbstraction, notificationsService: NotificationsServiceAbstraction,
-const broadcasterService = new BroadcasterService();
+    vaultTimeoutService: VaultTimeoutService, i18nService: I18nService, eventLoggingService: EventLoggingService,
-const messagingService = new BroadcasterMessagingService(broadcasterService);
+    authService: AuthService, stateService: StateServiceAbstraction,
-const consoleLogService = new ConsoleLogService(false);
+    platformUtilsService: PlatformUtilsServiceAbstraction, cryptoService: CryptoServiceAbstraction): Function {
-const platformUtilsService = new WebPlatformUtilsService(i18nService, messagingService, consoleLogService, () => storageService);
-const storageService: StorageServiceAbstraction = new HtmlStorageService(platformUtilsService);
-const secureStorageService: StorageServiceAbstraction = new MemoryStorageService();
-const cryptoFunctionService: CryptoFunctionServiceAbstraction = new WebCryptoFunctionService(window,
-    platformUtilsService);
-const cryptoService = new CryptoService(storageService,
-    platformUtilsService.isDev() ? storageService : secureStorageService, cryptoFunctionService, platformUtilsService,
-    consoleLogService);
-const tokenService = new TokenService(storageService);
-const appIdService = new AppIdService(storageService);
-const environmentService = new EnvironmentService(storageService);
-const apiService = new ApiService(tokenService, platformUtilsService, environmentService,
-    async (expired: boolean) => messagingService.send('logout', { expired: expired }));
-const userService = new UserService(tokenService, storageService);
-const settingsService = new SettingsService(userService, storageService);
-export let searchService: SearchService = null;
-const fileUploadService = new FileUploadService(consoleLogService, apiService);
-const cipherService = new CipherService(cryptoService, userService, settingsService,
-    apiService, fileUploadService, storageService, i18nService, () => searchService, consoleLogService);
-const folderService = new FolderService(cryptoService, userService, apiService, storageService,
-    i18nService, cipherService);
-const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
-searchService = new SearchService(cipherService, consoleLogService, i18nService);
-const policyService = new PolicyService(userService, storageService, apiService);
-const sendService = new SendService(cryptoService, userService, apiService, fileUploadService, storageService,
-    i18nService, cryptoFunctionService);
-const keyConnectorService = new KeyConnectorService(storageService, userService, cryptoService, apiService,
-    tokenService, consoleLogService);
-const vaultTimeoutService = new VaultTimeoutService(cipherService, folderService, collectionService,
-    cryptoService, platformUtilsService, storageService, messagingService, searchService, userService, tokenService,
-    policyService, keyConnectorService, null, async () => messagingService.send('logout', { expired: false }));
-const syncService = new SyncService(userService, apiService, settingsService,
-    folderService, cipherService, cryptoService, collectionService, storageService, messagingService, policyService,
-    sendService, consoleLogService, tokenService, keyConnectorService,
-    async (expired: boolean) => messagingService.send('logout', { expired: expired }));
-const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService, policyService);
-const totpService = new TotpService(storageService, cryptoFunctionService, consoleLogService);
-const containerService = new ContainerService(cryptoService);
-const authService = new AuthService(cryptoService, apiService,
-    userService, tokenService, appIdService, i18nService, platformUtilsService, messagingService, vaultTimeoutService,
-    consoleLogService, cryptoFunctionService, environmentService, keyConnectorService);
-const exportService = new ExportService(folderService, cipherService, apiService, cryptoService);
-const importService = new ImportService(cipherService, folderService, apiService, i18nService, collectionService,
-    platformUtilsService, cryptoService);
-const notificationsService = new NotificationsService(userService, syncService, appIdService, apiService, vaultTimeoutService,
-    environmentService, async () => messagingService.send('logout', { expired: true }), consoleLogService);
-const auditService = new AuditService(cryptoFunctionService, apiService);
-const eventLoggingService = new EventLoggingService(storageService, apiService, userService, cipherService, consoleLogService);
-const userVerificationService = new UserVerificationService(cryptoService, i18nService, apiService);
-
-containerService.attachToWindow(window);
-
-export function initFactory(): Function {
     return async () => {
         await (storageService as HtmlStorageService).init();
 
@@ -184,70 +84,92 @@ export function initFactory(): Function {
         stateService.save(ConstantsService.disableFaviconKey,
             await storageService.get<boolean>(ConstantsService.disableFaviconKey));
         stateService.save('enableGravatars', await storageService.get<boolean>('enableGravatars'));
+
+        const containerService = new ContainerService(cryptoService);
+        containerService.attachToWindow(window);
     };
 }
 
 @NgModule({
     imports: [
         ToasterModule,
+        JslibServicesModule,
     ],
     declarations: [],
     providers: [
-        ValidationService,
-        AuthGuardService,
-        OrganizationGuardService,
-        OrganizationTypeGuardService,
-        UnauthGuardService,
-        RouterService,
-        EventService,
-        LockGuardService,
-        PolicyListService,
-        { provide: ModalServiceAbstraction, useClass: ModalService },
-        { provide: AuditServiceAbstraction, useValue: auditService },
-        { provide: AuthServiceAbstraction, useValue: authService },
-        { provide: CipherServiceAbstraction, useValue: cipherService },
-        { provide: FolderServiceAbstraction, useValue: folderService },
-        { provide: LogService, useValue: consoleLogService },
-        { provide: CollectionServiceAbstraction, useValue: collectionService },
-        { provide: EnvironmentServiceAbstraction, useValue: environmentService },
-        { provide: TotpServiceAbstraction, useValue: totpService },
-        { provide: TokenServiceAbstraction, useValue: tokenService },
-        { provide: I18nServiceAbstraction, useValue: i18nService },
-        { provide: CryptoServiceAbstraction, useValue: cryptoService },
-        { provide: PlatformUtilsServiceAbstraction, useValue: platformUtilsService },
-        { provide: PasswordGenerationServiceAbstraction, useValue: passwordGenerationService },
-        { provide: ApiServiceAbstraction, useValue: apiService },
-        { provide: FileUploadServiceAbstraction, useValue: fileUploadService },
-        { provide: SyncServiceAbstraction, useValue: syncService },
-        { provide: UserServiceAbstraction, useValue: userService },
-        { provide: MessagingServiceAbstraction, useValue: messagingService },
-        { provide: BroadcasterService, useValue: broadcasterService },
-        { provide: SettingsServiceAbstraction, useValue: settingsService },
-        { provide: VaultTimeoutServiceAbstraction, useValue: vaultTimeoutService },
-        { provide: StorageServiceAbstraction, useValue: storageService },
-        { provide: StateServiceAbstraction, useValue: stateService },
-        { provide: ExportServiceAbstraction, useValue: exportService },
-        { provide: SearchServiceAbstraction, useValue: searchService },
-        { provide: ImportServiceAbstraction, useValue: importService },
-        { provide: NotificationsServiceAbstraction, useValue: notificationsService },
-        { provide: CryptoFunctionServiceAbstraction, useValue: cryptoFunctionService },
-        { provide: EventLoggingServiceAbstraction, useValue: eventLoggingService },
-        { provide: PolicyServiceAbstraction, useValue: policyService },
-        { provide: SendServiceAbstraction, useValue: sendService },
-        { provide: KeyConnectorServiceAbstraction, useValue: keyConnectorService },
-        { provide: UserVerificationServiceAbstraction, useValue: userVerificationService },
-        { provide: PasswordRepromptServiceAbstraction, useClass: PasswordRepromptService },
-        { provide: LogService, useValue: consoleLogService },
         {
             provide: APP_INITIALIZER,
             useFactory: initFactory,
-            deps: [],
+            deps: [
+                'WINDOW',
+                StorageServiceAbstraction,
+                EnvironmentServiceAbstraction,
+                NotificationsServiceAbstraction,
+                VaultTimeoutServiceAbstraction,
+                I18nServiceAbstraction,
+                EventLoggingServiceAbstraction,
+                AuthServiceAbstraction,
+                StateServiceAbstraction,
+                PlatformUtilsServiceAbstraction,
+                CryptoServiceAbstraction,
+            ],
             multi: true,
         },
+        OrganizationGuardService,
+        OrganizationTypeGuardService,
+        RouterService,
+        EventService,
+        PolicyListService,
         {
-            provide: LOCALE_ID,
+            provide: I18nServiceAbstraction,
-            useFactory: () => i18nService.translationLocale,
+            useFactory: (window: Window) => new I18nService(window.navigator.language, 'locales'),
-            deps: [],
+            deps: [ 'WINDOW' ],
+        },
+        { provide: StorageServiceAbstraction, useClass: HtmlStorageService },
+        { provide: 'SECURE_STORAGE', useClass: MemoryStorageService },
+        {
+            provide: PlatformUtilsServiceAbstraction,
+            useFactory: (i18nService: I18nServiceAbstraction, messagingService: MessagingServiceAbstraction,
+                logService: LogService, injector: Injector) => new WebPlatformUtilsService(i18nService,
+                    messagingService, logService, () => injector.get(StorageServiceAbstraction)),
+            deps: [
+                I18nServiceAbstraction,
+                MessagingServiceAbstraction,
+                LogService,
+                Injector, // TODO: Get rid of circular dependency!
+            ],
+        },
+        { provide: MessagingServiceAbstraction, useClass: BroadcasterMessagingService },
+        { provide: ModalServiceAbstraction, useClass: ModalService },
+        {
+            provide: ImportServiceAbstraction,
+            useClass: ImportService,
+            deps: [
+                CipherServiceAbstraction,
+                FolderServiceAbstraction,
+                ApiServiceAbstraction,
+                I18nServiceAbstraction,
+                CollectionServiceAbstraction,
+                PlatformUtilsServiceAbstraction,
+                CryptoServiceAbstraction,
+            ],
+        },
+        {
+            provide: CryptoServiceAbstraction,
+            useFactory: (storageService: StorageServiceAbstraction, secureStorageService: StorageServiceAbstraction,
+                cryptoFunctionService: CryptoFunctionServiceAbstraction,
+                platformUtilsService: PlatformUtilsServiceAbstraction, logService: LogService) => {
+                const storageImplementation = platformUtilsService.isDev() ? storageService : secureStorageService;
+                return new CryptoService(storageService, storageImplementation, cryptoFunctionService,
+                    platformUtilsService, logService);
+            },
+            deps: [
+                StorageServiceAbstraction,
+                'SECURE_STORAGE',
+                CryptoFunctionServiceAbstraction,
+                PlatformUtilsServiceAbstraction,
+                LogService,
+            ],
         },
     ],
 })

src/app/vault/vault.component.ts

@@ -28,6 +28,7 @@ import { FolderAddEditComponent } from './folder-add-edit.component';
 import { GroupingsComponent } from './groupings.component';
 import { ShareComponent } from './share.component';
 
+import { BroadcasterService } from 'jslib-common/abstractions/broadcaster.service';
 import { CryptoService } from 'jslib-common/abstractions/crypto.service';
 import { I18nService } from 'jslib-common/abstractions/i18n.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
@@ -36,7 +37,6 @@ import { SyncService } from 'jslib-common/abstractions/sync.service';
 import { TokenService } from 'jslib-common/abstractions/token.service';
 import { UserService } from 'jslib-common/abstractions/user.service';
 
-import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
 import { ModalService } from 'jslib-angular/services/modal.service';
 
 const BroadcasterSubscriptionId = 'VaultComponent';

src/services/broadcasterMessaging.service.ts

@@ -1,7 +1,9 @@
+import { Injectable } from '@angular/core';
+
+import { BroadcasterService } from 'jslib-common/abstractions/broadcaster.service';
 import { MessagingService } from 'jslib-common/abstractions/messaging.service';
 
-import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
+@Injectable()
-
 export class BroadcasterMessagingService implements MessagingService {
     constructor(private broadcasterService: BroadcasterService) { }
 

src/services/htmlStorage.service.ts

@@ -1,7 +1,10 @@
+import { Injectable } from '@angular/core';
+
 import { PlatformUtilsService } from 'jslib-common/abstractions/platformUtils.service';
 import { StorageService } from 'jslib-common/abstractions/storage.service';
 import { ConstantsService } from 'jslib-common/services/constants.service';
 
+@Injectable()
 export class HtmlStorageService implements StorageService {
     private localStorageKeys = new Set(['appId', 'anonymousAppId', 'rememberedEmail', 'passwordGenerationOptions',
         ConstantsService.disableFaviconKey, 'rememberEmail', 'enableGravatars', 'enableFullWidth',