From a1f8866557bb20050cf6fbda37714235da1922c7 Mon Sep 17 00:00:00 2001
From: addisonbeck <github@addisonbeck.com>
Date: Thu, 22 May 2025 13:42:10 -0400
Subject: [PATCH] move logout-reason to a new logout package

In order to remove references in bitwarden/common to bitwarden/auth I have
create a new package, logout, and moved the logout-reason type to it. This
type is referenced many times in common.
---
 .github/CODEOWNERS                            |  1 +
 .../browser/src/background/main.background.ts |  2 +-
 apps/browser/src/popup/app.component.ts       |  2 +-
 apps/browser/tsconfig.json                    |  3 ++-
 apps/cli/tsconfig.json                        |  3 ++-
 apps/desktop/src/app/app.component.ts         |  3 ++-
 apps/desktop/tsconfig.json                    |  3 ++-
 apps/web/tsconfig.json                        |  3 ++-
 bitwarden_license/bit-cli/tsconfig.json       |  3 ++-
 bitwarden_license/bit-common/tsconfig.json    |  3 ++-
 bitwarden_license/bit-web/tsconfig.json       |  4 ++--
 libs/admin-console/tsconfig.json              |  3 ++-
 libs/angular/src/services/injection-tokens.ts |  2 +-
 .../src/services/jslib-services.module.ts     |  2 +-
 libs/angular/tsconfig.json                    |  3 ++-
 libs/auth/src/common/index.ts                 |  1 -
 libs/auth/tsconfig.json                       |  3 ++-
 .../src/auth/services/token.service.spec.ts   |  2 +-
 .../common/src/auth/services/token.service.ts |  3 ++-
 .../services/key-connector.service.ts         |  2 +-
 .../services/vault-timeout.service.spec.ts    |  2 +-
 .../services/vault-timeout.service.ts         |  2 +-
 .../default-notifications.service.spec.ts     |  2 +-
 .../internal/default-notifications.service.ts |  2 +-
 .../sync/default-sync.service.spec.ts         |  2 +-
 .../src/platform/sync/default-sync.service.ts |  4 +---
 libs/common/src/services/api.service.spec.ts  |  2 +-
 libs/common/src/services/api.service.ts       |  2 +-
 libs/common/tsconfig.json                     |  3 ++-
 libs/components/tsconfig.json                 |  3 ++-
 libs/importer/tsconfig.json                   |  3 ++-
 libs/key-management-ui/tsconfig.json          |  3 ++-
 libs/key-management/tsconfig.json             |  3 ++-
 libs/logout/package.json                      | 20 +++++++++++++++++++
 .../src/common/types => logout/src}/index.ts  |  0
 .../src}/logout-reason.type.ts                |  0
 libs/logout/tsconfig.json                     | 10 ++++++++++
 libs/node/tsconfig.json                       |  3 ++-
 libs/shared/tsconfig.spec.json                |  3 ++-
 libs/tools/card/tsconfig.json                 |  3 ++-
 .../vault-export-core/tsconfig.json           |  3 ++-
 .../vault-export-ui/tsconfig.json             |  3 ++-
 libs/tools/generator/components/tsconfig.json |  3 ++-
 libs/tools/generator/core/tsconfig.json       |  3 ++-
 .../extensions/history/tsconfig.json          |  3 ++-
 .../generator/extensions/legacy/tsconfig.json |  3 ++-
 .../extensions/navigation/tsconfig.json       |  3 ++-
 libs/tools/send/send-ui/tsconfig.json         |  3 ++-
 libs/vault/tsconfig.json                      |  3 ++-
 package-lock.json                             |  9 +++++++++
 tsconfig.json                                 |  3 ++-
 51 files changed, 114 insertions(+), 48 deletions(-)
 create mode 100644 libs/logout/package.json
 rename libs/{auth/src/common/types => logout/src}/index.ts (100%)
 rename libs/{auth/src/common/types => logout/src}/logout-reason.type.ts (100%)
 create mode 100644 libs/logout/tsconfig.json

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 38a1597848e..34bbf51936c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -18,6 +18,7 @@ apps/cli/src/auth @bitwarden/team-auth-dev
 apps/desktop/src/auth @bitwarden/team-auth-dev
 apps/web/src/app/auth @bitwarden/team-auth-dev
 libs/auth @bitwarden/team-auth-dev
+libs/logout @bitwarden/team-auth-dev
 # web connectors used for auth
 apps/web/src/connectors @bitwarden/team-auth-dev
 bitwarden_license/bit-web/src/app/auth @bitwarden/team-auth-dev
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index a724f857cd1..73a93ecced9 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -11,7 +11,6 @@ import {
   DefaultLockService,
   InternalUserDecryptionOptionsServiceAbstraction,
   LoginEmailServiceAbstraction,
-  LogoutReason,
   PinService,
   PinServiceAbstraction,
   UserDecryptionOptionsService,
@@ -228,6 +227,7 @@ import {
   KdfConfigService,
   KeyService as KeyServiceAbstraction,
 } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 import { BackgroundSyncService } from "@bitwarden/platform/background-sync";
 import {
   IndividualVaultExportService,
diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index 5f7fbc1fad7..dbe3c197732 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -6,7 +6,6 @@ import { NavigationEnd, Router, RouterOutlet } from "@angular/router";
 import { Subject, takeUntil, firstValueFrom, concatMap, filter, tap } from "rxjs";
 
 import { DeviceTrustToastService } from "@bitwarden/angular/auth/services/device-trust-toast.service.abstraction";
-import { LogoutReason } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
@@ -24,6 +23,7 @@ import {
   ToastService,
 } from "@bitwarden/components";
 import { BiometricsService, BiometricStateService } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { PopupCompactModeService } from "../platform/popup/layout/popup-compact-mode.service";
 import { PopupSizeService } from "../platform/popup/layout/popup-size.service";
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index e24985f58af..c20786953b8 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -38,7 +38,8 @@
         "../../libs/tools/export/vault-export/vault-export-core/src"
       ],
       "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"]
+      "@bitwarden/vault": ["../../libs/vault/src"],
+      "@bitwarden/logout": ["../../libs/logout/src"]
     },
     "plugins": [
       {
diff --git a/apps/cli/tsconfig.json b/apps/cli/tsconfig.json
index 9d6e3066b29..d9bace40bdd 100644
--- a/apps/cli/tsconfig.json
+++ b/apps/cli/tsconfig.json
@@ -26,7 +26,8 @@
         "../../libs/tools/export/vault-export/vault-export-core/src"
       ],
       "@bitwarden/key-management": ["../../libs/key-management/src"],
-      "@bitwarden/node/*": ["../../libs/node/src/*"]
+      "@bitwarden/node/*": ["../../libs/node/src/*"],
+      "@bitwarden/logout": ["../../libs/logout/src"]
     },
     "plugins": [
       {
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index 77ac783ac9f..0566f27da3b 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -27,7 +27,7 @@ import { DeviceTrustToastService } from "@bitwarden/angular/auth/services/device
 import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { FingerprintDialogComponent, LoginApprovalComponent } from "@bitwarden/auth/angular";
-import { DESKTOP_SSO_CALLBACK, LogoutReason } from "@bitwarden/auth/common";
+import { DESKTOP_SSO_CALLBACK } from "@bitwarden/auth/common";
 import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -65,6 +65,7 @@ import { CipherType } from "@bitwarden/common/vault/enums";
 import { DialogRef, DialogService, ToastOptions, ToastService } from "@bitwarden/components";
 import { CredentialGeneratorHistoryDialogComponent } from "@bitwarden/generator-components";
 import { KeyService, BiometricStateService } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 import { AddEditFolderDialogComponent, AddEditFolderDialogResult } from "@bitwarden/vault";
 
 import { DeleteAccountComponent } from "../auth/delete-account.component";
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index 78b3512405e..986a869d992 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -36,7 +36,8 @@
         "../../libs/tools/export/vault-export/vault-export-core/src"
       ],
       "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../../libs/vault/src"]
+      "@bitwarden/vault": ["../../libs/vault/src"],
+      "@bitwarden/logout": ["../../libs/logout/src"]
     },
     "plugins": [
       {
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index 3d62a30bc01..99a78cbe93c 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -32,7 +32,8 @@
       ],
       "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["src/*"]
+      "@bitwarden/web-vault/*": ["src/*"],
+      "@bitwarden/logout": ["../../libs/logout/src"]
     }
   },
   "angularCompilerOptions": {
diff --git a/bitwarden_license/bit-cli/tsconfig.json b/bitwarden_license/bit-cli/tsconfig.json
index 4a972b540a7..d0f1b163861 100644
--- a/bitwarden_license/bit-cli/tsconfig.json
+++ b/bitwarden_license/bit-cli/tsconfig.json
@@ -28,7 +28,8 @@
         "../../libs/tools/export/vault-export/vault-export-core/src"
       ],
       "@bitwarden/node/*": ["../../libs/node/src/*"],
-      "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"]
+      "@bitwarden/bit-common/*": ["../../bitwarden_license/bit-common/src/*"],
+      "@bitwarden/logout": ["../../libs/logout/src"]
     },
     "plugins": [
       {
diff --git a/bitwarden_license/bit-common/tsconfig.json b/bitwarden_license/bit-common/tsconfig.json
index 641b0ac6aa9..31c687ab51f 100644
--- a/bitwarden_license/bit-common/tsconfig.json
+++ b/bitwarden_license/bit-common/tsconfig.json
@@ -28,7 +28,8 @@
       ],
       "@bitwarden/vault-export-ui": ["../../libs/tools/export/vault-export/vault-export-core/src"],
       "@bitwarden/vault": ["../../libs/vault/src"],
-      "@bitwarden/web-vault/*": ["../../apps/web/src/*"]
+      "@bitwarden/web-vault/*": ["../../apps/web/src/*"],
+      "@bitwarden/logout": ["../../libs/logout/src"]
     }
   }
 }
diff --git a/bitwarden_license/bit-web/tsconfig.json b/bitwarden_license/bit-web/tsconfig.json
index 679513a656f..a56badee5d5 100644
--- a/bitwarden_license/bit-web/tsconfig.json
+++ b/bitwarden_license/bit-web/tsconfig.json
@@ -32,8 +32,8 @@
       "@bitwarden/tools-card": ["../../libs/tools/card/src"],
       "@bitwarden/vault": ["../../libs/vault/src"],
       "@bitwarden/web-vault/*": ["../../apps/web/src/*"],
-
-      "@bitwarden/bit-common/*": ["../bit-common/src/*"]
+      "@bitwarden/bit-common/*": ["../bit-common/src/*"],
+      "@bitwarden/logout": ["../../libs/logout/src"]
     }
   },
   "files": [
diff --git a/libs/admin-console/tsconfig.json b/libs/admin-console/tsconfig.json
index 4f057fd6af0..61ae19795e0 100644
--- a/libs/admin-console/tsconfig.json
+++ b/libs/admin-console/tsconfig.json
@@ -5,7 +5,8 @@
       "@bitwarden/admin-console/common": ["../admin-console/src/common"],
       "@bitwarden/auth/common": ["../auth/src/common"],
       "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   },
   "include": ["src", "spec", "../../libs/common/custom-matchers.d.ts"],
diff --git a/libs/angular/src/services/injection-tokens.ts b/libs/angular/src/services/injection-tokens.ts
index d82ff021962..8071f212049 100644
--- a/libs/angular/src/services/injection-tokens.ts
+++ b/libs/angular/src/services/injection-tokens.ts
@@ -2,7 +2,6 @@
 // @ts-strict-ignore
 import { Observable, Subject } from "rxjs";
 
-import { LogoutReason } from "@bitwarden/auth/common";
 import { ClientType } from "@bitwarden/common/enums";
 import { VaultTimeout } from "@bitwarden/common/key-management/vault-timeout";
 import { RegionConfig } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -14,6 +13,7 @@ import { Theme } from "@bitwarden/common/platform/enums";
 import { StateFactory } from "@bitwarden/common/platform/factories/state-factory";
 import { Message } from "@bitwarden/common/platform/messaging";
 import { HttpOperations } from "@bitwarden/common/services/api.service";
+import { LogoutReason } from "@bitwarden/logout";
 import { SafeInjectionToken } from "@bitwarden/ui-common";
 // Re-export the SafeInjectionToken from ui-common
 export { SafeInjectionToken } from "@bitwarden/ui-common";
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index a8638efba18..b06ee359002 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -43,7 +43,6 @@ import {
   LoginStrategyService,
   LoginStrategyServiceAbstraction,
   LoginSuccessHandlerService,
-  LogoutReason,
   PinService,
   PinServiceAbstraction,
   UserDecryptionOptionsService,
@@ -315,6 +314,7 @@ import {
   UserAsymmetricKeysRegenerationApiService,
   UserAsymmetricKeysRegenerationService,
 } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 import { SafeInjectionToken } from "@bitwarden/ui-common";
 import { PasswordRepromptService } from "@bitwarden/vault";
 import {
diff --git a/libs/angular/tsconfig.json b/libs/angular/tsconfig.json
index d77e56d778e..f61eea8e1c3 100644
--- a/libs/angular/tsconfig.json
+++ b/libs/angular/tsconfig.json
@@ -19,7 +19,8 @@
       "@bitwarden/platform": ["../platform/src"],
       "@bitwarden/ui-common": ["../ui/common/src"],
       "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
-      "@bitwarden/vault": ["../vault/src"]
+      "@bitwarden/vault": ["../vault/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   },
   "include": ["src", "spec"],
diff --git a/libs/auth/src/common/index.ts b/libs/auth/src/common/index.ts
index 97909bdc449..9fe9ff8fe33 100644
--- a/libs/auth/src/common/index.ts
+++ b/libs/auth/src/common/index.ts
@@ -3,7 +3,6 @@
  */
 export * from "./abstractions";
 export * from "./models";
-export * from "./types";
 export * from "./services";
 export * from "./utilities";
 export * from "./login-strategies";
diff --git a/libs/auth/tsconfig.json b/libs/auth/tsconfig.json
index 8d08522ffce..078d32e8eda 100644
--- a/libs/auth/tsconfig.json
+++ b/libs/auth/tsconfig.json
@@ -15,7 +15,8 @@
       "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
       "@bitwarden/key-management": ["../key-management/src"],
       "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"]
+      "@bitwarden/ui-common": ["../ui/common/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   },
   "include": ["src", "spec"],
diff --git a/libs/common/src/auth/services/token.service.spec.ts b/libs/common/src/auth/services/token.service.spec.ts
index a56853c479c..8bc42a95ef1 100644
--- a/libs/common/src/auth/services/token.service.spec.ts
+++ b/libs/common/src/auth/services/token.service.spec.ts
@@ -3,7 +3,7 @@
 import { MockProxy, mock } from "jest-mock-extended";
 import { firstValueFrom } from "rxjs";
 
-import { LogoutReason } from "@bitwarden/auth/common";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { FakeSingleUserStateProvider, FakeGlobalStateProvider } from "../../../spec";
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
diff --git a/libs/common/src/auth/services/token.service.ts b/libs/common/src/auth/services/token.service.ts
index 61c00f69215..9cd619dd1c4 100644
--- a/libs/common/src/auth/services/token.service.ts
+++ b/libs/common/src/auth/services/token.service.ts
@@ -3,7 +3,8 @@
 import { Observable, combineLatest, firstValueFrom, map } from "rxjs";
 import { Opaque } from "type-fest";
 
-import { LogoutReason, decodeJwtTokenToJson } from "@bitwarden/auth/common";
+import { decodeJwtTokenToJson } from "@bitwarden/auth/common";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { EncryptService } from "../../key-management/crypto/abstractions/encrypt.service";
 import {
diff --git a/libs/common/src/key-management/key-connector/services/key-connector.service.ts b/libs/common/src/key-management/key-connector/services/key-connector.service.ts
index fc0b64f707b..f46096b4d01 100644
--- a/libs/common/src/key-management/key-connector/services/key-connector.service.ts
+++ b/libs/common/src/key-management/key-connector/services/key-connector.service.ts
@@ -2,7 +2,6 @@
 // @ts-strict-ignore
 import { combineLatest, filter, firstValueFrom, Observable, of, switchMap } from "rxjs";
 
-import { LogoutReason } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import {
   Argon2KdfConfig,
@@ -11,6 +10,7 @@ import {
   KeyService,
   KdfType,
 } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { ApiService } from "../../../abstractions/api.service";
 import { OrganizationService } from "../../../admin-console/abstractions/organization/organization.service.abstraction";
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
index 5fdae07b2d7..7e81344d679 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.spec.ts
@@ -4,8 +4,8 @@ import { MockProxy, any, mock } from "jest-mock-extended";
 import { BehaviorSubject, from, of } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
-import { LogoutReason } from "@bitwarden/auth/common";
 import { BiometricsService } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { FakeAccountService, mockAccountServiceWith } from "../../../../spec";
 import { SearchService } from "../../../abstractions/search.service";
diff --git a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
index d71b8972727..80a6ef1bcc7 100644
--- a/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
+++ b/libs/common/src/key-management/vault-timeout/services/vault-timeout.service.ts
@@ -3,8 +3,8 @@
 import { combineLatest, concatMap, filter, firstValueFrom, map, timeout } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
-import { LogoutReason } from "@bitwarden/auth/common";
 import { BiometricsService } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { SearchService } from "../../../abstractions/search.service";
 import { AccountService } from "../../../auth/abstractions/account.service";
diff --git a/libs/common/src/platform/notifications/internal/default-notifications.service.spec.ts b/libs/common/src/platform/notifications/internal/default-notifications.service.spec.ts
index bf834e8dd93..61121efc323 100644
--- a/libs/common/src/platform/notifications/internal/default-notifications.service.spec.ts
+++ b/libs/common/src/platform/notifications/internal/default-notifications.service.spec.ts
@@ -1,7 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject, bufferCount, firstValueFrom, ObservedValueOf, Subject } from "rxjs";
 
-import { LogoutReason } from "@bitwarden/auth/common";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { awaitAsync } from "../../../../spec";
 import { Matrix } from "../../../../spec/matrix";
diff --git a/libs/common/src/platform/notifications/internal/default-notifications.service.ts b/libs/common/src/platform/notifications/internal/default-notifications.service.ts
index 40c93f8f22a..e391fcd1453 100644
--- a/libs/common/src/platform/notifications/internal/default-notifications.service.ts
+++ b/libs/common/src/platform/notifications/internal/default-notifications.service.ts
@@ -11,7 +11,7 @@ import {
   switchMap,
 } from "rxjs";
 
-import { LogoutReason } from "@bitwarden/auth/common";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { AccountService } from "../../../auth/abstractions/account.service";
 import { AuthService } from "../../../auth/abstractions/auth.service";
diff --git a/libs/common/src/platform/sync/default-sync.service.spec.ts b/libs/common/src/platform/sync/default-sync.service.spec.ts
index ded06c8be6b..654932e501b 100644
--- a/libs/common/src/platform/sync/default-sync.service.spec.ts
+++ b/libs/common/src/platform/sync/default-sync.service.spec.ts
@@ -3,11 +3,11 @@ import { of } from "rxjs";
 
 import { CollectionService } from "@bitwarden/admin-console/common";
 import {
-  LogoutReason,
   UserDecryptionOptions,
   UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
 import { KeyService } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { Matrix } from "../../../spec/matrix";
 import { ApiService } from "../../abstractions/api.service";
diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts
index e9f6c60af64..f769f4d2a23 100644
--- a/libs/common/src/platform/sync/default-sync.service.ts
+++ b/libs/common/src/platform/sync/default-sync.service.ts
@@ -8,13 +8,11 @@ import {
   CollectionService,
 } from "@bitwarden/admin-console/common";
 import { KeyService } from "@bitwarden/key-management";
+import { LogoutReason } from "@bitwarden/logout";
 
 // FIXME: remove `src` and fix import
 // eslint-disable-next-line no-restricted-imports
 import { UserDecryptionOptionsServiceAbstraction } from "../../../../auth/src/common/abstractions";
-// FIXME: remove `src` and fix import
-// eslint-disable-next-line no-restricted-imports
-import { LogoutReason } from "../../../../auth/src/common/types";
 import { ApiService } from "../../abstractions/api.service";
 import { InternalOrganizationServiceAbstraction } from "../../admin-console/abstractions/organization/organization.service.abstraction";
 import { InternalPolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction";
diff --git a/libs/common/src/services/api.service.spec.ts b/libs/common/src/services/api.service.spec.ts
index eca6066b9b7..cfec9d769e5 100644
--- a/libs/common/src/services/api.service.spec.ts
+++ b/libs/common/src/services/api.service.spec.ts
@@ -1,7 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 import { of } from "rxjs";
 
-import { LogoutReason } from "@bitwarden/auth/common";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { TokenService } from "../auth/abstractions/token.service";
 import { DeviceType } from "../enums";
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 639daa7c658..ba829e8531d 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -8,7 +8,7 @@ import {
   CollectionRequest,
   CollectionResponse,
 } from "@bitwarden/admin-console/common";
-import { LogoutReason } from "@bitwarden/auth/common";
+import { LogoutReason } from "@bitwarden/logout";
 
 import { ApiService as ApiServiceAbstraction } from "../abstractions/api.service";
 import { OrganizationConnectionType } from "../admin-console/enums";
diff --git a/libs/common/tsconfig.json b/libs/common/tsconfig.json
index 03f66196a30..8895cbdb1e6 100644
--- a/libs/common/tsconfig.json
+++ b/libs/common/tsconfig.json
@@ -7,7 +7,8 @@
       // TODO: Remove once circular dependencies in admin-console, auth and key-management are resolved
       "@bitwarden/common/*": ["../common/src/*"],
       "@bitwarden/key-management": ["../key-management/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"]
+      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   },
   "include": ["src", "spec", "./custom-matchers.d.ts", "../key-management/src/index.ts"],
diff --git a/libs/components/tsconfig.json b/libs/components/tsconfig.json
index eceaf0f3816..d6fede0d0b3 100644
--- a/libs/components/tsconfig.json
+++ b/libs/components/tsconfig.json
@@ -22,7 +22,8 @@
       "@bitwarden/common/*": ["../common/src/*"],
       "@bitwarden/platform": ["../platform/src"],
       "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/ui-common/setup-jest": ["../ui/common/src/setup-jest"]
+      "@bitwarden/ui-common/setup-jest": ["../ui/common/src/setup-jest"],
+      "@bitwarden/logout": ["../logout/src"]
     },
     "plugins": [
       {
diff --git a/libs/importer/tsconfig.json b/libs/importer/tsconfig.json
index e16a16a0337..8ae300e57e0 100644
--- a/libs/importer/tsconfig.json
+++ b/libs/importer/tsconfig.json
@@ -14,7 +14,8 @@
       "@bitwarden/key-management": ["../key-management/src"],
       "@bitwarden/platform": ["../platform/src"],
       "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"]
+      "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/key-management-ui/tsconfig.json b/libs/key-management-ui/tsconfig.json
index bb263f3a2b9..1f0b91f9716 100644
--- a/libs/key-management-ui/tsconfig.json
+++ b/libs/key-management-ui/tsconfig.json
@@ -14,7 +14,8 @@
       "@bitwarden/generator-navigation": ["../tools/generator/extensions/navigation/src"],
       "@bitwarden/key-management": ["../key-management/src/index.ts"],
       "@bitwarden/platform": ["../platform/src"],
-      "@bitwarden/ui-common": ["../ui/common/src"]
+      "@bitwarden/ui-common": ["../ui/common/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   },
   "include": ["src", "spec"],
diff --git a/libs/key-management/tsconfig.json b/libs/key-management/tsconfig.json
index 3d22cb2ec51..b3efeae9326 100644
--- a/libs/key-management/tsconfig.json
+++ b/libs/key-management/tsconfig.json
@@ -5,7 +5,8 @@
       "@bitwarden/admin-console/common": ["../admin-console/src/common"],
       "@bitwarden/auth/common": ["../auth/src/common"],
       "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/logout": ["../../libs/logout/src"]
     }
   },
   "include": ["src", "spec"],
diff --git a/libs/logout/package.json b/libs/logout/package.json
new file mode 100644
index 00000000000..4e01551e342
--- /dev/null
+++ b/libs/logout/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@bitwarden/logout",
+  "version": "0.0.0",
+  "description": "Services and models pertaining to logout",
+  "keywords": [
+    "bitwarden"
+  ],
+  "author": "Bitwarden Inc.",
+  "homepage": "https://bitwarden.com",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bitwarden/clients"
+  },
+  "license": "GPL-3.0",
+  "scripts": {
+    "clean": "rimraf dist",
+    "build": "npm run clean && tsc",
+    "build:watch": "npm run clean && tsc -watch"
+  }
+}
diff --git a/libs/auth/src/common/types/index.ts b/libs/logout/src/index.ts
similarity index 100%
rename from libs/auth/src/common/types/index.ts
rename to libs/logout/src/index.ts
diff --git a/libs/auth/src/common/types/logout-reason.type.ts b/libs/logout/src/logout-reason.type.ts
similarity index 100%
rename from libs/auth/src/common/types/logout-reason.type.ts
rename to libs/logout/src/logout-reason.type.ts
diff --git a/libs/logout/tsconfig.json b/libs/logout/tsconfig.json
new file mode 100644
index 00000000000..2b3a5740be3
--- /dev/null
+++ b/libs/logout/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../shared/tsconfig",
+  "include": ["src"],
+  "compilerOptions": {
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    "types": ["node"]
+  },
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/libs/node/tsconfig.json b/libs/node/tsconfig.json
index 3d22cb2ec51..22f4ce1ea64 100644
--- a/libs/node/tsconfig.json
+++ b/libs/node/tsconfig.json
@@ -5,7 +5,8 @@
       "@bitwarden/admin-console/common": ["../admin-console/src/common"],
       "@bitwarden/auth/common": ["../auth/src/common"],
       "@bitwarden/common/*": ["../common/src/*"],
-      "@bitwarden/key-management": ["../key-management/src"]
+      "@bitwarden/key-management": ["../key-management/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   },
   "include": ["src", "spec"],
diff --git a/libs/shared/tsconfig.spec.json b/libs/shared/tsconfig.spec.json
index 6d2c7498129..1fd932c4467 100644
--- a/libs/shared/tsconfig.spec.json
+++ b/libs/shared/tsconfig.spec.json
@@ -27,7 +27,8 @@
       "@bitwarden/ui-common/setup-jest": ["../ui/common/src/setup-jest"],
       "@bitwarden/vault-export-core": ["../tools/export/vault-export/vault-export-core/src"],
       "@bitwarden/vault-export-ui": ["../tools/export/vault-export/vault-export-ui/src"],
-      "@bitwarden/vault": ["../vault/src"]
+      "@bitwarden/vault": ["../vault/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   }
 }
diff --git a/libs/tools/card/tsconfig.json b/libs/tools/card/tsconfig.json
index 050a1748b7b..a16b8d87675 100644
--- a/libs/tools/card/tsconfig.json
+++ b/libs/tools/card/tsconfig.json
@@ -9,7 +9,8 @@
       "@bitwarden/components": ["../../components/src"],
       "@bitwarden/key-management": ["../../key-management/src"],
       "@bitwarden/platform": ["../../platform/src"],
-      "@bitwarden/ui-common": ["../../ui/common/src"]
+      "@bitwarden/ui-common": ["../../ui/common/src"],
+      "@bitwarden/logout": ["../../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/export/vault-export/vault-export-core/tsconfig.json b/libs/tools/export/vault-export/vault-export-core/tsconfig.json
index 7652a271044..bdaca3a46db 100644
--- a/libs/tools/export/vault-export/vault-export-core/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-core/tsconfig.json
@@ -5,7 +5,8 @@
       "@bitwarden/admin-console/common": ["../../../../admin-console/src/common"],
       "@bitwarden/auth/common": ["../../../../auth/src/common"],
       "@bitwarden/common/*": ["../../../../common/src/*"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
+      "@bitwarden/key-management": ["../../../../key-management/src"],
+      "@bitwarden/logout": ["../../../../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
index 6f2a0242dac..40132c514de 100644
--- a/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
+++ b/libs/tools/export/vault-export/vault-export-ui/tsconfig.json
@@ -18,7 +18,8 @@
       "@bitwarden/ui-common": ["../../../../ui/common/src"],
       "@bitwarden/vault-export-core": [
         "../../../../tools/export/vault-export/vault-export-core/src"
-      ]
+      ],
+      "@bitwarden/logout": ["../../../../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/generator/components/tsconfig.json b/libs/tools/generator/components/tsconfig.json
index 9a3a08b40fc..695ce964cba 100644
--- a/libs/tools/generator/components/tsconfig.json
+++ b/libs/tools/generator/components/tsconfig.json
@@ -12,7 +12,8 @@
       "@bitwarden/key-management": ["../../../key-management/src"],
       "@bitwarden/platform": ["../../../platform/src"],
       "@bitwarden/ui-common": ["../../../ui/common/src"],
-      "@bitwarden/vault": ["../../../vault/src"]
+      "@bitwarden/vault": ["../../../vault/src"],
+      "@bitwarden/logout": ["../../../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/generator/core/tsconfig.json b/libs/tools/generator/core/tsconfig.json
index a95b588686f..05b8aa95b67 100644
--- a/libs/tools/generator/core/tsconfig.json
+++ b/libs/tools/generator/core/tsconfig.json
@@ -5,7 +5,8 @@
       "@bitwarden/admin-console/common": ["../../../admin-console/src/common"],
       "@bitwarden/auth/common": ["../../../auth/src/common"],
       "@bitwarden/common/*": ["../../../common/src/*"],
-      "@bitwarden/key-management": ["../../../key-management/src"]
+      "@bitwarden/key-management": ["../../../key-management/src"],
+      "@bitwarden/logout": ["../../../logout/src"]
     }
   },
   "include": [
diff --git a/libs/tools/generator/extensions/history/tsconfig.json b/libs/tools/generator/extensions/history/tsconfig.json
index 5fc1caf014f..9532ca784ab 100644
--- a/libs/tools/generator/extensions/history/tsconfig.json
+++ b/libs/tools/generator/extensions/history/tsconfig.json
@@ -6,7 +6,8 @@
       "@bitwarden/auth/common": ["../../../../auth/src/common"],
       "@bitwarden/common/*": ["../../../../common/src/*"],
       "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
+      "@bitwarden/key-management": ["../../../../key-management/src"],
+      "@bitwarden/logout": ["../../../../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/generator/extensions/legacy/tsconfig.json b/libs/tools/generator/extensions/legacy/tsconfig.json
index 9a09e28ea3d..bb4cb61bc27 100644
--- a/libs/tools/generator/extensions/legacy/tsconfig.json
+++ b/libs/tools/generator/extensions/legacy/tsconfig.json
@@ -8,7 +8,8 @@
       "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
       "@bitwarden/generator-history": ["../../../../tools/generator/extensions/history/src"],
       "@bitwarden/generator-navigation": ["../../../../tools/generator/extensions/navigation/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
+      "@bitwarden/key-management": ["../../../../key-management/src"],
+      "@bitwarden/logout": ["../../../../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/generator/extensions/navigation/tsconfig.json b/libs/tools/generator/extensions/navigation/tsconfig.json
index 5fc1caf014f..9532ca784ab 100644
--- a/libs/tools/generator/extensions/navigation/tsconfig.json
+++ b/libs/tools/generator/extensions/navigation/tsconfig.json
@@ -6,7 +6,8 @@
       "@bitwarden/auth/common": ["../../../../auth/src/common"],
       "@bitwarden/common/*": ["../../../../common/src/*"],
       "@bitwarden/generator-core": ["../../../../tools/generator/core/src"],
-      "@bitwarden/key-management": ["../../../../key-management/src"]
+      "@bitwarden/key-management": ["../../../../key-management/src"],
+      "@bitwarden/logout": ["../../../../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/tools/send/send-ui/tsconfig.json b/libs/tools/send/send-ui/tsconfig.json
index e6d6680ad40..67e502198d8 100644
--- a/libs/tools/send/send-ui/tsconfig.json
+++ b/libs/tools/send/send-ui/tsconfig.json
@@ -14,7 +14,8 @@
       "@bitwarden/generator-navigation": ["../../../tools/generator/extensions/navigation/src"],
       "@bitwarden/key-management": ["../../../key-management/src"],
       "@bitwarden/platform": ["../../../platform/src"],
-      "@bitwarden/ui-common": ["../../../ui/common/src"]
+      "@bitwarden/ui-common": ["../../../ui/common/src"],
+      "@bitwarden/logout": ["../../../logout/src"]
     }
   },
   "include": ["src"],
diff --git a/libs/vault/tsconfig.json b/libs/vault/tsconfig.json
index 6039dccd811..28da3ea6f5f 100644
--- a/libs/vault/tsconfig.json
+++ b/libs/vault/tsconfig.json
@@ -18,7 +18,8 @@
       "@bitwarden/key-management": ["../key-management/src"],
       "@bitwarden/platform": ["../platform/src"],
       "@bitwarden/ui-common": ["../ui/common/src"],
-      "@bitwarden/vault": ["../vault/src"]
+      "@bitwarden/vault": ["../vault/src"],
+      "@bitwarden/logout": ["../logout/src"]
     }
   },
   "include": ["src", "spec"],
diff --git a/package-lock.json b/package-lock.json
index 2e2623f89cc..9065cb5f43c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -291,6 +291,11 @@
       "version": "0.0.0",
       "license": "GPL-3.0"
     },
+    "libs/logout": {
+      "name": "@bitwarden/logout",
+      "version": "0.0.0",
+      "license": "GPL-3.0"
+    },
     "libs/node": {
       "name": "@bitwarden/node",
       "version": "0.0.0",
@@ -4794,6 +4799,10 @@
       "resolved": "libs/key-management-ui",
       "link": true
     },
+    "node_modules/@bitwarden/logout": {
+      "resolved": "libs/logout",
+      "link": true
+    },
     "node_modules/@bitwarden/node": {
       "resolved": "libs/node",
       "link": true
diff --git a/tsconfig.json b/tsconfig.json
index c82851d50c8..dbf70f0eee8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -43,7 +43,8 @@
       "@bitwarden/vault-export-core": ["./libs/tools/export/vault-export/vault-export-core/src"],
       "@bitwarden/vault-export-ui": ["./libs/tools/export/vault-export/vault-export-ui/src"],
       "@bitwarden/vault": ["./libs/vault/src"],
-      "@bitwarden/web-vault/*": ["./apps/web/src/*"]
+      "@bitwarden/web-vault/*": ["./apps/web/src/*"],
+      "@bitwarden/logout": ["./libs/logout/src"]
     },
     "plugins": [
       {