BEEEP: Refactor services DI (#1313)

bitwarden · Dec 3, 2021 · 78942ca · 78942ca
1 parent d9231ae
commit 78942ca
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 163 deletions.
diff --git a/jslib b/jslib
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
@@ -1,6 +1,6 @@
 import {
     Component,
-    NgZone
+    NgZone,
 } from '@angular/core';
 import { Router } from '@angular/router';
 

diff --git a/src/app/app.component.ts b/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';

diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
diff --git a/src/app/vault/vault.component.ts b/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';

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

diff --git a/src/services/htmlStorage.service.ts b/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',