[PM-7169][PM-5267] Remove auth status from account info (#8539)

* remove active account unlocked from state service

* Remove status from account service `AccountInfo`

* Fixup lingering usages of status

Fixup missed factories

* Fixup account info usage

* fixup CLI build

* Fixup current account type

* Add helper for all auth statuses to auth service

* Fix tests

* Uncomment mistakenly commented code

* Rework logged out account exclusion tests

* Correct test description

* Avoid getters returning observables

* fixup type

libs/common/src/services/event/event-collection.service.ts

@@ -3,7 +3,7 @@ import { firstValueFrom, map, from, zip } from "rxjs";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "../../abstractions/event/event-collection.service";
 import { EventUploadService } from "../../abstractions/event/event-upload.service";
 import { OrganizationService } from "../../admin-console/abstractions/organization/organization.service.abstraction";
-import { AccountService } from "../../auth/abstractions/account.service";
+import { AuthService } from "../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../auth/enums/authentication-status";
 import { EventType } from "../../enums";
 import { EventData } from "../../models/data/event.data";
@@ -18,7 +18,7 @@ export class EventCollectionService implements EventCollectionServiceAbstraction
     private stateProvider: StateProvider,
     private organizationService: OrganizationService,
     private eventUploadService: EventUploadService,
-    private accountService: AccountService,
+    private authService: AuthService,
   ) {}
 
   /** Adds an event to the active user's event collection
@@ -71,12 +71,12 @@ export class EventCollectionService implements EventCollectionServiceAbstraction
 
     const cipher$ = from(this.cipherService.get(cipherId));
 
-    const [accountInfo, orgIds, cipher] = await firstValueFrom(
-      zip(this.accountService.activeAccount$, orgIds$, cipher$),
+    const [authStatus, orgIds, cipher] = await firstValueFrom(
+      zip(this.authService.activeAccountStatus$, orgIds$, cipher$),
     );
 
     // The user must be authorized
-    if (accountInfo.status != AuthenticationStatus.Unlocked) {
+    if (authStatus != AuthenticationStatus.Unlocked) {
       return false;
     }
 

libs/common/src/services/event/event-upload.service.ts

@@ -2,7 +2,7 @@ import { firstValueFrom, map } from "rxjs";
 
 import { ApiService } from "../../abstractions/api.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "../../abstractions/event/event-upload.service";
-import { AccountService } from "../../auth/abstractions/account.service";
+import { AuthService } from "../../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../../auth/enums/authentication-status";
 import { EventData } from "../../models/data/event.data";
 import { EventRequest } from "../../models/request/event.request";
@@ -18,7 +18,7 @@ export class EventUploadService implements EventUploadServiceAbstraction {
     private apiService: ApiService,
     private stateProvider: StateProvider,
     private logService: LogService,
-    private accountService: AccountService,
+    private authService: AuthService,
   ) {}
 
   init(checkOnInterval: boolean) {
@@ -43,13 +43,16 @@ export class EventUploadService implements EventUploadServiceAbstraction {
       userId = await firstValueFrom(this.stateProvider.activeUserId$);
     }
 
-    // Get the auth status from the provided user or the active user
-    const userAuth$ = this.accountService.accounts$.pipe(
-      map((accounts) => accounts[userId]?.status === AuthenticationStatus.Unlocked),
-    );
+    if (!userId) {
+      return;
+    }
 
-    const isAuthenticated = await firstValueFrom(userAuth$);
-    if (!isAuthenticated) {
+    const isUnlocked = await firstValueFrom(
+      this.authService
+        .authStatusFor$(userId)
+        .pipe(map((status) => status === AuthenticationStatus.Unlocked)),
+    );
+    if (!isUnlocked) {
       return;
     }
 

libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts

@@ -138,7 +138,6 @@ describe("VaultTimeoutService", () => {
     if (globalSetups?.userId) {
       accountService.activeAccountSubject.next({
         id: globalSetups.userId as UserId,
-        status: accounts[globalSetups.userId]?.authStatus,
         email: null,
         name: null,
       });