From 7aae92e78e9d0546ec40d463551898c9400db16e Mon Sep 17 00:00:00 2001
From: Jared Snider <jsnider@bitwarden.com>
Date: Wed, 8 May 2024 17:25:57 -0400
Subject: [PATCH] PM-7392 - More replacements of expired with logoutReason

---
 .../service-factories/vault-timeout-service.factory.ts      | 3 ++-
 apps/cli/src/platform/services/node-api.service.ts          | 3 ++-
 .../services/vault-timeout/vault-timeout.service.spec.ts    | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/background/service-factories/vault-timeout-service.factory.ts b/apps/browser/src/background/service-factories/vault-timeout-service.factory.ts
index 0b176c28f1..950e868c7d 100644
--- a/apps/browser/src/background/service-factories/vault-timeout-service.factory.ts
+++ b/apps/browser/src/background/service-factories/vault-timeout-service.factory.ts
@@ -1,3 +1,4 @@
+import { LogoutReason } from "@bitwarden/auth/common";
 import { VaultTimeoutService as AbstractVaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service";
 
 import {
@@ -56,7 +57,7 @@ import {
 type VaultTimeoutServiceFactoryOptions = FactoryOptions & {
   vaultTimeoutServiceOptions: {
     lockedCallback: (userId?: string) => Promise<void>;
-    loggedOutCallback: (expired: boolean, userId?: string) => Promise<void>;
+    loggedOutCallback: (logoutReason: LogoutReason, userId?: string) => Promise<void>;
   };
 };
 
diff --git a/apps/cli/src/platform/services/node-api.service.ts b/apps/cli/src/platform/services/node-api.service.ts
index 00b6319bc8..7878ba238d 100644
--- a/apps/cli/src/platform/services/node-api.service.ts
+++ b/apps/cli/src/platform/services/node-api.service.ts
@@ -2,6 +2,7 @@ import * as FormData from "form-data";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import * as fe from "node-fetch";
 
+import { LogoutReason } from "@bitwarden/auth/common";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -25,7 +26,7 @@ export class NodeApiService extends ApiService {
     stateService: StateService,
     refreshAccessTokenErrorCallback: () => Promise<void>,
     logService: LogService,
-    logoutCallback: (expired: boolean) => Promise<void>,
+    logoutCallback: (logoutReason: LogoutReason) => Promise<void>,
     customUserAgent: string = null,
   ) {
     super(
diff --git a/libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts b/libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts
index 14b26fa541..aa0a8674bd 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout.service.spec.ts
@@ -1,6 +1,8 @@
 import { MockProxy, any, mock } from "jest-mock-extended";
 import { BehaviorSubject, from, of } from "rxjs";
 
+import { LogoutReason } from "@bitwarden/auth/common";
+
 import { FakeAccountService, mockAccountServiceWith } from "../../../spec/fake-account-service";
 import { SearchService } from "../../abstractions/search.service";
 import { VaultTimeoutSettingsService } from "../../abstractions/vault-timeout/vault-timeout-settings.service";
@@ -35,7 +37,7 @@ describe("VaultTimeoutService", () => {
   let vaultTimeoutSettingsService: MockProxy<VaultTimeoutSettingsService>;
   let stateEventRunnerService: MockProxy<StateEventRunnerService>;
   let lockedCallback: jest.Mock<Promise<void>, [userId: string]>;
-  let loggedOutCallback: jest.Mock<Promise<void>, [expired: boolean, userId?: string]>;
+  let loggedOutCallback: jest.Mock<Promise<void>, [logoutReason: LogoutReason, userId?: string]>;
 
   let vaultTimeoutActionSubject: BehaviorSubject<VaultTimeoutAction>;
   let availableVaultTimeoutActionsSubject: BehaviorSubject<VaultTimeoutAction[]>;
@@ -187,7 +189,7 @@ describe("VaultTimeoutService", () => {
   };
 
   const expectUserToHaveLoggedOut = (userId: string) => {
-    expect(loggedOutCallback).toHaveBeenCalledWith(false, userId);
+    expect(loggedOutCallback).toHaveBeenCalledWith("vaultTimeout", userId);
   };
 
   const expectNoAction = (userId: string) => {