From 0544100e830b16166711b05302abce9a46e193f8 Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Mon, 2 Dec 2024 09:12:49 -0500
Subject: [PATCH 01/46] Make payment optional trial banner work with Stripe
 sources API deprecation (#12146)

---
 .../vault/individual-vault/vault.component.ts | 12 +--
 .../app/vault/org-vault/vault.component.ts    | 12 ++-
 .../overview/overview.component.ts            | 13 ++-
 .../src/services/jslib-services.module.ts     |  2 +
 .../organization-billing.service.ts           | 11 ++-
 .../services/organization-billing.service.ts  | 83 ++++++++++++-------
 6 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index ce61cd51fcd..9d235784d05 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -32,11 +32,11 @@ import {
 } from "rxjs/operators";
 
 import {
-  Unassigned,
-  CollectionService,
   CollectionData,
   CollectionDetailsResponse,
+  CollectionService,
   CollectionView,
+  Unassigned,
 } from "@bitwarden/admin-console/common";
 import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
@@ -47,6 +47,7 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
+import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { EventType } from "@bitwarden/common/enums";
@@ -241,6 +242,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     private organizationApiService: OrganizationApiServiceAbstraction,
     protected billingApiService: BillingApiServiceAbstraction,
     private trialFlowService: TrialFlowService,
+    private organizationBillingService: OrganizationBillingServiceAbstraction,
   ) {}
 
   async ngOnInit() {
@@ -437,13 +439,13 @@ export class VaultComponent implements OnInit, OnDestroy {
             .map((org) =>
               combineLatest([
                 this.organizationApiService.getSubscription(org.id),
-                this.organizationApiService.getBilling(org.id),
+                this.organizationBillingService.getPaymentSource(org.id),
               ]).pipe(
-                map(([subscription, billing]) => {
+                map(([subscription, paymentSource]) => {
                   return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
                     org,
                     subscription,
-                    billing?.paymentSource,
+                    paymentSource,
                   );
                 }),
               ),
diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index 64318047b9e..18cc6e49abc 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault.component.ts
@@ -48,6 +48,7 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
 import { EventType } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
@@ -252,6 +253,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     private organizationApiService: OrganizationApiServiceAbstraction,
     private trialFlowService: TrialFlowService,
     protected billingApiService: BillingApiServiceAbstraction,
+    private organizationBillingService: OrganizationBillingServiceAbstraction,
   ) {}
 
   async ngOnInit() {
@@ -595,15 +597,11 @@ export class VaultComponent implements OnInit, OnDestroy {
         combineLatest([
           of(org),
           this.organizationApiService.getSubscription(org.id),
-          this.organizationApiService.getBilling(org.id),
+          this.organizationBillingService.getPaymentSource(org.id),
         ]),
       ),
-      map(([org, sub, billing]) => {
-        return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
-          org,
-          sub,
-          billing?.paymentSource,
-        );
+      map(([org, sub, paymentSource]) => {
+        return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(org, sub, paymentSource);
       }),
     );
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
index bf2dbb76ad3..3585f09faf6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
@@ -20,6 +20,7 @@ import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -114,9 +115,9 @@ export class OverviewComponent implements OnInit, OnDestroy {
     private smOnboardingTasksService: SMOnboardingTasksService,
     private logService: LogService,
     private router: Router,
-
     private organizationApiService: OrganizationApiServiceAbstraction,
     private trialFlowService: TrialFlowService,
+    private organizationBillingService: OrganizationBillingServiceAbstraction,
   ) {}
 
   ngOnInit() {
@@ -144,15 +145,11 @@ export class OverviewComponent implements OnInit, OnDestroy {
         combineLatest([
           of(org),
           this.organizationApiService.getSubscription(org.id),
-          this.organizationApiService.getBilling(org.id),
+          this.organizationBillingService.getPaymentSource(org.id),
         ]),
       ),
-      map(([org, sub, billing]) => {
-        return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
-          org,
-          sub,
-          billing?.paymentSource,
-        );
+      map(([org, sub, paymentSource]) => {
+        return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(org, sub, paymentSource);
       }),
       takeUntil(this.destroy$),
     );
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 0208a3cdc7a..a43f1fa07a8 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -1213,6 +1213,8 @@ const safeProviders: SafeProvider[] = [
     useClass: OrganizationBillingService,
     deps: [
       ApiServiceAbstraction,
+      BillingApiServiceAbstraction,
+      ConfigService,
       KeyServiceAbstraction,
       EncryptService,
       I18nServiceAbstraction,
diff --git a/libs/common/src/billing/abstractions/organization-billing.service.ts b/libs/common/src/billing/abstractions/organization-billing.service.ts
index 72902baa30e..0bc1f3bc558 100644
--- a/libs/common/src/billing/abstractions/organization-billing.service.ts
+++ b/libs/common/src/billing/abstractions/organization-billing.service.ts
@@ -1,3 +1,6 @@
+import { BillingSourceResponse } from "@bitwarden/common/billing/models/response/billing.response";
+import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
+
 import { OrganizationResponse } from "../../admin-console/models/response/organization.response";
 import { InitiationPath } from "../../models/request/reference-event.request";
 import { PaymentMethodType, PlanType } from "../enums";
@@ -41,11 +44,15 @@ export type SubscriptionInformation = {
 };
 
 export abstract class OrganizationBillingServiceAbstraction {
-  purchaseSubscription: (subscription: SubscriptionInformation) => Promise<OrganizationResponse>;
+  getPaymentSource: (
+    organizationId: string,
+  ) => Promise<BillingSourceResponse | PaymentSourceResponse>;
 
-  startFree: (subscription: SubscriptionInformation) => Promise<OrganizationResponse>;
+  purchaseSubscription: (subscription: SubscriptionInformation) => Promise<OrganizationResponse>;
 
   purchaseSubscriptionNoPaymentMethod: (
     subscription: SubscriptionInformation,
   ) => Promise<OrganizationResponse>;
+
+  startFree: (subscription: SubscriptionInformation) => Promise<OrganizationResponse>;
 }
diff --git a/libs/common/src/billing/services/organization-billing.service.ts b/libs/common/src/billing/services/organization-billing.service.ts
index efc36278532..487098620bd 100644
--- a/libs/common/src/billing/services/organization-billing.service.ts
+++ b/libs/common/src/billing/services/organization-billing.service.ts
@@ -1,4 +1,18 @@
-import { KeyService } from "../../../../key-management/src/abstractions/key.service";
+import {
+  BillingApiServiceAbstraction,
+  OrganizationBillingServiceAbstraction,
+  OrganizationInformation,
+  PaymentInformation,
+  PlanInformation,
+  SubscriptionInformation,
+} from "@bitwarden/common/billing/abstractions";
+import { BillingSourceResponse } from "@bitwarden/common/billing/models/response/billing.response";
+import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { SyncService } from "@bitwarden/common/platform/sync";
+import { KeyService } from "@bitwarden/key-management";
+
 import { ApiService } from "../../abstractions/api.service";
 import { OrganizationApiServiceAbstraction as OrganizationApiService } from "../../admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationCreateRequest } from "../../admin-console/models/request/organization-create.request";
@@ -8,14 +22,6 @@ import { EncryptService } from "../../platform/abstractions/encrypt.service";
 import { I18nService } from "../../platform/abstractions/i18n.service";
 import { EncString } from "../../platform/models/domain/enc-string";
 import { OrgKey } from "../../types/key";
-import { SyncService } from "../../vault/abstractions/sync/sync.service.abstraction";
-import {
-  OrganizationBillingServiceAbstraction,
-  OrganizationInformation,
-  PaymentInformation,
-  PlanInformation,
-  SubscriptionInformation,
-} from "../abstractions/organization-billing.service";
 import { PlanType } from "../enums";
 import { OrganizationNoPaymentMethodCreateRequest } from "../models/request/organization-no-payment-method-create-request";
 
@@ -29,6 +35,8 @@ interface OrganizationKeys {
 export class OrganizationBillingService implements OrganizationBillingServiceAbstraction {
   constructor(
     private apiService: ApiService,
+    private billingApiService: BillingApiServiceAbstraction,
+    private configService: ConfigService,
     private keyService: KeyService,
     private encryptService: EncryptService,
     private i18nService: I18nService,
@@ -36,6 +44,23 @@ export class OrganizationBillingService implements OrganizationBillingServiceAbs
     private syncService: SyncService,
   ) {}
 
+  async getPaymentSource(
+    organizationId: string,
+  ): Promise<BillingSourceResponse | PaymentSourceResponse> {
+    const deprecateStripeSourcesAPI = await this.configService.getFeatureFlag(
+      FeatureFlag.AC2476_DeprecateStripeSourcesAPI,
+    );
+
+    if (deprecateStripeSourcesAPI) {
+      const paymentMethod =
+        await this.billingApiService.getOrganizationPaymentMethod(organizationId);
+      return paymentMethod.paymentSource;
+    } else {
+      const billing = await this.organizationApiService.getBilling(organizationId);
+      return billing.paymentSource;
+    }
+  }
+
   async purchaseSubscription(subscription: SubscriptionInformation): Promise<OrganizationResponse> {
     const request = new OrganizationCreateRequest();
 
@@ -58,26 +83,6 @@ export class OrganizationBillingService implements OrganizationBillingServiceAbs
     return response;
   }
 
-  async startFree(subscription: SubscriptionInformation): Promise<OrganizationResponse> {
-    const request = new OrganizationCreateRequest();
-
-    const organizationKeys = await this.makeOrganizationKeys();
-
-    this.setOrganizationKeys(request, organizationKeys);
-
-    this.setOrganizationInformation(request, subscription.organization);
-
-    this.setPlanInformation(request, subscription.plan);
-
-    const response = await this.organizationApiService.create(request);
-
-    await this.apiService.refreshIdentityToken();
-
-    await this.syncService.fullSync(true);
-
-    return response;
-  }
-
   async purchaseSubscriptionNoPaymentMethod(
     subscription: SubscriptionInformation,
   ): Promise<OrganizationResponse> {
@@ -100,6 +105,26 @@ export class OrganizationBillingService implements OrganizationBillingServiceAbs
     return response;
   }
 
+  async startFree(subscription: SubscriptionInformation): Promise<OrganizationResponse> {
+    const request = new OrganizationCreateRequest();
+
+    const organizationKeys = await this.makeOrganizationKeys();
+
+    this.setOrganizationKeys(request, organizationKeys);
+
+    this.setOrganizationInformation(request, subscription.organization);
+
+    this.setPlanInformation(request, subscription.plan);
+
+    const response = await this.organizationApiService.create(request);
+
+    await this.apiService.refreshIdentityToken();
+
+    await this.syncService.fullSync(true);
+
+    return response;
+  }
+
   private async makeOrganizationKeys(): Promise<OrganizationKeys> {
     const [encryptedKey, key] = await this.keyService.makeOrgKey<OrgKey>();
     const [publicKey, encryptedPrivateKey] = await this.keyService.makeKeyPair(key);

From 456c516a6e1aa445564b5219de4967f5b75f0a4e Mon Sep 17 00:00:00 2001
From: Merissa Weinstein <merissa.k.weinstein@gmail.com>
Date: Mon, 2 Dec 2024 08:48:31 -0600
Subject: [PATCH 02/46] update release datae for the onboarding module (#12210)

---
 .../src/vault/popup/services/vault-ui-onboarding.service.ts    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/browser/src/vault/popup/services/vault-ui-onboarding.service.ts b/apps/browser/src/vault/popup/services/vault-ui-onboarding.service.ts
index 151f8517d57..2b37b26b9cb 100644
--- a/apps/browser/src/vault/popup/services/vault-ui-onboarding.service.ts
+++ b/apps/browser/src/vault/popup/services/vault-ui-onboarding.service.ts
@@ -24,8 +24,7 @@ export const GLOBAL_VAULT_UI_ONBOARDING = new KeyDefinition<boolean>(
 
 @Injectable()
 export class VaultUiOnboardingService {
-  // TODO: Update this date to the release date of the new Browser UI
-  private onboardingUiReleaseDate = new Date("2024-07-25");
+  private onboardingUiReleaseDate = new Date("2024-12-10");
 
   private vaultUiOnboardingState: GlobalState<boolean> = this.stateProvider.getGlobal(
     GLOBAL_VAULT_UI_ONBOARDING,

From 0ff48aa34581ff5111b7d918f7062aa655a56301 Mon Sep 17 00:00:00 2001
From: cd-bitwarden <106776772+cd-bitwarden@users.noreply.github.com>
Date: Mon, 2 Dec 2024 11:30:38 -0500
Subject: [PATCH 03/46] [PM-12743] a11y changes to make new drop down list for
 send and vault accessible (#11717)

* updating new menus to allow tab + enter to submit the link/button

* Updating New actions to use button instead of a for accessibiity purposes

* refactor

* refactor

* test fix

* fixes

* fixing tests

* fixing test

* fixing tests

---------

Co-authored-by: --global <>
---
 .../new-item-dropdown-v2.component.html       |  16 +-
 .../new-item-dropdown-v2.component.spec.ts    | 212 ++++++++++--------
 .../new-item-dropdown-v2.component.ts         |  30 ++-
 .../new-send-dropdown.component.html          |  12 +-
 .../new-send-dropdown.component.ts            |  14 +-
 5 files changed, 163 insertions(+), 121 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.html
index 78403784f46..7b31e647bf0 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.html
@@ -3,19 +3,27 @@
   {{ "new" | i18n }}
 </button>
 <bit-menu #itemOptions>
-  <a bitMenuItem (click)="newItemNavigate(cipherType.Login)">
+  <a bitMenuItem [routerLink]="['/add-cipher']" [queryParams]="buildQueryParams(cipherType.Login)">
     <i class="bwi bwi-globe" slot="start" aria-hidden="true"></i>
     {{ "typeLogin" | i18n }}
   </a>
-  <a bitMenuItem (click)="newItemNavigate(cipherType.Card)">
+  <a bitMenuItem [routerLink]="['/add-cipher']" [queryParams]="buildQueryParams(cipherType.Card)">
     <i class="bwi bwi-credit-card" slot="start" aria-hidden="true"></i>
     {{ "typeCard" | i18n }}
   </a>
-  <a bitMenuItem (click)="newItemNavigate(cipherType.Identity)">
+  <a
+    bitMenuItem
+    [routerLink]="['/add-cipher']"
+    [queryParams]="buildQueryParams(cipherType.Identity)"
+  >
     <i class="bwi bwi-id-card" slot="start" aria-hidden="true"></i>
     {{ "typeIdentity" | i18n }}
   </a>
-  <a bitMenuItem (click)="newItemNavigate(cipherType.SecureNote)">
+  <a
+    bitMenuItem
+    [routerLink]="['/add-cipher']"
+    [queryParams]="buildQueryParams(cipherType.SecureNote)"
+  >
     <i class="bwi bwi-sticky-note" slot="start" aria-hidden="true"></i>
     {{ "note" | i18n }}
   </a>
diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.spec.ts
index 6842f35ea6f..b5dc2a2f034 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.spec.ts
@@ -1,141 +1,163 @@
 import { CommonModule } from "@angular/common";
 import { ComponentFixture, TestBed } from "@angular/core/testing";
-import { Router } from "@angular/router";
+import { ActivatedRoute, RouterLink } from "@angular/router";
+import { mock } from "jest-mock-extended";
 
-import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction";
+import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
 import { CipherType } from "@bitwarden/common/vault/enums";
-import { ButtonModule, DialogService, MenuModule } from "@bitwarden/components";
+import { ButtonModule, DialogService, MenuModule, NoItemsModule } from "@bitwarden/components";
 
 import { BrowserApi } from "../../../../../platform/browser/browser-api";
 import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
-import { AddEditQueryParams } from "../add-edit/add-edit-v2.component";
-import { AddEditFolderDialogComponent } from "../add-edit-folder-dialog/add-edit-folder-dialog.component";
 
 import { NewItemDropdownV2Component, NewItemInitialValues } from "./new-item-dropdown-v2.component";
 
 describe("NewItemDropdownV2Component", () => {
   let component: NewItemDropdownV2Component;
   let fixture: ComponentFixture<NewItemDropdownV2Component>;
-  const open = jest.fn();
-  const navigate = jest.fn();
+  let dialogServiceMock: jest.Mocked<DialogService>;
+  let browserApiMock: jest.Mocked<typeof BrowserApi>;
 
-  jest
-    .spyOn(BrowserApi, "getTabFromCurrentWindow")
-    .mockResolvedValue({ url: "https://example.com" } as chrome.tabs.Tab);
+  const mockTab = { url: "https://example.com" };
+
+  beforeAll(() => {
+    jest.spyOn(BrowserApi, "getTabFromCurrentWindow").mockResolvedValue(mockTab as chrome.tabs.Tab);
+    jest.spyOn(BrowserPopupUtils, "inPopout").mockReturnValue(false);
+    jest.spyOn(Utils, "getHostname").mockReturnValue("example.com");
+  });
 
   beforeEach(async () => {
-    open.mockClear();
-    navigate.mockClear();
+    dialogServiceMock = mock<DialogService>();
+    dialogServiceMock.open.mockClear();
+
+    const activatedRouteMock = {
+      snapshot: { paramMap: { get: jest.fn() } },
+    };
+
+    const i18nServiceMock = mock<I18nService>();
+    const folderServiceMock = mock<FolderService>();
+    const folderApiServiceAbstractionMock = mock<FolderApiServiceAbstraction>();
+    const accountServiceMock = mock<AccountService>();
 
     await TestBed.configureTestingModule({
-      imports: [NewItemDropdownV2Component, MenuModule, ButtonModule, JslibModule, CommonModule],
-      providers: [
-        { provide: I18nService, useValue: { t: (key: string) => key } },
-        { provide: Router, useValue: { navigate } },
+      imports: [
+        CommonModule,
+        RouterLink,
+        ButtonModule,
+        MenuModule,
+        NoItemsModule,
+        NewItemDropdownV2Component,
       ],
-    })
-      .overrideProvider(DialogService, { useValue: { open } })
-      .compileComponents();
+      providers: [
+        { provide: DialogService, useValue: dialogServiceMock },
+        { provide: I18nService, useValue: i18nServiceMock },
+        { provide: ActivatedRoute, useValue: activatedRouteMock },
+        { provide: BrowserApi, useValue: browserApiMock },
+        { provide: FolderService, useValue: folderServiceMock },
+        { provide: FolderApiServiceAbstraction, useValue: folderApiServiceAbstractionMock },
+        { provide: AccountService, useValue: accountServiceMock },
+      ],
+    }).compileComponents();
+  });
 
+  beforeEach(() => {
     fixture = TestBed.createComponent(NewItemDropdownV2Component);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
 
-  it("opens new folder dialog", () => {
-    component.openFolderDialog();
-
-    expect(open).toHaveBeenCalledWith(AddEditFolderDialogComponent);
-  });
-
-  describe("new item", () => {
-    const emptyParams: AddEditQueryParams = {
-      collectionId: undefined,
-      organizationId: undefined,
-      folderId: undefined,
-    };
-
-    beforeEach(() => {
-      jest.spyOn(component, "newItemNavigate");
-    });
-
-    it("navigates to new login", async () => {
-      await component.newItemNavigate(CipherType.Login);
-
-      expect(navigate).toHaveBeenCalledWith(["/add-cipher"], {
-        queryParams: {
-          type: CipherType.Login.toString(),
-          name: "example.com",
-          uri: "https://example.com",
-          ...emptyParams,
-        },
-      });
-    });
-
-    it("navigates to new card", async () => {
-      await component.newItemNavigate(CipherType.Card);
-
-      expect(navigate).toHaveBeenCalledWith(["/add-cipher"], {
-        queryParams: { type: CipherType.Card.toString(), ...emptyParams },
-      });
-    });
-
-    it("navigates to new identity", async () => {
-      await component.newItemNavigate(CipherType.Identity);
-
-      expect(navigate).toHaveBeenCalledWith(["/add-cipher"], {
-        queryParams: { type: CipherType.Identity.toString(), ...emptyParams },
-      });
-    });
-
-    it("navigates to new note", async () => {
-      await component.newItemNavigate(CipherType.SecureNote);
-
-      expect(navigate).toHaveBeenCalledWith(["/add-cipher"], {
-        queryParams: { type: CipherType.SecureNote.toString(), ...emptyParams },
-      });
-    });
-
-    it("includes initial values", async () => {
+  describe("buildQueryParams", () => {
+    it("should build query params for a Login cipher when not popped out", async () => {
+      await component.ngOnInit();
       component.initialValues = {
         folderId: "222-333-444",
         organizationId: "444-555-666",
         collectionId: "777-888-999",
       } as NewItemInitialValues;
 
-      await component.newItemNavigate(CipherType.Login);
+      jest.spyOn(BrowserPopupUtils, "inPopout").mockReturnValue(false);
+      jest.spyOn(Utils, "getHostname").mockReturnValue("example.com");
 
-      expect(navigate).toHaveBeenCalledWith(["/add-cipher"], {
-        queryParams: {
-          type: CipherType.Login.toString(),
-          folderId: "222-333-444",
-          organizationId: "444-555-666",
-          collectionId: "777-888-999",
-          uri: "https://example.com",
-          name: "example.com",
-        },
+      const params = component.buildQueryParams(CipherType.Login);
+
+      expect(params).toEqual({
+        type: CipherType.Login.toString(),
+        collectionId: "777-888-999",
+        organizationId: "444-555-666",
+        folderId: "222-333-444",
+        uri: "https://example.com",
+        name: "example.com",
       });
     });
 
-    it("does not include name or uri when the extension is popped out", async () => {
+    it("should build query params for a Login cipher when popped out", () => {
+      component.initialValues = {
+        collectionId: "777-888-999",
+      } as NewItemInitialValues;
+
       jest.spyOn(BrowserPopupUtils, "inPopout").mockReturnValue(true);
 
+      const params = component.buildQueryParams(CipherType.Login);
+
+      expect(params).toEqual({
+        type: CipherType.Login.toString(),
+        collectionId: "777-888-999",
+      });
+    });
+
+    it("should build query params for a secure note", () => {
       component.initialValues = {
-        folderId: "222-333-444",
-        organizationId: "444-555-666",
         collectionId: "777-888-999",
       } as NewItemInitialValues;
 
-      await component.newItemNavigate(CipherType.Login);
+      const params = component.buildQueryParams(CipherType.SecureNote);
 
-      expect(navigate).toHaveBeenCalledWith(["/add-cipher"], {
-        queryParams: {
-          type: CipherType.Login.toString(),
-          folderId: "222-333-444",
-          organizationId: "444-555-666",
-          collectionId: "777-888-999",
-        },
+      expect(params).toEqual({
+        type: CipherType.SecureNote.toString(),
+        collectionId: "777-888-999",
+      });
+    });
+
+    it("should build query params for an Identity", () => {
+      component.initialValues = {
+        collectionId: "777-888-999",
+      } as NewItemInitialValues;
+
+      const params = component.buildQueryParams(CipherType.Identity);
+
+      expect(params).toEqual({
+        type: CipherType.Identity.toString(),
+        collectionId: "777-888-999",
+      });
+    });
+
+    it("should build query params for a Card", () => {
+      component.initialValues = {
+        collectionId: "777-888-999",
+      } as NewItemInitialValues;
+
+      const params = component.buildQueryParams(CipherType.Card);
+
+      expect(params).toEqual({
+        type: CipherType.Card.toString(),
+        collectionId: "777-888-999",
+      });
+    });
+
+    it("should build query params for a SshKey", () => {
+      component.initialValues = {
+        collectionId: "777-888-999",
+      } as NewItemInitialValues;
+
+      const params = component.buildQueryParams(CipherType.SshKey);
+
+      expect(params).toEqual({
+        type: CipherType.SshKey.toString(),
+        collectionId: "777-888-999",
       });
     });
   });
diff --git a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
index a1d5cbd332d..e2062101e1b 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/new-item-dropdown/new-item-dropdown-v2.component.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from "@angular/common";
-import { Component, Input } from "@angular/core";
-import { Router, RouterLink } from "@angular/router";
+import { Component, Input, OnInit } from "@angular/core";
+import { RouterLink } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
@@ -25,31 +25,31 @@ export interface NewItemInitialValues {
   standalone: true,
   imports: [NoItemsModule, JslibModule, CommonModule, ButtonModule, RouterLink, MenuModule],
 })
-export class NewItemDropdownV2Component {
+export class NewItemDropdownV2Component implements OnInit {
   cipherType = CipherType;
-
+  private tab?: chrome.tabs.Tab;
   /**
    * Optional initial values to pass to the add cipher form
    */
   @Input()
   initialValues: NewItemInitialValues;
 
-  constructor(
-    private router: Router,
-    private dialogService: DialogService,
-  ) {}
+  constructor(private dialogService: DialogService) {}
 
-  private async buildQueryParams(type: CipherType): Promise<AddEditQueryParams> {
-    const tab = await BrowserApi.getTabFromCurrentWindow();
+  async ngOnInit() {
+    this.tab = await BrowserApi.getTabFromCurrentWindow();
+  }
+
+  buildQueryParams(type: CipherType): AddEditQueryParams {
     const poppedOut = BrowserPopupUtils.inPopout(window);
 
     const loginDetails: { uri?: string; name?: string } = {};
 
     // When a Login Cipher is created and the extension is not popped out,
     // pass along the uri and name
-    if (!poppedOut && type === CipherType.Login && tab) {
-      loginDetails.uri = tab.url;
-      loginDetails.name = Utils.getHostname(tab.url);
+    if (!poppedOut && type === CipherType.Login && this.tab) {
+      loginDetails.uri = this.tab.url;
+      loginDetails.name = Utils.getHostname(this.tab.url);
     }
 
     return {
@@ -61,10 +61,6 @@ export class NewItemDropdownV2Component {
     };
   }
 
-  async newItemNavigate(type: CipherType) {
-    await this.router.navigate(["/add-cipher"], { queryParams: await this.buildQueryParams(type) });
-  }
-
   openFolderDialog() {
     this.dialogService.open(AddEditFolderDialogComponent);
   }
diff --git a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
index 75334b68ef9..9a65f7d98c5 100644
--- a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
+++ b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
@@ -3,11 +3,19 @@
   {{ (hideIcon ? "createSend" : "new") | i18n }}
 </button>
 <bit-menu #itemOptions>
-  <a type="button" bitMenuItem (click)="newItemNavigate(sendType.Text)">
+  <a
+    bitMenuItem
+    [routerLink]="buildRouterLink(sendType.File)"
+    [queryParams]="buildQueryParams(sendType.Text)"
+  >
     <i class="bwi bwi-file-text" slot="start" aria-hidden="true"></i>
     {{ "sendTypeText" | i18n }}
   </a>
-  <a type="button" bitMenuItem (click)="newItemNavigate(sendType.File)">
+  <a
+    bitMenuItem
+    [routerLink]="buildRouterLink(sendType.File)"
+    [queryParams]="buildQueryParams(sendType.File)"
+  >
     <i class="bwi bwi-file" slot="start" aria-hidden="true"></i>
     {{ "sendTypeFile" | i18n }}
     <button type="button" slot="end" *ngIf="hasNoPremium" bitBadge variant="success">
diff --git a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
index 7dbe184d981..d446bcb92ab 100644
--- a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
+++ b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.ts
@@ -32,10 +32,18 @@ export class NewSendDropdownComponent implements OnInit {
     ));
   }
 
-  newItemNavigate(type: SendType) {
+  buildRouterLink(type: SendType) {
     if (this.hasNoPremium && type === SendType.File) {
-      return this.router.navigate(["/premium"]);
+      return "/premium";
+    } else {
+      return "/add-send";
     }
-    void this.router.navigate(["/add-send"], { queryParams: { type: type, isNew: true } });
+  }
+
+  buildQueryParams(type: SendType) {
+    if (this.hasNoPremium && type === SendType.File) {
+      return null;
+    }
+    return { type: type, isNew: true };
   }
 }

From 19663d958706cb997b2b3dbeeee0c8d18870cf0c Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Mon, 2 Dec 2024 20:26:13 +0100
Subject: [PATCH 04/46] [PM-15418] Remove bitItem and use plain bitLink button
 for opening generator history (#12208)

* Remove bitItem and use plain bitLink button for opening generator history

* Revert desktop back to use bitItem

---------

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 .../credential-generator.component.html       |  1 +
 .../credential-generator.component.ts         | 10 +--------
 .../credential-generator.component.html       | 21 ++++++++-----------
 .../credential-generator.component.ts         |  4 ++--
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/apps/desktop/src/app/tools/generator/credential-generator.component.html b/apps/desktop/src/app/tools/generator/credential-generator.component.html
index 37d677472d9..66b0de13dfb 100644
--- a/apps/desktop/src/app/tools/generator/credential-generator.component.html
+++ b/apps/desktop/src/app/tools/generator/credential-generator.component.html
@@ -6,6 +6,7 @@
       <button
         type="button"
         bitLink
+        linkType="primary"
         bit-item-content
         aria-haspopup="true"
         (click)="openHistoryDialog()"
diff --git a/apps/desktop/src/app/tools/generator/credential-generator.component.ts b/apps/desktop/src/app/tools/generator/credential-generator.component.ts
index 3acdf76368d..aed8bf18684 100644
--- a/apps/desktop/src/app/tools/generator/credential-generator.component.ts
+++ b/apps/desktop/src/app/tools/generator/credential-generator.component.ts
@@ -17,15 +17,7 @@ import {
   standalone: true,
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
-  imports: [
-    DialogModule,
-    ButtonModule,
-    JslibModule,
-    GeneratorModule,
-    ItemModule,
-    ButtonModule,
-    LinkModule,
-  ],
+  imports: [DialogModule, ButtonModule, JslibModule, GeneratorModule, ItemModule, LinkModule],
 })
 export class CredentialGeneratorComponent {
   constructor(private dialogService: DialogService) {}
diff --git a/apps/web/src/app/tools/credential-generator/credential-generator.component.html b/apps/web/src/app/tools/credential-generator/credential-generator.component.html
index 5df4a247449..72e521a0a97 100644
--- a/apps/web/src/app/tools/credential-generator/credential-generator.component.html
+++ b/apps/web/src/app/tools/credential-generator/credential-generator.component.html
@@ -2,16 +2,13 @@
 
 <bit-container>
   <tools-credential-generator />
-  <bit-item>
-    <button
-      type="button"
-      bitLink
-      bit-item-content
-      aria-haspopup="true"
-      (click)="openHistoryDialog()"
-    >
-      {{ "generatorHistory" | i18n }}
-      <i slot="end" class="bwi bwi-angle-right" aria-hidden="true"></i>
-    </button>
-  </bit-item>
+  <button
+    bitLink
+    type="button"
+    linkType="primary"
+    aria-haspopup="true"
+    (click)="openHistoryDialog()"
+  >
+    {{ "generatorHistory" | i18n }}
+  </button>
 </bit-container>
diff --git a/apps/web/src/app/tools/credential-generator/credential-generator.component.ts b/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
index f252796d062..8d7b56a09ad 100644
--- a/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
+++ b/apps/web/src/app/tools/credential-generator/credential-generator.component.ts
@@ -1,6 +1,6 @@
 import { Component } from "@angular/core";
 
-import { ButtonModule, DialogService, ItemModule, LinkModule } from "@bitwarden/components";
+import { ButtonModule, DialogService, LinkModule } from "@bitwarden/components";
 import {
   CredentialGeneratorHistoryDialogComponent,
   GeneratorModule,
@@ -13,7 +13,7 @@ import { SharedModule } from "../../shared";
   standalone: true,
   selector: "credential-generator",
   templateUrl: "credential-generator.component.html",
-  imports: [SharedModule, HeaderModule, GeneratorModule, ItemModule, ButtonModule, LinkModule],
+  imports: [SharedModule, HeaderModule, GeneratorModule, ButtonModule, LinkModule],
 })
 export class CredentialGeneratorComponent {
   constructor(private dialogService: DialogService) {}

From 194aa943028e8795798ebf864958c3e03fb3850a Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Tue, 3 Dec 2024 13:46:17 +0100
Subject: [PATCH 05/46] [PM-13202][Defect] MSP name with an apostrophe
 displaying dummy character in Delete provider screen (#11488)

* Resolve the msp name with apostrophe

* qParams.name exists and is a string before sanitization
---
 .../verify-recover-delete-provider.component.ts          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts
index a4461b3e11a..68264593b8e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/verify-recover-delete-provider.component.ts
@@ -1,4 +1,5 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, SecurityContext } from "@angular/core";
+import { DomSanitizer } from "@angular/platform-browser";
 import { ActivatedRoute, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 
@@ -24,6 +25,7 @@ export class VerifyRecoverDeleteProviderComponent implements OnInit {
     private i18nService: I18nService,
     private route: ActivatedRoute,
     private toastService: ToastService,
+    private sanitizer: DomSanitizer,
   ) {}
 
   async ngOnInit() {
@@ -31,7 +33,10 @@ export class VerifyRecoverDeleteProviderComponent implements OnInit {
     if (qParams.providerId != null && qParams.token != null && qParams.name != null) {
       this.providerId = qParams.providerId;
       this.token = qParams.token;
-      this.name = qParams.name;
+      this.name =
+        qParams.name && typeof qParams.name === "string"
+          ? this.sanitizer.sanitize(SecurityContext.HTML, qParams.name) || ""
+          : "";
     } else {
       await this.router.navigate(["/"]);
     }

From 9c03cffe30cf48e48605a6b025b864b0f711eb5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Tue, 3 Dec 2024 12:58:26 +0000
Subject: [PATCH 06/46] [PM-15156] Copy update on Organization member Delete
 modals (#12182)

* Rename 'Remove users' to 'Remove members' in bulk remove dialog

* Update warning messages for bulk delete dialog and single member deletion
---
 .../bulk/bulk-delete-dialog.component.html    |  2 +-
 .../bulk/bulk-remove-dialog.component.html    |  4 ++--
 .../member-dialog/member-dialog.component.ts  |  5 ++++-
 .../members/members.component.ts              |  5 ++++-
 apps/web/src/locales/en/messages.json         | 19 ++++++++++++++++---
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
index 9a4ce89671e..bb5294ebf02 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-delete-dialog.component.html
@@ -8,7 +8,7 @@
     </bit-callout>
     <ng-container *ngIf="!done">
       <bit-callout type="warning" *ngIf="users.length > 0 && !error">
-        <p bitTypography="body1">{{ "deleteOrganizationUserWarning" | i18n }}</p>
+        <p bitTypography="body1">{{ "deleteManyOrganizationUsersWarningDesc" | i18n }}</p>
       </bit-callout>
       <bit-table>
         <ng-container header>
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html
index 8b921d69814..8727148f4ff 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove-dialog.component.html
@@ -1,4 +1,4 @@
-<bit-dialog dialogSize="large" [title]="'removeUsers' | i18n">
+<bit-dialog dialogSize="large" [title]="'removeMembers' | i18n">
   <ng-container bitDialogContent>
     <bit-callout type="danger" *ngIf="users.length <= 0">
       {{ "noSelectedUsersApplicable" | i18n }}
@@ -79,7 +79,7 @@
       [disabled]="loading"
       [bitAction]="submit"
     >
-      {{ "removeUsers" | i18n }}
+      {{ "removeMembers" | i18n }}
     </button>
     <button bitButton type="button" buttonType="secondary" bitDialogClose>
       {{ "close" | i18n }}
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
index 04df2957f91..fe84c5097de 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
@@ -579,7 +579,10 @@ export class MemberDialogComponent implements OnDestroy {
         key: "deleteOrganizationUser",
         placeholders: [this.params.name],
       },
-      content: { key: "deleteOrganizationUserWarning" },
+      content: {
+        key: "deleteOrganizationUserWarningDesc",
+        placeholders: [this.params.name],
+      },
       type: "warning",
       acceptButtonText: { key: "delete" },
       cancelButtonText: { key: "cancel" },
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index 371314d1ca8..b33807c66c9 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -742,7 +742,10 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
         key: "deleteOrganizationUser",
         placeholders: [this.userNamePipe.transform(user)],
       },
-      content: { key: "deleteOrganizationUserWarning" },
+      content: {
+        key: "deleteOrganizationUserWarningDesc",
+        placeholders: [this.userNamePipe.transform(user)],
+      },
       type: "warning",
       acceptButtonText: { key: "delete" },
       cancelButtonText: { key: "cancel" },
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index eb98a1d7577..660a00c364d 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -9715,9 +9715,19 @@
       "description": "Title for the delete organization user dialog"
     }
   },
-  "deleteOrganizationUserWarning": {
-    "message": "When a member is deleted, their Bitwarden account and individual vault data will be permanently deleted. Collection data will remain in the organization. To reinstate them they must create an account and be onboarded again.",
-    "description": "Warning for the delete organization user dialog"
+  "deleteOrganizationUserWarningDesc": {
+    "message": "This will permanently delete all items owned by $NAME$. Collection items are not impacted.",
+    "description": "Warning description for the delete organization user dialog",
+    "placeholders": {
+      "name": {
+        "content": "$1",
+        "example": "John Doe"
+      }
+    }
+  },
+  "deleteManyOrganizationUsersWarningDesc": {
+    "message": "This will permanently delete all items owned by the following members. Collection items are not impacted.",
+    "description": "Warning description for the bulk delete organization users dialog"
   },
   "organizationUserDeleted": {
     "message": "Deleted $NAME$",
@@ -9787,5 +9797,8 @@
   },
   "descriptorCode": {
     "message": "Descriptor code"
+  },
+  "removeMembers": {
+    "message": "Remove members"
   }
 }

From 1e02c002277488cdf6054a99e55c294d60b23f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= <ajensen@bitwarden.com>
Date: Tue, 3 Dec 2024 09:41:21 -0500
Subject: [PATCH 07/46] invert ambiguous flag (#12212)

---
 apps/cli/src/tools/generate.command.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/cli/src/tools/generate.command.ts b/apps/cli/src/tools/generate.command.ts
index 2829bc51414..0a17e4843b9 100644
--- a/apps/cli/src/tools/generate.command.ts
+++ b/apps/cli/src/tools/generate.command.ts
@@ -33,7 +33,7 @@ export class GenerateCommand {
       includeNumber: normalizedOptions.includeNumber,
       minNumber: normalizedOptions.minNumber,
       minSpecial: normalizedOptions.minSpecial,
-      ambiguous: normalizedOptions.ambiguous,
+      ambiguous: !normalizedOptions.ambiguous,
     };
 
     const enforcedOptions = (await this.stateService.getIsAuthenticated())

From 352d6b9a4d047530d385fc41a1c1e1192140af62 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Tue, 3 Dec 2024 15:50:32 +0100
Subject: [PATCH 08/46] Remove unused stateService dependency (#12167)

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 apps/cli/src/commands/get.command.ts    | 2 --
 apps/cli/src/oss-serve-configurator.ts  | 1 -
 apps/cli/src/tools/send/send.program.ts | 1 -
 apps/cli/src/vault.program.ts           | 1 -
 4 files changed, 5 deletions(-)

diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts
index fc014534e03..3f8702d000d 100644
--- a/apps/cli/src/commands/get.command.ts
+++ b/apps/cli/src/commands/get.command.ts
@@ -21,7 +21,6 @@ import { LoginExport } from "@bitwarden/common/models/export/login.export";
 import { SecureNoteExport } from "@bitwarden/common/models/export/secure-note.export";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
-import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
 import { SendType } from "@bitwarden/common/tools/send/enums/send-type";
@@ -58,7 +57,6 @@ export class GetCommand extends DownloadCommand {
     private auditService: AuditService,
     private keyService: KeyService,
     encryptService: EncryptService,
-    private stateService: StateService,
     private searchService: SearchService,
     private apiService: ApiService,
     private organizationService: OrganizationService,
diff --git a/apps/cli/src/oss-serve-configurator.ts b/apps/cli/src/oss-serve-configurator.ts
index a25357f6f69..0614aa05e13 100644
--- a/apps/cli/src/oss-serve-configurator.ts
+++ b/apps/cli/src/oss-serve-configurator.ts
@@ -58,7 +58,6 @@ export class OssServeConfigurator {
       this.serviceContainer.auditService,
       this.serviceContainer.keyService,
       this.serviceContainer.encryptService,
-      this.serviceContainer.stateService,
       this.serviceContainer.searchService,
       this.serviceContainer.apiService,
       this.serviceContainer.organizationService,
diff --git a/apps/cli/src/tools/send/send.program.ts b/apps/cli/src/tools/send/send.program.ts
index 60e78137e7e..d70b8102213 100644
--- a/apps/cli/src/tools/send/send.program.ts
+++ b/apps/cli/src/tools/send/send.program.ts
@@ -144,7 +144,6 @@ export class SendProgram extends BaseProgram {
           this.serviceContainer.auditService,
           this.serviceContainer.keyService,
           this.serviceContainer.encryptService,
-          this.serviceContainer.stateService,
           this.serviceContainer.searchService,
           this.serviceContainer.apiService,
           this.serviceContainer.organizationService,
diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts
index 4d3215944e7..252818c2f26 100644
--- a/apps/cli/src/vault.program.ts
+++ b/apps/cli/src/vault.program.ts
@@ -179,7 +179,6 @@ export class VaultProgram extends BaseProgram {
           this.serviceContainer.auditService,
           this.serviceContainer.keyService,
           this.serviceContainer.encryptService,
-          this.serviceContainer.stateService,
           this.serviceContainer.searchService,
           this.serviceContainer.apiService,
           this.serviceContainer.organizationService,

From 8a459b3427bdd871ab9d5fe413537df97062302c Mon Sep 17 00:00:00 2001
From: Brandon Treston <btreston@bitwarden.com>
Date: Tue, 3 Dec 2024 09:58:32 -0500
Subject: [PATCH 09/46] [PM-14551] Update copy for revoke dialog (#12089)

* update copy for revoke dialog

* Update bulk restore copy

* update copy in dialog

* remove unused copy

* Check run earlier during setup (#11958)

(cherry picked from commit 80c71c191b2ed56984dc301b7d41133e09340fed)

* Check run earlier during setup (#11958)

(cherry picked from commit 80c71c191b2ed56984dc301b7d41133e09340fed)

* add copy

* update button copy

* add feature flag logic

* restore copy, fix build error

* fix copy

* remove unused copy

---------

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
---
 .../bulk/bulk-restore-revoke.component.html   | 143 +++++++++++++++---
 .../bulk/bulk-restore-revoke.component.ts     |  25 ++-
 .../components/bulk/bulk-status.component.ts  |   1 +
 apps/web/src/locales/en/messages.json         |  33 ++++
 4 files changed, 182 insertions(+), 20 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html
index d05fed4f922..3414cc8d325 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.html
@@ -1,7 +1,14 @@
-<bit-dialog>
+<bit-dialog
+  dialogSize="large"
+  *ngIf="{ enabled: accountDeprovisioningEnabled$ | async } as accountDeprovisioning"
+>
   <ng-container bitDialogTitle>
-    <h1>{{ bulkTitle }}</h1>
+    <h1 *ngIf="accountDeprovisioning.enabled; else nonMemberTitle">{{ bulkMemberTitle }}</h1>
+    <ng-template #nonMemberTitle>
+      <h1>{{ bulkTitle }}</h1>
+    </ng-template>
   </ng-container>
+
   <div bitDialogContent>
     <bit-callout type="danger" *ngIf="users.length <= 0">
       {{ "noSelectedUsersApplicable" | i18n }}
@@ -11,15 +18,81 @@
       {{ error }}
     </bit-callout>
 
-    <ng-container *ngIf="!done">
-      <bit-callout type="warning" *ngIf="users.length > 0 && !error && isRevoking">
-        <p>{{ "revokeUsersWarning" | i18n }}</p>
-        <p *ngIf="this.showNoMasterPasswordWarning">
-          {{ "removeMembersWithoutMasterPasswordWarning" | i18n }}
-        </p>
-      </bit-callout>
+    <bit-callout
+      type="danger"
+      *ngIf="nonCompliantMembers && accountDeprovisioning.enabled"
+      title="{{ 'nonCompliantMembersTitle' | i18n }}"
+    >
+      {{ "nonCompliantMembersError" | i18n }}
+    </bit-callout>
 
-      <bit-table>
+    <ng-container *ngIf="!done">
+      <ng-container *ngIf="accountDeprovisioning.enabled">
+        <div *ngIf="users.length > 0 && !error && isRevoking">
+          <p>{{ "revokeMembersWarning" | i18n }}</p>
+          <ul>
+            <li>
+              {{ "claimedAccountRevoke" | i18n }}
+            </li>
+            <li>
+              {{ "unclaimedAccountRevoke" | i18n }}
+            </li>
+          </ul>
+          <p>
+            {{ "restoreMembersInstructions" | i18n }}
+          </p>
+          <p *ngIf="this.showNoMasterPasswordWarning">
+            {{ "removeMembersWithoutMasterPasswordWarning" | i18n }}
+          </p>
+        </div>
+      </ng-container>
+
+      <ng-container *ngIf="!accountDeprovisioning.enabled">
+        <bit-callout type="warning" *ngIf="users.length > 0 && !error && isRevoking">
+          <p>{{ "revokeUsersWarning" | i18n }}</p>
+        </bit-callout>
+      </ng-container>
+
+      <bit-table *ngIf="accountDeprovisioning.enabled">
+        <ng-container header>
+          <tr>
+            <th bitCell class="tw-w-1/2">{{ "member" | i18n }}</th>
+            <th bitCell *ngIf="isRevoking">{{ "details" | i18n }}</th>
+            <th bitCell *ngIf="this.showNoMasterPasswordWarning">{{ "details" | i18n }}</th>
+          </tr>
+        </ng-container>
+        <ng-template body>
+          <tr bitRow *ngFor="let user of users">
+            <td bitCell width="30">
+              <div class="tw-flex tw-items-center">
+                <div class="tw-flex tw-items-center tw-mr-6">
+                  <bit-avatar [text]="user | userName" [id]="user.id" size="small"></bit-avatar>
+                </div>
+                <div>
+                  {{ user.email }}
+                  <small class="tw-block tw-text-muted" *ngIf="user.name">{{ user.name }}</small>
+                </div>
+              </div>
+            </td>
+            <td *ngIf="isRevoking" bitCell width="30">
+              {{
+                user.managedByOrganization ? ("claimedAccount" | i18n) : ("unclaimedAccount" | i18n)
+              }}
+            </td>
+            <td bitCell *ngIf="this.showNoMasterPasswordWarning">
+              <span class="tw-block tw-lowercase tw-text-muted">
+                <ng-container *ngIf="user.hasMasterPassword === true"> - </ng-container>
+                <ng-container *ngIf="user.hasMasterPassword === false">
+                  <i class="bwi bwi-exclamation-triangle" aria-hidden="true"></i>
+                  {{ "noMasterPassword" | i18n }}
+                </ng-container>
+              </span>
+            </td>
+          </tr>
+        </ng-template>
+      </bit-table>
+
+      <bit-table *ngIf="!accountDeprovisioning.enabled">
         <ng-container header>
           <tr>
             <th bitCell colspan="2">{{ "user" | i18n }}</th>
@@ -50,21 +123,55 @@
     </ng-container>
 
     <ng-container *ngIf="done">
-      <bit-table>
+      <bit-table *ngIf="accountDeprovisioning.enabled">
         <ng-container header>
           <tr>
-            <th bitCell colspan="2">{{ "user" | i18n }}</th>
-            <th>{{ "status" | i18n }}</th>
+            <th bitCell class="tw-w-1/2">{{ "member" | i18n }}</th>
+            <th bitCell>{{ "status" | i18n }}</th>
           </tr>
         </ng-container>
         <ng-template body>
           <tr bitRow *ngFor="let user of users">
             <td bitCell width="30">
-              <bit-avatar [text]="user | userName" [id]="user.id" size="small"></bit-avatar>
+              <div class="tw-flex tw-items-center">
+                <div class="tw-flex tw-items-center tw-mr-6">
+                  <bit-avatar [text]="user | userName" [id]="user.id" size="small"></bit-avatar>
+                </div>
+                <div>
+                  {{ user.email }}
+                  <small class="tw-block tw-text-muted" *ngIf="user.name">{{ user.name }}</small>
+                </div>
+              </div>
             </td>
-            <td bitCell>
-              {{ user.email }}
-              <small class="tw-block tw-text-muted" *ngIf="user.name">{{ user.name }}</small>
+            <td bitCell *ngIf="statuses.has(user.id)">
+              {{ statuses.get(user.id) }}
+            </td>
+            <td bitCell *ngIf="!statuses.has(user.id)">
+              {{ "bulkFilteredMessage" | i18n }}
+            </td>
+          </tr>
+        </ng-template>
+      </bit-table>
+
+      <bit-table *ngIf="!accountDeprovisioning.enabled">
+        <ng-container header>
+          <tr>
+            <th bitCell class="tw-w-1/2">{{ "member" | i18n }}</th>
+            <th bitCell>{{ "status" | i18n }}</th>
+          </tr>
+        </ng-container>
+        <ng-template body>
+          <tr bitRow *ngFor="let user of users">
+            <td bitCell width="30">
+              <div class="tw-flex tw-items-center">
+                <div class="tw-flex tw-items-center tw-mr-6">
+                  <bit-avatar [text]="user | userName" [id]="user.id" size="small"></bit-avatar>
+                </div>
+                <div>
+                  {{ user.email }}
+                  <small class="tw-block tw-text-muted" *ngIf="user.name">{{ user.name }}</small>
+                </div>
+              </div>
             </td>
             <td bitCell *ngIf="statuses.has(user.id)">
               {{ statuses.get(user.id) }}
@@ -79,7 +186,7 @@
   </div>
   <ng-container bitDialogFooter>
     <button type="button" bitButton *ngIf="!done && users.length > 0" [bitAction]="submit">
-      {{ bulkTitle }}
+      {{ accountDeprovisioning.enabled ? bulkMemberTitle : bulkTitle }}
     </button>
     <button type="button" bitButton buttonType="secondary" bitDialogClose>
       {{ "close" | i18n }}
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts
index 0ac413eb820..d2bbe4cc40f 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts
@@ -1,8 +1,11 @@
 import { DIALOG_DATA } from "@angular/cdk/dialog";
 import { Component, Inject } from "@angular/core";
+import { Observable } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService } from "@bitwarden/components";
 
@@ -29,10 +32,13 @@ export class BulkRestoreRevokeComponent {
   done = false;
   error: string;
   showNoMasterPasswordWarning = false;
+  nonCompliantMembers: boolean = false;
+  accountDeprovisioningEnabled$: Observable<boolean>;
 
   constructor(
     protected i18nService: I18nService,
     private organizationUserApiService: OrganizationUserApiService,
+    private configService: ConfigService,
     @Inject(DIALOG_DATA) protected data: BulkRestoreDialogParams,
   ) {
     this.isRevoking = data.isRevoking;
@@ -41,6 +47,9 @@ export class BulkRestoreRevokeComponent {
     this.showNoMasterPasswordWarning = this.users.some(
       (u) => u.status > OrganizationUserStatusType.Invited && u.hasMasterPassword === false,
     );
+    this.accountDeprovisioningEnabled$ = this.configService.getFeatureFlag$(
+      FeatureFlag.AccountDeprovisioning,
+    );
   }
 
   get bulkTitle() {
@@ -48,14 +57,26 @@ export class BulkRestoreRevokeComponent {
     return this.i18nService.t(titleKey);
   }
 
+  get bulkMemberTitle() {
+    const titleKey = this.isRevoking ? "revokeMembers" : "restoreMembers";
+    return this.i18nService.t(titleKey);
+  }
+
   submit = async () => {
     try {
       const response = await this.performBulkUserAction();
 
       const bulkMessage = this.isRevoking ? "bulkRevokedMessage" : "bulkRestoredMessage";
-      response.data.forEach((entry) => {
-        const error = entry.error !== "" ? entry.error : this.i18nService.t(bulkMessage);
+
+      response.data.forEach(async (entry) => {
+        const error =
+          entry.error !== ""
+            ? this.i18nService.t("cannotRestoreAccessError")
+            : this.i18nService.t(bulkMessage);
         this.statuses.set(entry.id, error);
+        if (entry.error !== "") {
+          this.nonCompliantMembers = true;
+        }
       });
       this.done = true;
     } catch (e) {
diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.ts
index 7bcae82cfd8..87037304f52 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.ts
@@ -21,6 +21,7 @@ export interface BulkUserDetails {
   email: string;
   status: OrganizationUserStatusType | ProviderUserStatusType;
   hasMasterPassword?: boolean;
+  managedByOrganization?: boolean;
 }
 
 type BulkStatusEntry = {
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 660a00c364d..7025e194786 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -29,6 +29,33 @@
   "notifiedMembers": {
     "message": "Notified members"
   },
+  "revokeMembers": {
+    "message": "Revoke members"
+  },
+  "restoreMembers": {
+    "message": "Restore members"
+  },
+  "revokeMembersWarning":{
+    "message": "Members with claimed and unclaimed accounts will have different results when revoked:"
+  },
+  "claimedAccountRevoke": {
+    "message": "Claimed account: Revoke access to Bitwarden account"
+  },
+  "unclaimedAccountRevoke": {
+    "message": "Unclaimed account: Revoke access to organization data"
+  },
+  "claimedAccount": {
+    "message": "Claimed account"
+  },
+  "unclaimedAccount": {
+    "message": "Unclaimed account"
+  },
+  "restoreMembersInstructions": {
+    "message": "To restore a member's account, go to the Revoked tab. The process may take a few seconds to complete and cannot be interrupted or canceled."
+  },
+  "cannotRestoreAccessError":{
+    "message": "Cannot restore organization access"
+  },
   "allApplicationsWithCount": {
     "message": "All applications ($COUNT$)",
     "placeholders": {
@@ -5610,6 +5637,12 @@
   "bulkFilteredMessage": {
     "message": "Excluded, not applicable for this action"
   },
+  "nonCompliantMembersTitle":{
+    "message": "Non-compliant members"
+  },
+  "nonCompliantMembersError":{
+    "message": "Members that are non-compliant with the Single organization or Two-step login policy cannot be restored until they adhere to the policy requirements"
+  },
   "fingerprint": {
     "message": "Fingerprint"
   },

From 9188a31b4a399b6fae3892a0be5091f4d3b7cef7 Mon Sep 17 00:00:00 2001
From: Andreas Coroiu <andreas.coroiu@gmail.com>
Date: Tue, 3 Dec 2024 17:04:51 +0100
Subject: [PATCH 10/46] fix: group zbus dependencies (#12165)

---
 .github/renovate.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/renovate.json b/.github/renovate.json
index 446aa789ebf..9295ea5d61e 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -39,6 +39,10 @@
       "groupName": "macOS/iOS bindings",
       "matchPackageNames": ["core-foundation", "security-framework", "security-framework-sys"]
     },
+    {
+      "groupName": "zbus",
+      "matchPackageNames": ["zbus", "zbus_polkit"]
+    },
     {
       "matchPackageNames": [
         "base64-loader",

From 60e52dd2f299d81889678d38d6ee2abb0856ee69 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Tue, 3 Dec 2024 09:37:44 -0800
Subject: [PATCH 11/46] [PM-14965] Fix password reprompt for context menu
 actions (#12213)

* [PM-14965] Add return value for copy-cipher-field.service

* [PM-14965] Cleanup loadAction handling in updated browser view item page

* [PM-14965] Fix unit tests

* [PM-14965] Clear copy mock
---
 .../view-v2/view-v2.component.spec.ts         | 67 ++++++++++++-
 .../vault-v2/view-v2/view-v2.component.ts     | 96 +++++++++++++++++--
 .../copy-cipher-field.service.spec.ts         | 33 ++++---
 .../src/services/copy-cipher-field.service.ts | 12 ++-
 4 files changed, 185 insertions(+), 23 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
index 36343d3a661..bc84dd337cb 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.spec.ts
@@ -5,7 +5,12 @@ import { Subject } from "rxjs";
 
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { AUTOFILL_ID } from "@bitwarden/common/autofill/constants";
+import {
+  AUTOFILL_ID,
+  COPY_PASSWORD_ID,
+  COPY_USERNAME_ID,
+  COPY_VERIFICATION_CODE_ID,
+} from "@bitwarden/common/autofill/constants";
 import { EventType } from "@bitwarden/common/enums";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
@@ -17,7 +22,10 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+import { CopyCipherFieldService } from "@bitwarden/vault";
 
+import { BrowserApi } from "../../../../../platform/browser/browser-api";
+import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 
 import { VaultPopupAutofillService } from "./../../../services/vault-popup-autofill.service";
@@ -34,17 +42,26 @@ describe("ViewV2Component", () => {
   const params$ = new Subject();
   const mockNavigate = jest.fn();
   const collect = jest.fn().mockResolvedValue(null);
-  const doAutofill = jest.fn();
+  const doAutofill = jest.fn().mockResolvedValue(true);
+  const copy = jest.fn().mockResolvedValue(true);
 
   const mockCipher = {
     id: "122-333-444",
     type: CipherType.Login,
     orgId: "222-444-555",
+    login: {
+      username: "test-username",
+      password: "test-password",
+      totp: "123",
+    },
   };
 
   const mockVaultPopupAutofillService = {
     doAutofill,
   };
+  const mockCopyCipherFieldService = {
+    copy,
+  };
   const mockUserId = Utils.newGuid() as UserId;
   const accountService: FakeAccountService = mockAccountServiceWith(mockUserId);
 
@@ -57,6 +74,7 @@ describe("ViewV2Component", () => {
     mockNavigate.mockClear();
     collect.mockClear();
     doAutofill.mockClear();
+    copy.mockClear();
 
     await TestBed.configureTestingModule({
       imports: [ViewV2Component],
@@ -91,6 +109,10 @@ describe("ViewV2Component", () => {
             canDeleteCipher$: jest.fn().mockReturnValue(true),
           },
         },
+        {
+          provide: CopyCipherFieldService,
+          useValue: mockCopyCipherFieldService,
+        },
       ],
     }).compileComponents();
 
@@ -159,5 +181,46 @@ describe("ViewV2Component", () => {
 
       expect(doAutofill).toHaveBeenCalledOnce();
     }));
+
+    it('invokes `copy` when action="copy-username"', fakeAsync(() => {
+      params$.next({ action: COPY_USERNAME_ID });
+
+      flush(); // Resolve all promises
+
+      expect(copy).toHaveBeenCalledOnce();
+    }));
+
+    it('invokes `copy` when action="copy-password"', fakeAsync(() => {
+      params$.next({ action: COPY_PASSWORD_ID });
+
+      flush(); // Resolve all promises
+
+      expect(copy).toHaveBeenCalledOnce();
+    }));
+
+    it('invokes `copy` when action="copy-totp"', fakeAsync(() => {
+      params$.next({ action: COPY_VERIFICATION_CODE_ID });
+
+      flush(); // Resolve all promises
+
+      expect(copy).toHaveBeenCalledOnce();
+    }));
+
+    it("closes the popout after a load action", fakeAsync(() => {
+      jest.spyOn(BrowserPopupUtils, "inPopout").mockReturnValueOnce(true);
+      jest.spyOn(BrowserPopupUtils, "inSingleActionPopout").mockReturnValueOnce(true);
+      const closeSpy = jest.spyOn(BrowserPopupUtils, "closeSingleActionPopout");
+      const focusSpy = jest
+        .spyOn(BrowserApi, "focusTab")
+        .mockImplementation(() => Promise.resolve());
+
+      params$.next({ action: AUTOFILL_ID, senderTabId: 99 });
+
+      flush(); // Resolve all promises
+
+      expect(doAutofill).toHaveBeenCalledOnce();
+      expect(focusSpy).toHaveBeenCalledWith(99);
+      expect(closeSpy).toHaveBeenCalledOnce();
+    }));
   });
 });
diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
index 8242fd8747e..f739c0ce82e 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
@@ -10,7 +10,13 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { AUTOFILL_ID, SHOW_AUTOFILL_BUTTON } from "@bitwarden/common/autofill/constants";
+import {
+  AUTOFILL_ID,
+  COPY_PASSWORD_ID,
+  COPY_USERNAME_ID,
+  COPY_VERIFICATION_CODE_ID,
+  SHOW_AUTOFILL_BUTTON,
+} from "@bitwarden/common/autofill/constants";
 import { EventType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@@ -18,7 +24,6 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
 import { ViewPasswordHistoryService } from "@bitwarden/common/vault/abstractions/view-password-history.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
-import { FolderView } from "@bitwarden/common/vault/models/view/folder.view";
 import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
 import {
   AsyncActionsModule,
@@ -28,19 +33,34 @@ import {
   SearchModule,
   ToastService,
 } from "@bitwarden/components";
+import { CopyCipherFieldService } from "@bitwarden/vault";
 
 import { PremiumUpgradePromptService } from "../../../../../../../../libs/common/src/vault/abstractions/premium-upgrade-prompt.service";
 import { CipherViewComponent } from "../../../../../../../../libs/vault/src/cipher-view";
+import { BrowserApi } from "../../../../../platform/browser/browser-api";
+import BrowserPopupUtils from "../../../../../platform/popup/browser-popup-utils";
 import { PopOutComponent } from "../../../../../platform/popup/components/pop-out.component";
 import { PopupRouterCacheService } from "../../../../../platform/popup/view-cache/popup-router-cache.service";
 import { BrowserPremiumUpgradePromptService } from "../../../services/browser-premium-upgrade-prompt.service";
 import { BrowserViewPasswordHistoryService } from "../../../services/browser-view-password-history.service";
+import { closeViewVaultItemPopout, VaultPopoutType } from "../../../utils/vault-popout-window";
 
 import { PopupFooterComponent } from "./../../../../../platform/popup/layout/popup-footer.component";
 import { PopupHeaderComponent } from "./../../../../../platform/popup/layout/popup-header.component";
 import { PopupPageComponent } from "./../../../../../platform/popup/layout/popup-page.component";
 import { VaultPopupAutofillService } from "./../../../services/vault-popup-autofill.service";
 
+/**
+ * The types of actions that can be triggered when loading the view vault item popout via the
+ * extension ContextMenu. See context-menu-clicked-handler.ts for more information.
+ */
+type LoadAction =
+  | typeof AUTOFILL_ID
+  | typeof SHOW_AUTOFILL_BUTTON
+  | typeof COPY_USERNAME_ID
+  | typeof COPY_PASSWORD_ID
+  | typeof COPY_VERIFICATION_CODE_ID;
+
 @Component({
   selector: "app-view-v2",
   templateUrl: "view-v2.component.html",
@@ -68,10 +88,10 @@ export class ViewV2Component {
   headerText: string;
   cipher: CipherView;
   organization$: Observable<Organization>;
-  folder$: Observable<FolderView>;
   canDeleteCipher$: Observable<boolean>;
   collections$: Observable<CollectionView[]>;
-  loadAction: typeof AUTOFILL_ID | typeof SHOW_AUTOFILL_BUTTON;
+  loadAction: LoadAction;
+  senderTabId?: number;
 
   constructor(
     private route: ActivatedRoute,
@@ -86,6 +106,7 @@ export class ViewV2Component {
     private eventCollectionService: EventCollectionService,
     private popupRouterCacheService: PopupRouterCacheService,
     protected cipherAuthorizationService: CipherAuthorizationService,
+    private copyCipherFieldService: CopyCipherFieldService,
   ) {
     this.subscribeToParams();
   }
@@ -95,13 +116,15 @@ export class ViewV2Component {
       .pipe(
         switchMap(async (params): Promise<CipherView> => {
           this.loadAction = params.action;
+          this.senderTabId = params.senderTabId ? parseInt(params.senderTabId, 10) : undefined;
           return await this.getCipherData(params.cipherId);
         }),
         switchMap(async (cipher) => {
           this.cipher = cipher;
           this.headerText = this.setHeader(cipher.type);
-          if (this.loadAction === AUTOFILL_ID) {
-            await this.vaultPopupAutofillService.doAutofill(this.cipher);
+
+          if (this.loadAction) {
+            await this._handleLoadAction(this.loadAction, this.senderTabId);
           }
 
           this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(cipher);
@@ -211,4 +234,65 @@ export class ViewV2Component {
   protected showFooter(): boolean {
     return this.cipher && (!this.cipher.isDeleted || (this.cipher.isDeleted && this.cipher.edit));
   }
+
+  /**
+   * Handles the load action for the view vault item popout. These actions are typically triggered
+   * via the extension context menu. It is necessary to render the view for items that have password
+   * reprompt enabled.
+   * @param loadAction
+   * @param senderTabId
+   * @private
+   */
+  private async _handleLoadAction(loadAction: LoadAction, senderTabId?: number): Promise<void> {
+    let actionSuccess = false;
+
+    // Both vaultPopupAutofillService and copyCipherFieldService will perform password re-prompting internally.
+
+    switch (loadAction) {
+      case "show-autofill-button":
+        // This action simply shows the cipher view, no need to do anything.
+        return;
+      case "autofill":
+        actionSuccess = await this.vaultPopupAutofillService.doAutofill(this.cipher, false);
+        break;
+      case "copy-username":
+        actionSuccess = await this.copyCipherFieldService.copy(
+          this.cipher.login.username,
+          "username",
+          this.cipher,
+        );
+        break;
+      case "copy-password":
+        actionSuccess = await this.copyCipherFieldService.copy(
+          this.cipher.login.password,
+          "password",
+          this.cipher,
+        );
+        break;
+      case "copy-totp":
+        actionSuccess = await this.copyCipherFieldService.copy(
+          this.cipher.login.totp,
+          "totp",
+          this.cipher,
+        );
+        break;
+    }
+
+    if (BrowserPopupUtils.inPopout(window)) {
+      setTimeout(
+        async () => {
+          if (
+            BrowserPopupUtils.inSingleActionPopout(window, VaultPopoutType.viewVaultItem) &&
+            senderTabId
+          ) {
+            await BrowserApi.focusTab(senderTabId);
+            await closeViewVaultItemPopout(`${VaultPopoutType.viewVaultItem}_${this.cipher.id}`);
+          } else {
+            await this.popupRouterCacheService.back();
+          }
+        },
+        actionSuccess ? 1000 : 0,
+      );
+    }
+  }
 }
diff --git a/libs/vault/src/services/copy-cipher-field.service.spec.ts b/libs/vault/src/services/copy-cipher-field.service.spec.ts
index c3d12f88a73..fa148b0e2e3 100644
--- a/libs/vault/src/services/copy-cipher-field.service.spec.ts
+++ b/libs/vault/src/services/copy-cipher-field.service.spec.ts
@@ -58,18 +58,21 @@ describe("CopyCipherFieldService", () => {
 
     it("should return early when valueToCopy is null", async () => {
       valueToCopy = null;
-      await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+      const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+      expect(result).toBeFalsy();
       expect(platformUtilsService.copyToClipboard).not.toHaveBeenCalled();
     });
 
     it("should copy value to clipboard", async () => {
-      await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+      const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+      expect(result).toBeTruthy();
       expect(platformUtilsService.copyToClipboard).toHaveBeenCalledWith(valueToCopy);
     });
 
     it("should show a success toast on copy", async () => {
       i18nService.t.mockReturnValueOnce("Username").mockReturnValueOnce("Username copied");
-      await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+      const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+      expect(result).toBeTruthy();
       expect(toastService.showToast).toHaveBeenCalledWith({
         variant: "success",
         message: "Username copied",
@@ -87,26 +90,30 @@ describe("CopyCipherFieldService", () => {
 
       it("should show password prompt when actionType requires it", async () => {
         passwordRepromptService.showPasswordPrompt.mockResolvedValue(true);
-        await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        expect(result).toBeTruthy();
         expect(passwordRepromptService.showPasswordPrompt).toHaveBeenCalled();
       });
 
       it("should skip password prompt when cipher.reprompt is 'None'", async () => {
         cipher.reprompt = CipherRepromptType.None;
-        await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        expect(result).toBeTruthy();
         expect(passwordRepromptService.showPasswordPrompt).not.toHaveBeenCalled();
         expect(platformUtilsService.copyToClipboard).toHaveBeenCalled();
       });
 
       it("should skip password prompt when skipReprompt is true", async () => {
         skipReprompt = true;
-        await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        expect(result).toBeTruthy();
         expect(passwordRepromptService.showPasswordPrompt).not.toHaveBeenCalled();
       });
 
       it("should return early when password prompt is not confirmed", async () => {
         passwordRepromptService.showPasswordPrompt.mockResolvedValue(false);
-        await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        expect(result).toBeFalsy();
         expect(platformUtilsService.copyToClipboard).not.toHaveBeenCalled();
       });
     });
@@ -123,7 +130,8 @@ describe("CopyCipherFieldService", () => {
       it("should get TOTP code when allowed from premium", async () => {
         billingAccountProfileStateService.hasPremiumFromAnySource$ = of(true);
         totpService.getCode.mockResolvedValue("123456");
-        await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        expect(result).toBeTruthy();
         expect(totpService.getCode).toHaveBeenCalledWith(valueToCopy);
         expect(platformUtilsService.copyToClipboard).toHaveBeenCalledWith("123456");
       });
@@ -131,21 +139,24 @@ describe("CopyCipherFieldService", () => {
       it("should get TOTP code when allowed from organization", async () => {
         cipher.organizationUseTotp = true;
         totpService.getCode.mockResolvedValue("123456");
-        await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        expect(result).toBeTruthy();
         expect(totpService.getCode).toHaveBeenCalledWith(valueToCopy);
         expect(platformUtilsService.copyToClipboard).toHaveBeenCalledWith("123456");
       });
 
       it("should return early when the user is not allowed to use TOTP", async () => {
         billingAccountProfileStateService.hasPremiumFromAnySource$ = of(false);
-        await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        expect(result).toBeFalsy();
         expect(totpService.getCode).not.toHaveBeenCalled();
         expect(platformUtilsService.copyToClipboard).not.toHaveBeenCalled();
       });
 
       it("should return early when TOTP is not set", async () => {
         cipher.login.totp = null;
-        await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        const result = await service.copy(valueToCopy, actionType, cipher, skipReprompt);
+        expect(result).toBeFalsy();
         expect(totpService.getCode).not.toHaveBeenCalled();
         expect(platformUtilsService.copyToClipboard).not.toHaveBeenCalled();
       });
diff --git a/libs/vault/src/services/copy-cipher-field.service.ts b/libs/vault/src/services/copy-cipher-field.service.ts
index 1867b10cd17..81df6306659 100644
--- a/libs/vault/src/services/copy-cipher-field.service.ts
+++ b/libs/vault/src/services/copy-cipher-field.service.ts
@@ -95,13 +95,15 @@ export class CopyCipherFieldService {
    * @param actionType The type of field being copied.
    * @param cipher The cipher containing the field to copy.
    * @param skipReprompt Whether to skip password re-prompting.
+   *
+   * @returns Whether the field was copied successfully.
    */
   async copy(
     valueToCopy: string,
     actionType: CopyAction,
     cipher: CipherView,
     skipReprompt: boolean = false,
-  ) {
+  ): Promise<boolean> {
     const action = CopyActions[actionType];
     if (
       !skipReprompt &&
@@ -109,16 +111,16 @@ export class CopyCipherFieldService {
       action.protected &&
       !(await this.passwordRepromptService.showPasswordPrompt())
     ) {
-      return;
+      return false;
     }
 
     if (valueToCopy == null) {
-      return;
+      return false;
     }
 
     if (actionType === "totp") {
       if (!(await this.totpAllowed(cipher))) {
-        return;
+        return false;
       }
       valueToCopy = await this.totpService.getCode(valueToCopy);
     }
@@ -138,6 +140,8 @@ export class CopyCipherFieldService {
         cipher.organizationId,
       );
     }
+
+    return true;
   }
 
   /**

From 694f2c7da2af90e0e925b7d62f8e9e3303d6a445 Mon Sep 17 00:00:00 2001
From: Brandon Treston <btreston@bitwarden.com>
Date: Tue, 3 Dec 2024 12:55:42 -0500
Subject: [PATCH 12/46] add policy component form validation to policy edit
 component (#12150)

---
 .../organizations/policies/policy-edit.component.html     | 8 +++++++-
 .../organizations/policies/policy-edit.component.ts       | 7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
index f656d488e06..671083a2318 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
@@ -15,7 +15,13 @@
       </div>
     </ng-container>
     <ng-container bitDialogFooter>
-      <button bitButton buttonType="primary" [disabled]="saveDisabled" bitFormButton type="submit">
+      <button
+        bitButton
+        buttonType="primary"
+        [disabled]="saveDisabled$ | async"
+        bitFormButton
+        type="submit"
+      >
         {{ "save" | i18n }}
       </button>
       <button bitButton buttonType="secondary" bitDialogClose type="button">
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
index 644ec1d5140..6a869aff227 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
@@ -8,6 +8,7 @@ import {
   ViewContainerRef,
 } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
+import { Observable, map } from "rxjs";
 
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
@@ -42,7 +43,7 @@ export class PolicyEditComponent implements AfterViewInit {
   policyType = PolicyType;
   loading = true;
   enabled = false;
-  saveDisabled = false;
+  saveDisabled$: Observable<boolean>;
   defaultTypes: any[];
   policyComponent: BasePolicyComponent;
 
@@ -73,7 +74,9 @@ export class PolicyEditComponent implements AfterViewInit {
     this.policyComponent.policy = this.data.policy;
     this.policyComponent.policyResponse = this.policyResponse;
 
-    this.saveDisabled = !this.policyResponse.canToggleState;
+    this.saveDisabled$ = this.policyComponent.data.statusChanges.pipe(
+      map((status) => status !== "VALID" || !this.policyResponse.canToggleState),
+    );
 
     this.cdr.detectChanges();
   }

From 2e53a645c90aabc7cc74026bf2a238a07df5b123 Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Tue, 3 Dec 2024 11:25:02 -0800
Subject: [PATCH 13/46] [PM-15520] Move organizationPaymentStatus$ out of page
 setup flow and tweak it to avoid hanging when user is not an owner (#12224)

---
 .../individual-vault/vault.component.html     |  4 +-
 .../vault/individual-vault/vault.component.ts | 65 +++++++++----------
 2 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 679d2ce6f7e..75332dcf72a 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -1,4 +1,6 @@
-<app-vault-banners [organizationsPaymentStatus]="organizationsPaymentStatus"></app-vault-banners>
+<app-vault-banners
+  [organizationsPaymentStatus]="organizationsPaymentStatus$ | async"
+></app-vault-banners>
 
 <app-vault-header
   [filter]="filter"
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 9d235784d05..5f66bb49af5 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -181,7 +181,6 @@ export class VaultComponent implements OnInit, OnDestroy {
   protected canCreateCollections = false;
   protected currentSearchText$: Observable<string>;
   private activeUserId: UserId;
-  protected organizationsPaymentStatus: FreeTrial[] = [];
   private searchText$ = new Subject<string>();
   private refresh$ = new BehaviorSubject<void>(null);
   private destroy$ = new Subject<void>();
@@ -209,6 +208,37 @@ export class VaultComponent implements OnInit, OnDestroy {
     ),
   );
 
+  protected organizationsPaymentStatus$: Observable<FreeTrial[]> = combineLatest([
+    this.organizationService.organizations$.pipe(
+      map((organizations) => organizations?.filter((org) => org.isOwner) ?? []),
+    ),
+    this.hasSubscription$,
+  ]).pipe(
+    switchMap(([ownerOrgs, hasSubscription]) => {
+      if (!ownerOrgs || ownerOrgs.length === 0 || !hasSubscription) {
+        return of([]);
+      }
+      return combineLatest(
+        ownerOrgs.map((org) =>
+          combineLatest([
+            this.organizationApiService.getSubscription(org.id),
+            this.organizationBillingService.getPaymentSource(org.id),
+          ]).pipe(
+            map(([subscription, paymentSource]) => {
+              return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
+                org,
+                subscription,
+                paymentSource,
+              );
+            }),
+          ),
+        ),
+      );
+    }),
+    map((results) => results.filter((result) => result.shownBanner)),
+    shareReplay({ refCount: false, bufferSize: 1 }),
+  );
+
   constructor(
     private syncService: SyncService,
     private route: ActivatedRoute,
@@ -425,36 +455,6 @@ export class VaultComponent implements OnInit, OnDestroy {
 
     this.unpaidSubscriptionDialog$.pipe(takeUntil(this.destroy$)).subscribe();
 
-    const organizationsPaymentStatus$ = combineLatest([
-      this.organizationService.organizations$,
-      this.hasSubscription$,
-    ]).pipe(
-      switchMap(([allOrganizations, hasSubscription]) => {
-        if (!allOrganizations || allOrganizations.length === 0 || !hasSubscription) {
-          return of([]);
-        }
-        return combineLatest(
-          allOrganizations
-            .filter((org) => org.isOwner && hasSubscription)
-            .map((org) =>
-              combineLatest([
-                this.organizationApiService.getSubscription(org.id),
-                this.organizationBillingService.getPaymentSource(org.id),
-              ]).pipe(
-                map(([subscription, paymentSource]) => {
-                  return this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
-                    org,
-                    subscription,
-                    paymentSource,
-                  );
-                }),
-              ),
-            ),
-        );
-      }),
-      map((results) => results.filter((result) => result.shownBanner)),
-    );
-
     firstSetup$
       .pipe(
         switchMap(() => this.refresh$),
@@ -468,7 +468,6 @@ export class VaultComponent implements OnInit, OnDestroy {
             ciphers$,
             collections$,
             selectedCollection$,
-            organizationsPaymentStatus$,
           ]),
         ),
         takeUntil(this.destroy$),
@@ -482,7 +481,6 @@ export class VaultComponent implements OnInit, OnDestroy {
           ciphers,
           collections,
           selectedCollection,
-          organizationsPaymentStatus,
         ]) => {
           this.filter = filter;
           this.canAccessPremium = canAccessPremium;
@@ -498,7 +496,6 @@ export class VaultComponent implements OnInit, OnDestroy {
 
           this.showBulkMove = filter.type !== "trash";
           this.isEmpty = collections?.length === 0 && ciphers?.length === 0;
-          this.organizationsPaymentStatus = organizationsPaymentStatus;
           this.performingInitialLoad = false;
           this.refreshing = false;
         },

From c073e91f17f542a2297117a5ff4c1ef27ebd9cc6 Mon Sep 17 00:00:00 2001
From: Alec Rippberger <127791530+alec-livefront@users.noreply.github.com>
Date: Tue, 3 Dec 2024 13:55:40 -0600
Subject: [PATCH 14/46] feat(auth): [PM-13659] implement 2FA timeout handling
 across clients

Add timeout state management for two-factor authentication flows in web, desktop,
and browser extension clients. Includes:

- New timeout screen component with 5-minute session limit
- Updated UI elements and styling
- Comprehensive test coverage

Refs: PM-13659
---
 apps/browser/src/_locales/en/messages.json    |  6 +++++
 apps/browser/src/popup/app-routing.module.ts  | 25 +++++++++++++++++++
 apps/desktop/src/app/app-routing.module.ts    | 18 +++++++++++++
 apps/desktop/src/locales/en/messages.json     |  6 +++++
 apps/web/src/app/oss-routing.module.ts        | 25 ++++++++++++++++++-
 apps/web/src/locales/en/messages.json         |  6 +++++
 .../two-factor-auth-expired.component.ts      | 25 +++++++++++++++++++
 .../components/two-factor.component.spec.ts   |  9 +++++++
 .../auth/components/two-factor.component.ts   | 19 +++++++++++++-
 libs/auth/src/angular/icons/index.ts          |  1 +
 .../angular/icons/two-factor-timeout.icon.ts  |  8 ++++++
 .../abstractions/login-strategy.service.ts    |  4 +++
 .../login-strategy.service.ts                 | 17 +++++++++++--
 13 files changed, 165 insertions(+), 4 deletions(-)
 create mode 100644 libs/angular/src/auth/components/two-factor-auth/two-factor-auth-expired.component.ts
 create mode 100644 libs/auth/src/angular/icons/two-factor-timeout.icon.ts

diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index ab1c6377e6a..39bc6ed9b86 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -1319,6 +1319,12 @@
   "enterVerificationCodeApp": {
     "message": "Enter the 6 digit verification code from your authenticator app."
   },
+  "authenticationTimeout": {
+    "message": "Authentication timeout"
+  },
+  "authenticationSessionTimedOut": {
+    "message": "The authentication session timed out. Please restart the login process."
+  },
   "enterVerificationCodeEmail": {
     "message": "Enter the 6 digit verification code that was emailed to $EMAIL$.",
     "placeholders": {
diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 77a720557c6..b158a83c566 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -6,6 +6,7 @@ import {
   EnvironmentSelectorRouteData,
   ExtensionDefaultOverlayPosition,
 } from "@bitwarden/angular/auth/components/environment-selector.component";
+import { TwoFactorTimeoutComponent } from "@bitwarden/angular/auth/components/two-factor-auth/two-factor-auth-expired.component";
 import { unauthUiRefreshRedirect } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-redirect";
 import { unauthUiRefreshSwap } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-route-swap";
 import {
@@ -38,6 +39,7 @@ import {
   VaultIcon,
   LoginDecryptionOptionsComponent,
   DevicesIcon,
+  TwoFactorTimeoutIcon,
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
@@ -199,6 +201,29 @@ const routes: Routes = [
       ],
     },
   ),
+  {
+    path: "",
+    component: ExtensionAnonLayoutWrapperComponent,
+    children: [
+      {
+        path: "2fa-timeout",
+        canActivate: [unauthGuardFn(unauthRouteOverrides)],
+        children: [
+          {
+            path: "",
+            component: TwoFactorTimeoutComponent,
+          },
+        ],
+        data: {
+          pageTitle: {
+            key: "authenticationTimeout",
+          },
+          pageIcon: TwoFactorTimeoutIcon,
+          elevation: 1,
+        } satisfies RouteDataProperties & AnonLayoutWrapperData,
+      },
+    ],
+  },
   {
     path: "2fa-options",
     component: TwoFactorOptionsComponent,
diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts
index e61335859c4..db9ece317c8 100644
--- a/apps/desktop/src/app/app-routing.module.ts
+++ b/apps/desktop/src/app/app-routing.module.ts
@@ -5,6 +5,7 @@ import {
   DesktopDefaultOverlayPosition,
   EnvironmentSelectorComponent,
 } from "@bitwarden/angular/auth/components/environment-selector.component";
+import { TwoFactorTimeoutComponent } from "@bitwarden/angular/auth/components/two-factor-auth/two-factor-auth-expired.component";
 import { unauthUiRefreshSwap } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-route-swap";
 import {
   authGuard,
@@ -35,6 +36,7 @@ import {
   VaultIcon,
   LoginDecryptionOptionsComponent,
   DevicesIcon,
+  TwoFactorTimeoutIcon,
 } from "@bitwarden/auth/angular";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
@@ -96,6 +98,22 @@ const routes: Routes = [
       ],
     },
   ),
+  {
+    path: "2fa-timeout",
+    component: AnonLayoutWrapperComponent,
+    children: [
+      {
+        path: "",
+        component: TwoFactorTimeoutComponent,
+      },
+    ],
+    data: {
+      pageIcon: TwoFactorTimeoutIcon,
+      pageTitle: {
+        key: "authenticationTimeout",
+      },
+    } satisfies RouteDataProperties & AnonLayoutWrapperData,
+  },
   { path: "register", component: RegisterComponent },
   {
     path: "vault",
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index e9bebb8bfc0..e4c235dada9 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -919,6 +919,12 @@
   "baseUrl": {
     "message": "Server URL"
   },
+  "authenticationTimeout": {
+    "message": "Authentication timeout"
+  },
+  "authenticationSessionTimedOut": {
+    "message": "The authentication session timed out. Please restart the login process."
+  },
   "selfHostBaseUrl": {
     "message": "Self-host server URL",
     "description": "Label for field requesting a self-hosted integration service URL"
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 6e2e97d8e06..8aea628ddde 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from "@angular/core";
 import { Route, RouterModule, Routes } from "@angular/router";
 
+import { TwoFactorTimeoutComponent } from "@bitwarden/angular/auth/components/two-factor-auth/two-factor-auth-expired.component";
 import { unauthUiRefreshSwap } from "@bitwarden/angular/auth/functions/unauth-ui-refresh-route-swap";
 import {
   authGuard,
@@ -26,6 +27,7 @@ import {
   LoginSecondaryContentComponent,
   LockV2Component,
   LockIcon,
+  TwoFactorTimeoutIcon,
   UserLockIcon,
   LoginViaAuthRequestComponent,
   DevicesIcon,
@@ -507,7 +509,6 @@ const routes: Routes = [
           } satisfies AnonLayoutWrapperData,
         },
       ),
-
       {
         path: "2fa",
         canActivate: [unauthGuardFn()],
@@ -527,6 +528,28 @@ const routes: Routes = [
           },
         } satisfies RouteDataProperties & AnonLayoutWrapperData,
       },
+      {
+        path: "2fa-timeout",
+        canActivate: [unauthGuardFn()],
+        children: [
+          {
+            path: "",
+            component: TwoFactorTimeoutComponent,
+          },
+          {
+            path: "",
+            component: EnvironmentSelectorComponent,
+            outlet: "environment-selector",
+          },
+        ],
+        data: {
+          pageIcon: TwoFactorTimeoutIcon,
+          pageTitle: {
+            key: "authenticationTimeout",
+          },
+          titleId: "authenticationTimeout",
+        } satisfies RouteDataProperties & AnonLayoutWrapperData,
+      },
       {
         path: "recover-2fa",
         canActivate: [unauthGuardFn()],
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 7025e194786..cab0e703a7d 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -1137,6 +1137,12 @@
   "logInToBitwarden": {
     "message": "Log in to Bitwarden"
   },
+  "authenticationTimeout": {
+    "message": "Authentication timeout"
+  },
+  "authenticationSessionTimedOut": {
+    "message": "The authentication session timed out. Please restart the login process."
+  },
   "verifyIdentity": {
     "message": "Verify your Identity"
   },
diff --git a/libs/angular/src/auth/components/two-factor-auth/two-factor-auth-expired.component.ts b/libs/angular/src/auth/components/two-factor-auth/two-factor-auth-expired.component.ts
new file mode 100644
index 00000000000..faa08cf073b
--- /dev/null
+++ b/libs/angular/src/auth/components/two-factor-auth/two-factor-auth-expired.component.ts
@@ -0,0 +1,25 @@
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+import { RouterModule } from "@angular/router";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { ButtonModule } from "@bitwarden/components";
+
+/**
+ * This component is used to display a message to the user that their authentication session has expired.
+ * It provides a button to navigate to the login page.
+ */
+@Component({
+  selector: "app-two-factor-expired",
+  standalone: true,
+  imports: [CommonModule, JslibModule, ButtonModule, RouterModule],
+  template: `
+    <p class="tw-text-center">
+      {{ "authenticationSessionTimedOut" | i18n }}
+    </p>
+    <a routerLink="/login" bitButton block buttonType="primary">
+      {{ "logIn" | i18n }}
+    </a>
+  `,
+})
+export class TwoFactorTimeoutComponent {}
diff --git a/libs/angular/src/auth/components/two-factor.component.spec.ts b/libs/angular/src/auth/components/two-factor.component.spec.ts
index e21d119adf8..5a1903d6671 100644
--- a/libs/angular/src/auth/components/two-factor.component.spec.ts
+++ b/libs/angular/src/auth/components/two-factor.component.spec.ts
@@ -86,9 +86,12 @@ describe("TwoFactorComponent", () => {
   };
 
   let selectedUserDecryptionOptions: BehaviorSubject<UserDecryptionOptions>;
+  let twoFactorTimeoutSubject: BehaviorSubject<boolean>;
 
   beforeEach(() => {
+    twoFactorTimeoutSubject = new BehaviorSubject<boolean>(false);
     mockLoginStrategyService = mock<LoginStrategyServiceAbstraction>();
+    mockLoginStrategyService.twoFactorTimeout$ = twoFactorTimeoutSubject;
     mockRouter = mock<Router>();
     mockI18nService = mock<I18nService>();
     mockApiService = mock<ApiService>();
@@ -492,4 +495,10 @@ describe("TwoFactorComponent", () => {
       });
     });
   });
+
+  it("navigates to the timeout route when timeout expires", async () => {
+    twoFactorTimeoutSubject.next(true);
+
+    expect(mockRouter.navigate).toHaveBeenCalledWith(["2fa-timeout"]);
+  });
 });
diff --git a/libs/angular/src/auth/components/two-factor.component.ts b/libs/angular/src/auth/components/two-factor.component.ts
index eaff9d665fd..33269e28e96 100644
--- a/libs/angular/src/auth/components/two-factor.component.ts
+++ b/libs/angular/src/auth/components/two-factor.component.ts
@@ -1,4 +1,5 @@
-import { Directive, Inject, OnDestroy, OnInit } from "@angular/core";
+import { Directive, Inject, OnInit, OnDestroy } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { ActivatedRoute, NavigationExtras, Router } from "@angular/router";
 import { firstValueFrom } from "rxjs";
 import { first } from "rxjs/operators";
@@ -68,6 +69,7 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
   protected changePasswordRoute = "set-password";
   protected forcePasswordResetRoute = "update-temp-password";
   protected successRoute = "vault";
+  protected twoFactorTimeoutRoute = "2fa-timeout";
 
   get isDuoProvider(): boolean {
     return (
@@ -99,6 +101,21 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
   ) {
     super(environmentService, i18nService, platformUtilsService, toastService);
     this.webAuthnSupported = this.platformUtilsService.supportsWebAuthn(win);
+
+    // Add subscription to twoFactorTimeout$ and navigate to twoFactorTimeoutRoute if expired
+    this.loginStrategyService.twoFactorTimeout$
+      .pipe(takeUntilDestroyed())
+      .subscribe(async (expired) => {
+        if (!expired) {
+          return;
+        }
+
+        try {
+          await this.router.navigate([this.twoFactorTimeoutRoute]);
+        } catch (err) {
+          this.logService.error(`Failed to navigate to ${this.twoFactorTimeoutRoute} route`, err);
+        }
+      });
   }
 
   async ngOnInit() {
diff --git a/libs/auth/src/angular/icons/index.ts b/libs/auth/src/angular/icons/index.ts
index 9c444df5702..05bb630fcb3 100644
--- a/libs/auth/src/angular/icons/index.ts
+++ b/libs/auth/src/angular/icons/index.ts
@@ -10,3 +10,4 @@ export * from "./vault.icon";
 export * from "./registration-user-add.icon";
 export * from "./registration-lock-alt.icon";
 export * from "./registration-expired-link.icon";
+export * from "./two-factor-timeout.icon";
diff --git a/libs/auth/src/angular/icons/two-factor-timeout.icon.ts b/libs/auth/src/angular/icons/two-factor-timeout.icon.ts
new file mode 100644
index 00000000000..71d0aa549dc
--- /dev/null
+++ b/libs/auth/src/angular/icons/two-factor-timeout.icon.ts
@@ -0,0 +1,8 @@
+import { svgIcon } from "@bitwarden/components";
+
+export const TwoFactorTimeoutIcon = svgIcon`
+<svg viewBox="0 0 120 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path class="tw-fill-primary-600" d="M36.1675 38.8485C40.71 28.9376 50.8182 22.0428 62.554 22.0428C78.5399 22.0428 91.499 34.8328 91.499 50.6101C91.499 66.3874 78.5399 79.1774 62.554 79.1774C50.5663 79.1774 40.2756 71.9847 35.8807 61.7246C35.3972 60.5957 34.0779 60.0675 32.9341 60.5447C31.7903 61.022 31.255 62.324 31.7386 63.4529C36.8123 75.2975 48.6962 83.6158 62.554 83.6158C81.0235 83.6158 95.9961 68.8387 95.9961 50.6101C95.9961 32.3816 81.0235 17.6044 62.554 17.6044C48.3746 17.6044 36.2605 26.3121 31.3944 38.6029L27.8472 32.2954C27.2902 31.305 26.0358 30.9537 25.0454 31.5107C24.055 32.0676 23.7036 33.3221 24.2606 34.3125L30.0681 44.6391C30.6251 45.6295 31.8795 45.9809 32.8699 45.4239L43.1965 39.6164C44.187 39.0594 44.5383 37.805 43.9813 36.8146C43.4243 35.8242 42.1699 35.4728 41.1795 36.0298L36.1675 38.8485Z" />
+  <path class="tw-fill-primary-600" d="M72.2625 60.9479C71.8946 61.1944 71.4577 61.3265 71.0118 61.3265C70.4411 61.3265 69.8927 61.1086 69.4781 60.7189L60.6723 52.4767C60.4538 52.272 60.2799 52.0232 60.1595 51.7502C60.0391 51.4772 59.9767 51.1822 59.9767 50.8828V30.3303C59.9767 29.7469 60.2108 29.1877 60.6299 28.7739C61.049 28.36 61.6153 28.1288 62.206 28.1288C62.7968 28.1288 63.363 28.3622 63.7822 28.7739C64.2013 29.1855 64.4353 29.7469 64.4353 30.3303V49.9318L72.5456 57.5268C72.8688 57.8306 73.094 58.2225 73.1899 58.6518C73.2857 59.081 73.2478 59.5301 73.0829 59.9396C72.9179 60.3491 72.6303 60.7013 72.2625 60.9479Z" />
+</svg>
+`;
diff --git a/libs/auth/src/common/abstractions/login-strategy.service.ts b/libs/auth/src/common/abstractions/login-strategy.service.ts
index a46636532bf..e86cd6b0b0d 100644
--- a/libs/auth/src/common/abstractions/login-strategy.service.ts
+++ b/libs/auth/src/common/abstractions/login-strategy.service.ts
@@ -71,4 +71,8 @@ export abstract class LoginStrategyServiceAbstraction {
    * Creates a master key from the provided master password and email.
    */
   makePreloginKey: (masterPassword: string, email: string) => Promise<MasterKey>;
+  /**
+   * Emits true if the two factor session has expired.
+   */
+  twoFactorTimeout$: Observable<boolean>;
 }
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index b86d1e3f3b4..99e3c057e11 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -6,6 +6,7 @@ import {
   Observable,
   shareReplay,
   Subscription,
+  BehaviorSubject,
 } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -68,7 +69,7 @@ import {
   CACHE_KEY,
 } from "./login-strategy.state";
 
-const sessionTimeoutLength = 2 * 60 * 1000; // 2 minutes
+const sessionTimeoutLength = 5 * 60 * 1000; // 5 minutes
 
 export class LoginStrategyService implements LoginStrategyServiceAbstraction {
   private sessionTimeoutSubscription: Subscription;
@@ -76,6 +77,9 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
   private loginStrategyCacheState: GlobalState<CacheData | null>;
   private loginStrategyCacheExpirationState: GlobalState<Date | null>;
   private authRequestPushNotificationState: GlobalState<string>;
+  private twoFactorTimeoutSubject = new BehaviorSubject<boolean>(false);
+
+  twoFactorTimeout$: Observable<boolean> = this.twoFactorTimeoutSubject.asObservable();
 
   private loginStrategy$: Observable<
     | UserApiLoginStrategy
@@ -123,7 +127,14 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     );
     this.taskSchedulerService.registerTaskHandler(
       ScheduledTaskNames.loginStrategySessionTimeout,
-      () => this.clearCache(),
+      async () => {
+        this.twoFactorTimeoutSubject.next(true);
+        try {
+          await this.clearCache();
+        } catch (e) {
+          this.logService.error("Failed to clear cache during session timeout", e);
+        }
+      },
     );
 
     this.currentAuthType$ = this.currentAuthnTypeState.state$;
@@ -189,6 +200,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
       | WebAuthnLoginCredentials,
   ): Promise<AuthResult> {
     await this.clearCache();
+    this.twoFactorTimeoutSubject.next(false);
 
     await this.currentAuthnTypeState.update((_) => credentials.type);
 
@@ -273,6 +285,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
   private async clearCache(): Promise<void> {
     await this.currentAuthnTypeState.update((_) => null);
     await this.loginStrategyCacheState.update((_) => null);
+    this.twoFactorTimeoutSubject.next(false);
     await this.clearSessionTimeout();
   }
 

From f8c4b8afe8c391e3cdacecae0467af1181c8ef4d Mon Sep 17 00:00:00 2001
From: Jonathan Prusik <jprusik@users.noreply.github.com>
Date: Tue, 3 Dec 2024 16:08:15 -0500
Subject: [PATCH 15/46] do not regenerate passwords on every overlay ciphers
 update (#12226)

---
 apps/browser/src/autofill/background/overlay.background.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts
index c42d1f7e640..7b80c436798 100644
--- a/apps/browser/src/autofill/background/overlay.background.ts
+++ b/apps/browser/src/autofill/background/overlay.background.ts
@@ -362,8 +362,6 @@ export class OverlayBackground implements OverlayBackgroundInterface {
     this.inlineMenuFido2Credentials.clear();
     this.storeInlineMenuFido2Credentials$.next(currentTab.id);
 
-    await this.generatePassword();
-
     const ciphersViews = await this.getCipherViews(currentTab, updateAllCipherTypes);
     for (let cipherIndex = 0; cipherIndex < ciphersViews.length; cipherIndex++) {
       this.inlineMenuCiphers.set(`inline-menu-cipher-${cipherIndex}`, ciphersViews[cipherIndex]);

From a6c905cc1a072c877a32c3eee381e7e579d65c7d Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Tue, 3 Dec 2024 15:43:09 -0800
Subject: [PATCH 16/46] [PM-15533] Remove isNotClone parameter from
 updateWithServer method (#12233)

---
 libs/angular/src/vault/components/add-edit.component.ts   | 3 +--
 libs/common/src/vault/services/cipher.service.spec.ts     | 6 +++---
 libs/common/src/vault/services/cipher.service.ts          | 8 ++------
 .../cipher-form/services/default-cipher-form.service.ts   | 1 -
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts
index 3747236d51d..1bc58368d8f 100644
--- a/libs/angular/src/vault/components/add-edit.component.ts
+++ b/libs/angular/src/vault/components/add-edit.component.ts
@@ -699,7 +699,6 @@ export class AddEditComponent implements OnInit, OnDestroy {
   }
 
   protected saveCipher(cipher: Cipher) {
-    const isNotClone = this.editMode && !this.cloneMode;
     let orgAdmin = this.organization?.canEditAllCiphers;
 
     // if a cipher is unassigned we want to check if they are an admin or have permission to edit any collection
@@ -709,7 +708,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
 
     return this.cipher.id == null
       ? this.cipherService.createWithServer(cipher, orgAdmin)
-      : this.cipherService.updateWithServer(cipher, orgAdmin, isNotClone);
+      : this.cipherService.updateWithServer(cipher, orgAdmin);
   }
 
   protected deleteCipher() {
diff --git a/libs/common/src/vault/services/cipher.service.spec.ts b/libs/common/src/vault/services/cipher.service.spec.ts
index 961bc03bbb0..6b225af0d84 100644
--- a/libs/common/src/vault/services/cipher.service.spec.ts
+++ b/libs/common/src/vault/services/cipher.service.spec.ts
@@ -229,11 +229,11 @@ describe("Cipher Service", () => {
   });
 
   describe("updateWithServer()", () => {
-    it("should call apiService.putCipherAdmin when orgAdmin and isNotClone params are true", async () => {
+    it("should call apiService.putCipherAdmin when orgAdmin param is true", async () => {
       const spy = jest
         .spyOn(apiService, "putCipherAdmin")
         .mockImplementation(() => Promise.resolve<any>(cipherObj.toCipherData()));
-      await cipherService.updateWithServer(cipherObj, true, true);
+      await cipherService.updateWithServer(cipherObj, true);
       const expectedObj = new CipherRequest(cipherObj);
 
       expect(spy).toHaveBeenCalled();
@@ -252,7 +252,7 @@ describe("Cipher Service", () => {
       expect(spy).toHaveBeenCalledWith(cipherObj.id, expectedObj);
     });
 
-    it("should call apiService.putPartialCipher when orgAdmin, isNotClone, and edit are false", async () => {
+    it("should call apiService.putPartialCipher when orgAdmin, and edit are false", async () => {
       cipherObj.edit = false;
       const spy = jest
         .spyOn(apiService, "putPartialCipher")
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 474976932e8..19a6e63e5b5 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -709,13 +709,9 @@ export class CipherService implements CipherServiceAbstraction {
     return new Cipher(updated[cipher.id as CipherId]);
   }
 
-  async updateWithServer(
-    cipher: Cipher,
-    orgAdmin?: boolean,
-    isNotClone?: boolean,
-  ): Promise<Cipher> {
+  async updateWithServer(cipher: Cipher, orgAdmin?: boolean): Promise<Cipher> {
     let response: CipherResponse;
-    if (orgAdmin && isNotClone) {
+    if (orgAdmin) {
       const request = new CipherRequest(cipher);
       response = await this.apiService.putCipherAdmin(cipher.id, request);
       const data = new CipherData(response, cipher.collectionIds);
diff --git a/libs/vault/src/cipher-form/services/default-cipher-form.service.ts b/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
index 1b7e86f82a7..086ae375dac 100644
--- a/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
+++ b/libs/vault/src/cipher-form/services/default-cipher-form.service.ts
@@ -71,7 +71,6 @@ export class DefaultCipherFormService implements CipherFormService {
       await this.cipherService.updateWithServer(
         encryptedCipher,
         config.admin || originalCollectionIds.size === 0,
-        config.mode !== "clone",
       );
 
       // Then save the new collection changes separately

From 853db233d945bea11bef45fb6df31491a610c50b Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Wed, 4 Dec 2024 11:50:39 +1000
Subject: [PATCH 17/46] Remove AddPolicyDefinitions feature flag (#12172)

---
 .../policies/base-policy.component.ts         |  2 +-
 .../policies/policies.component.ts            |  1 -
 .../policies/policy-edit.component.ts         |  6 +--
 .../policies/require-sso.component.ts         | 27 +-----------
 .../policies/single-org.component.ts          | 42 +------------------
 .../maximum-vault-timeout.component.ts        | 13 ++----
 libs/common/src/enums/feature-flag.enum.ts    |  2 -
 7 files changed, 8 insertions(+), 85 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts b/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts
index d6576985fd9..968068e1058 100644
--- a/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/base-policy.component.ts
@@ -45,7 +45,7 @@ export abstract class BasePolicyComponent implements OnInit {
     return null;
   }
 
-  buildRequest(policiesEnabledMap: Map<PolicyType, boolean>) {
+  buildRequest() {
     const request = new PolicyRequest();
     request.enabled = this.enabled.value;
     request.type = this.policy.type;
diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
index 782db231c69..4c35fef409a 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
@@ -87,7 +87,6 @@ export class PoliciesComponent implements OnInit {
       data: {
         policy: policy,
         organizationId: this.organizationId,
-        policiesEnabledMap: this.policiesEnabledMap,
       },
     });
 
diff --git a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
index 6a869aff227..a0a747811ff 100644
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
@@ -15,7 +15,6 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 import { BasePolicy, BasePolicyComponent } from "../policies";
@@ -25,8 +24,6 @@ export type PolicyEditDialogData = {
   policy: BasePolicy;
   /** Returns a unique organization id  */
   organizationId: string;
-  /** A map indicating whether each policy type is enabled or disabled. */
-  policiesEnabledMap: Map<PolicyType, boolean>;
 };
 
 export enum PolicyEditDialogResult {
@@ -55,7 +52,6 @@ export class PolicyEditComponent implements AfterViewInit {
     @Inject(DIALOG_DATA) protected data: PolicyEditDialogData,
     private policyApiService: PolicyApiServiceAbstraction,
     private i18nService: I18nService,
-    private platformUtilsService: PlatformUtilsService,
     private cdr: ChangeDetectorRef,
     private formBuilder: FormBuilder,
     private dialogRef: DialogRef<PolicyEditDialogResult>,
@@ -99,7 +95,7 @@ export class PolicyEditComponent implements AfterViewInit {
   submit = async () => {
     let request: PolicyRequest;
     try {
-      request = await this.policyComponent.buildRequest(this.data.policiesEnabledMap);
+      request = await this.policyComponent.buildRequest();
     } catch (e) {
       this.toastService.showToast({ variant: "error", title: null, message: e.message });
       return;
diff --git a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts
index 80335eb5d81..ea85168f986 100644
--- a/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/require-sso.component.ts
@@ -2,10 +2,6 @@ import { Component } from "@angular/core";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 
@@ -24,25 +20,4 @@ export class RequireSsoPolicy extends BasePolicy {
   selector: "policy-require-sso",
   templateUrl: "require-sso.component.html",
 })
-export class RequireSsoPolicyComponent extends BasePolicyComponent {
-  constructor(
-    private i18nService: I18nService,
-    private configService: ConfigService,
-  ) {
-    super();
-  }
-
-  async buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
-    if (await this.configService.getFeatureFlag(FeatureFlag.Pm13322AddPolicyDefinitions)) {
-      // We are now relying on server-side validation only
-      return super.buildRequest(policiesEnabledMap);
-    }
-
-    const singleOrgEnabled = policiesEnabledMap.get(PolicyType.SingleOrg) ?? false;
-    if (this.enabled.value && !singleOrgEnabled) {
-      throw new Error(this.i18nService.t("requireSsoPolicyReqError"));
-    }
-
-    return super.buildRequest(policiesEnabledMap);
-  }
-}
+export class RequireSsoPolicyComponent extends BasePolicyComponent {}
diff --git a/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts b/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts
index 9a854795e0f..b3a537f08da 100644
--- a/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/single-org.component.ts
@@ -2,10 +2,8 @@ import { Component, OnInit } from "@angular/core";
 import { firstValueFrom, Observable } from "rxjs";
 
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
 import { BasePolicy, BasePolicyComponent } from "./base-policy.component";
 
@@ -21,10 +19,7 @@ export class SingleOrgPolicy extends BasePolicy {
   templateUrl: "single-org.component.html",
 })
 export class SingleOrgPolicyComponent extends BasePolicyComponent implements OnInit {
-  constructor(
-    private i18nService: I18nService,
-    private configService: ConfigService,
-  ) {
+  constructor(private configService: ConfigService) {
     super();
   }
 
@@ -44,39 +39,4 @@ export class SingleOrgPolicyComponent extends BasePolicyComponent implements OnI
       this.enabled.disable();
     }
   }
-
-  async buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
-    if (await this.configService.getFeatureFlag(FeatureFlag.Pm13322AddPolicyDefinitions)) {
-      // We are now relying on server-side validation only
-      return super.buildRequest(policiesEnabledMap);
-    }
-
-    if (!this.enabled.value) {
-      if (policiesEnabledMap.get(PolicyType.RequireSso) ?? false) {
-        throw new Error(
-          this.i18nService.t("disableRequiredError", this.i18nService.t("requireSso")),
-        );
-      }
-
-      if (policiesEnabledMap.get(PolicyType.MaximumVaultTimeout) ?? false) {
-        throw new Error(
-          this.i18nService.t(
-            "disableRequiredError",
-            this.i18nService.t("maximumVaultTimeoutLabel"),
-          ),
-        );
-      }
-
-      if (
-        (await firstValueFrom(this.accountDeprovisioningEnabled$)) &&
-        !this.policyResponse.canToggleState
-      ) {
-        throw new Error(
-          this.i18nService.t("disableRequiredError", this.i18nService.t("singleOrg")),
-        );
-      }
-    }
-
-    return super.buildRequest(policiesEnabledMap);
-  }
 }
diff --git a/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts b/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts
index 6e99a223234..8abe0092ef7 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/policies/maximum-vault-timeout.component.ts
@@ -63,17 +63,12 @@ export class MaximumVaultTimeoutPolicyComponent extends BasePolicyComponent {
     };
   }
 
-  buildRequest(policiesEnabledMap: Map<PolicyType, boolean>): Promise<PolicyRequest> {
-    const singleOrgEnabled = policiesEnabledMap.get(PolicyType.SingleOrg) ?? false;
-    if (this.enabled.value && !singleOrgEnabled) {
-      throw new Error(this.i18nService.t("requireSsoPolicyReqError"));
-    }
-
-    const data = this.buildRequestData();
-    if (data?.minutes == null || data?.minutes <= 0) {
+  async buildRequest(): Promise<PolicyRequest> {
+    const request = await super.buildRequest();
+    if (request.data?.minutes == null || request.data?.minutes <= 0) {
       throw new Error(this.i18nService.t("invalidMaximumVaultTimeout"));
     }
 
-    return super.buildRequest(policiesEnabledMap);
+    return request;
   }
 }
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 6b8af3ef78d..f9630aba04f 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -32,7 +32,6 @@ export enum FeatureFlag {
   VerifiedSsoDomainEndpoint = "pm-12337-refactor-sso-details-endpoint",
   PM11901_RefactorSelfHostingLicenseUploader = "PM-11901-refactor-self-hosting-license-uploader",
   AccessIntelligence = "pm-13227-access-intelligence",
-  Pm13322AddPolicyDefinitions = "pm-13322-add-policy-definitions",
   CriticalApps = "pm-14466-risk-insights-critical-application",
   TrialPaymentOptional = "PM-8163-trial-payment",
   SecurityTasks = "security-tasks",
@@ -82,7 +81,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.VerifiedSsoDomainEndpoint]: FALSE,
   [FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader]: FALSE,
   [FeatureFlag.AccessIntelligence]: FALSE,
-  [FeatureFlag.Pm13322AddPolicyDefinitions]: FALSE,
   [FeatureFlag.CriticalApps]: FALSE,
   [FeatureFlag.TrialPaymentOptional]: FALSE,
   [FeatureFlag.SecurityTasks]: FALSE,

From 1dce7f5ba0f66207faa2277f35e1fe3f64c74864 Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <hendrickx.jonas.pvt@gmail.com>
Date: Wed, 4 Dec 2024 11:45:44 +0100
Subject: [PATCH 18/46] [PM-13999] Show estimated tax for taxable countries
 (#12145)

---
 .../trial-billing-step.component.html         |   2 +-
 .../premium/premium-v2.component.html         |   3 +-
 .../premium/premium-v2.component.ts           |  50 +-
 .../individual/premium/premium.component.html |   2 +-
 .../individual/premium/premium.component.ts   |  51 +-
 .../change-plan-dialog.component.html         |  41 +-
 .../change-plan-dialog.component.ts           | 121 +++-
 .../organization-plans.component.html         |  16 +-
 .../organization-plans.component.ts           | 159 +++--
 ...organization-payment-method.component.html |  15 -
 .../organization-payment-method.component.ts  |  27 -
 .../adjust-payment-dialog-v2.component.html   |   6 +-
 .../adjust-payment-dialog-v2.component.ts     |  69 +-
 .../adjust-payment-dialog.component.html      |   6 +-
 .../adjust-payment-dialog.component.ts        |  59 +-
 .../shared/payment-method.component.html      |  18 -
 .../shared/payment-method.component.ts        |  21 +-
 .../billing/shared/tax-info.component.html    |  60 +-
 .../app/billing/shared/tax-info.component.ts  | 624 +++---------------
 apps/web/src/locales/en/messages.json         |  12 +
 .../providers/setup/setup.component.html      |   2 +-
 .../providers/setup/setup.component.ts        |  17 +-
 .../manage-tax-information.component.html     |  88 ++-
 .../manage-tax-information.component.ts       | 446 +++----------
 .../src/services/jslib-services.module.ts     |   7 +
 .../abstractions/tax.service.abstraction.ts   |  18 +
 .../models/domain/country-list-item.ts        |   5 +
 .../common/src/billing/models/domain/index.ts |   1 +
 .../expanded-tax-info-update.request.ts       |   4 +
 .../preview-individual-invoice.request.ts     |  14 +
 .../preview-organization-invoice.request.ts   |  25 +
 .../response/preview-invoice.response.ts      |  16 +
 .../models/response/tax-id-types.response.ts  |  28 +
 .../src/billing/services/tax.service.ts       | 303 +++++++++
 34 files changed, 1093 insertions(+), 1243 deletions(-)
 create mode 100644 libs/common/src/billing/abstractions/tax.service.abstraction.ts
 create mode 100644 libs/common/src/billing/models/domain/country-list-item.ts
 create mode 100644 libs/common/src/billing/models/request/preview-individual-invoice.request.ts
 create mode 100644 libs/common/src/billing/models/request/preview-organization-invoice.request.ts
 create mode 100644 libs/common/src/billing/models/response/preview-invoice.response.ts
 create mode 100644 libs/common/src/billing/models/response/tax-id-types.response.ts
 create mode 100644 libs/common/src/billing/services/tax.service.ts

diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
index f927a7ca613..2f983944b70 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
@@ -58,7 +58,7 @@
         *ngIf="deprecateStripeSourcesAPI"
         [showAccountCredit]="false"
       ></app-payment-v2>
-      <app-tax-info [trialFlow]="true" (onCountryChanged)="changedCountry()"></app-tax-info>
+      <app-tax-info [trialFlow]="true" (countryChanged)="changedCountry()"></app-tax-info>
     </div>
     <div class="tw-flex tw-space-x-2">
       <button type="submit" buttonType="primary" bitButton [loading]="form.loading">
diff --git a/apps/web/src/app/billing/individual/premium/premium-v2.component.html b/apps/web/src/app/billing/individual/premium/premium-v2.component.html
index eb93d8ef6a3..7adc93fd962 100644
--- a/apps/web/src/app/billing/individual/premium/premium-v2.component.html
+++ b/apps/web/src/app/billing/individual/premium/premium-v2.component.html
@@ -131,11 +131,10 @@
   <bit-section>
     <h3 bitTypography="h2">{{ "paymentInformation" | i18n }}</h3>
     <app-payment-v2 [showBankAccount]="false"></app-payment-v2>
-    <app-tax-info></app-tax-info>
+    <app-tax-info (taxInformationChanged)="onTaxInformationChanged()"></app-tax-info>
     <div class="tw-mb-4">
       <div class="tw-text-muted tw-text-sm tw-flex tw-flex-col">
         <span>{{ "planPrice" | i18n }}: {{ subtotal | currency: "USD $" }}</span>
-        <!-- TODO: Currently incorrect - https://bitwarden.atlassian.net/browse/PM-11525 -->
         <span>{{ "estimatedTax" | i18n }}: {{ estimatedTax | currency: "USD $" }}</span>
       </div>
     </div>
diff --git a/apps/web/src/app/billing/individual/premium/premium-v2.component.ts b/apps/web/src/app/billing/individual/premium/premium-v2.component.ts
index 4f6d30530c2..f723cf4f3c0 100644
--- a/apps/web/src/app/billing/individual/premium/premium-v2.component.ts
+++ b/apps/web/src/app/billing/individual/premium/premium-v2.component.ts
@@ -3,10 +3,13 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { combineLatest, concatMap, from, Observable, of } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
+import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -42,6 +45,7 @@ export class PremiumV2Component {
     FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader,
   );
 
+  protected estimatedTax: number = 0;
   protected readonly familyPlanMaxUserCount = 6;
   protected readonly premiumPrice = 10;
   protected readonly storageGBPrice = 4;
@@ -58,6 +62,7 @@ export class PremiumV2Component {
     private syncService: SyncService,
     private toastService: ToastService,
     private tokenService: TokenService,
+    private taxService: TaxServiceAbstraction,
   ) {
     this.isSelfHost = this.platformUtilsService.isSelfHost();
 
@@ -80,6 +85,12 @@ export class PremiumV2Component {
         }),
       )
       .subscribe();
+
+    this.addOnFormGroup.controls.additionalStorage.valueChanges
+      .pipe(debounceTime(1000), takeUntilDestroyed())
+      .subscribe(() => {
+        this.refreshSalesTax();
+      });
   }
 
   finalizeUpgrade = async () => {
@@ -156,12 +167,6 @@ export class PremiumV2Component {
     return this.storageGBPrice * this.addOnFormGroup.value.additionalStorage;
   }
 
-  protected get estimatedTax(): number {
-    return this.taxInfoComponent?.taxRate != null
-      ? (this.taxInfoComponent.taxRate / 100) * this.subtotal
-      : 0;
-  }
-
   protected get premiumURL(): string {
     return `${this.cloudWebVaultURL}/#/settings/subscription/premium`;
   }
@@ -177,4 +182,37 @@ export class PremiumV2Component {
   protected async onLicenseFileSelectedChanged(): Promise<void> {
     await this.postFinalizeUpgrade();
   }
+
+  private refreshSalesTax(): void {
+    if (!this.taxInfoComponent.country || !this.taxInfoComponent.postalCode) {
+      return;
+    }
+    const request: PreviewIndividualInvoiceRequest = {
+      passwordManager: {
+        additionalStorage: this.addOnFormGroup.value.additionalStorage,
+      },
+      taxInformation: {
+        postalCode: this.taxInfoComponent.postalCode,
+        country: this.taxInfoComponent.country,
+        taxId: this.taxInfoComponent.taxId,
+      },
+    };
+
+    this.taxService
+      .previewIndividualInvoice(request)
+      .then((invoice) => {
+        this.estimatedTax = invoice.taxAmount;
+      })
+      .catch((error) => {
+        this.toastService.showToast({
+          title: "",
+          variant: "error",
+          message: this.i18nService.t(error.message),
+        });
+      });
+  }
+
+  protected onTaxInformationChanged(): void {
+    this.refreshSalesTax();
+  }
 }
diff --git a/apps/web/src/app/billing/individual/premium/premium.component.html b/apps/web/src/app/billing/individual/premium/premium.component.html
index 8b848b48dab..12b6932d0f5 100644
--- a/apps/web/src/app/billing/individual/premium/premium.component.html
+++ b/apps/web/src/app/billing/individual/premium/premium.component.html
@@ -122,7 +122,7 @@
   <bit-section>
     <h3 bitTypography="h2">{{ "paymentInformation" | i18n }}</h3>
     <app-payment [hideBank]="true"></app-payment>
-    <app-tax-info></app-tax-info>
+    <app-tax-info (taxInformationChanged)="onTaxInformationChanged()" />
     <div id="price" class="tw-my-4">
       <div class="tw-text-muted tw-text-sm">
         {{ "planPrice" | i18n }}: {{ subtotal | currency: "USD $" }}
diff --git a/apps/web/src/app/billing/individual/premium/premium.component.ts b/apps/web/src/app/billing/individual/premium/premium.component.ts
index c45b6b882d4..740d1bd22c6 100644
--- a/apps/web/src/app/billing/individual/premium/premium.component.ts
+++ b/apps/web/src/app/billing/individual/premium/premium.component.ts
@@ -1,11 +1,15 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
+import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 import { firstValueFrom, Observable } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
+import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -37,6 +41,9 @@ export class PremiumComponent implements OnInit {
   protected addonForm = new FormGroup({
     additionalStorage: new FormControl(0, [Validators.max(99), Validators.min(0)]),
   });
+
+  private estimatedTax: number = 0;
+
   constructor(
     private apiService: ApiService,
     private i18nService: I18nService,
@@ -48,9 +55,16 @@ export class PremiumComponent implements OnInit {
     private environmentService: EnvironmentService,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private toastService: ToastService,
+    private taxService: TaxServiceAbstraction,
   ) {
     this.selfHosted = platformUtilsService.isSelfHost();
     this.canAccessPremium$ = billingAccountProfileStateService.hasPremiumFromAnySource$;
+
+    this.addonForm.controls.additionalStorage.valueChanges
+      .pipe(debounceTime(1000), takeUntilDestroyed())
+      .subscribe(() => {
+        this.refreshSalesTax();
+      });
   }
   protected setSelectedFile(event: Event) {
     const fileInputEl = <HTMLInputElement>event.target;
@@ -152,12 +166,43 @@ export class PremiumComponent implements OnInit {
   }
 
   get taxCharges(): number {
-    return this.taxInfoComponent != null && this.taxInfoComponent.taxRate != null
-      ? (this.taxInfoComponent.taxRate / 100) * this.subtotal
-      : 0;
+    return this.estimatedTax;
   }
 
   get total(): number {
     return this.subtotal + this.taxCharges || 0;
   }
+
+  private refreshSalesTax(): void {
+    if (!this.taxInfoComponent.country || !this.taxInfoComponent.postalCode) {
+      return;
+    }
+    const request: PreviewIndividualInvoiceRequest = {
+      passwordManager: {
+        additionalStorage: this.addonForm.value.additionalStorage,
+      },
+      taxInformation: {
+        postalCode: this.taxInfoComponent.postalCode,
+        country: this.taxInfoComponent.country,
+        taxId: this.taxInfoComponent.taxId,
+      },
+    };
+
+    this.taxService
+      .previewIndividualInvoice(request)
+      .then((invoice) => {
+        this.estimatedTax = invoice.taxAmount;
+      })
+      .catch((error) => {
+        this.toastService.showToast({
+          title: "",
+          variant: "error",
+          message: this.i18nService.t(error.message),
+        });
+      });
+  }
+
+  protected onTaxInformationChanged(): void {
+    this.refreshSalesTax();
+  }
 }
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
index 878672a1fb9..80a6d73f566 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -344,25 +344,14 @@
           </span>
           <a></a>
         </p>
-        <app-payment
-          *ngIf="
-            (upgradeRequiresPaymentMethod || showPayment || isPaymentSourceEmpty()) &&
-            !deprecateStripeSourcesAPI
-          "
-          [hideCredit]="true"
-        ></app-payment>
-        <app-payment-v2
-          *ngIf="
-            (upgradeRequiresPaymentMethod || showPayment || isPaymentSourceEmpty()) &&
-            deprecateStripeSourcesAPI
-          "
-          [showAccountCredit]="false"
-        >
-        </app-payment-v2>
-        <app-tax-info
-          *ngIf="showPayment || upgradeRequiresPaymentMethod || isPaymentSourceEmpty()"
-          (onCountryChanged)="changedCountry()"
-        ></app-tax-info>
+        <ng-container *ngIf="canUpdatePaymentInformation()">
+          <app-payment *ngIf="!deprecateStripeSourcesAPI" [hideCredit]="true" />
+          <app-payment-v2 *ngIf="deprecateStripeSourcesAPI" [showAccountCredit]="false" />
+          <app-manage-tax-information
+            [startWith]="taxInformation"
+            (taxInformationChanged)="taxInformationChanged($event)"
+          ></app-manage-tax-information>
+        </ng-container>
         <div id="price" class="tw-mt-4">
           <p class="tw-text-lg tw-mb-1">
             <span class="tw-font-semibold"
@@ -947,6 +936,20 @@
             </p>
           </bit-hint>
         </div>
+        <div *ngIf="totalOpened" class="row tw-mt-4">
+          <bit-hint class="col-6">
+            <p
+              class="tw-flex tw-justify-between tw-border-0 tw-border-solid tw-border-t tw-border-secondary-300 tw-pt-2 tw-mb-0"
+            >
+              <span class="tw-font-semibold">
+                {{ "estimatedTax" | i18n }}
+              </span>
+              <span>
+                {{ estimatedTax | currency: "USD" : "$" }}
+              </span>
+            </p>
+          </bit-hint>
+        </div>
         <div *ngIf="totalOpened" id="price" class="row tw-mt-4">
           <bit-hint class="col-6">
             <p
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index 5a6ac8c896a..6909de9e9c4 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -13,6 +13,7 @@ import { FormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
 
+import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -22,13 +23,17 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
 import { OrganizationUpgradeRequest } from "@bitwarden/common/admin-console/models/request/organization-upgrade.request";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import {
   PaymentMethodType,
   PlanInterval,
   PlanType,
   ProductTierType,
 } from "@bitwarden/common/billing/enums";
+import { TaxInformation } from "@bitwarden/common/billing/models/domain";
+import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
+import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
 import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
 import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
@@ -44,7 +49,6 @@ import { KeyService } from "@bitwarden/key-management";
 
 import { PaymentV2Component } from "../shared/payment/payment-v2.component";
 import { PaymentComponent } from "../shared/payment/payment.component";
-import { TaxInfoComponent } from "../shared/tax-info.component";
 
 type ChangePlanDialogParams = {
   organizationId: string;
@@ -87,13 +91,12 @@ interface OnSuccessArgs {
 export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
   @ViewChild(PaymentV2Component) paymentV2Component: PaymentV2Component;
-  @ViewChild(TaxInfoComponent) taxComponent: TaxInfoComponent;
+  @ViewChild(ManageTaxInformationComponent) taxComponent: ManageTaxInformationComponent;
 
   @Input() acceptingSponsorship = false;
   @Input() organizationId: string;
   @Input() showFree = false;
   @Input() showCancel = false;
-  selectedFile: File;
 
   @Input()
   get productTier(): ProductTierType {
@@ -105,6 +108,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     this.formGroup?.controls?.productTier?.setValue(product);
   }
 
+  protected estimatedTax: number = 0;
   private _productTier = ProductTierType.Free;
 
   @Input()
@@ -171,6 +175,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
   private destroy$ = new Subject<void>();
 
+  protected taxInformation: TaxInformation;
+
   constructor(
     @Inject(DIALOG_DATA) private dialogParams: ChangePlanDialogParams,
     private dialogRef: DialogRef<ChangePlanDialogResultType>,
@@ -187,6 +193,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     private organizationApiService: OrganizationApiServiceAbstraction,
     private configService: ConfigService,
     private billingApiService: BillingApiServiceAbstraction,
+    private taxService: TaxServiceAbstraction,
   ) {}
 
   async ngOnInit(): Promise<void> {
@@ -265,6 +272,11 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
     this.setInitialPlanSelection();
     this.loading = false;
+
+    const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
+    this.taxInformation = TaxInformation.from(taxInfo);
+
+    this.refreshSalesTax();
   }
 
   setInitialPlanSelection() {
@@ -401,6 +413,12 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
     this.selectedPlan = plan;
     this.formGroup.patchValue({ productTier: plan.productTier });
+
+    try {
+      this.refreshSalesTax();
+    } catch {
+      this.estimatedTax = 0;
+    }
   }
 
   ngOnDestroy() {
@@ -566,12 +584,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     );
   }
 
-  get taxCharges() {
-    return this.taxComponent != null && this.taxComponent.taxRate != null
-      ? (this.taxComponent.taxRate / 100) * this.passwordManagerSubtotal
-      : 0;
-  }
-
   get passwordManagerSeats() {
     if (this.selectedPlan.productTier === ProductTierType.Families) {
       return this.selectedPlan.PasswordManager.baseSeats;
@@ -583,15 +595,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     if (this.organization.useSecretsManager) {
       return (
         this.passwordManagerSubtotal +
-          this.additionalStorageTotal(this.selectedPlan) +
-          this.secretsManagerSubtotal +
-          this.taxCharges || 0
+        this.additionalStorageTotal(this.selectedPlan) +
+        this.secretsManagerSubtotal +
+        this.estimatedTax
       );
     }
     return (
       this.passwordManagerSubtotal +
-        this.additionalStorageTotal(this.selectedPlan) +
-        this.taxCharges || 0
+      this.additionalStorageTotal(this.selectedPlan) +
+      this.estimatedTax
     );
   }
 
@@ -644,8 +656,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   }
 
   changedCountry() {
-    if (this.deprecateStripeSourcesAPI && this.paymentV2Component && this.taxComponent) {
-      this.paymentV2Component.showBankAccount = this.taxComponent.country === "US";
+    if (this.deprecateStripeSourcesAPI && this.paymentV2Component) {
+      this.paymentV2Component.showBankAccount = this.taxInformation.country === "US";
 
       if (
         !this.paymentV2Component.showBankAccount &&
@@ -653,8 +665,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       ) {
         this.paymentV2Component.select(PaymentMethodType.Card);
       }
-    } else if (this.paymentComponent && this.taxComponent) {
-      this.paymentComponent!.hideBank = this.taxComponent?.taxFormGroup?.value.country !== "US";
+    } else if (this.paymentComponent && this.taxInformation) {
+      this.paymentComponent!.hideBank = this.taxInformation.country !== "US";
       // Bank Account payments are only available for US customers
       if (
         this.paymentComponent.hideBank &&
@@ -666,9 +678,14 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
   }
 
+  protected taxInformationChanged(event: TaxInformation): void {
+    this.taxInformation = event;
+    this.changedCountry();
+    this.refreshSalesTax();
+  }
+
   submit = async () => {
-    if (!this.taxComponent?.taxFormGroup.valid && this.taxComponent?.taxFormGroup.touched) {
-      this.taxComponent?.taxFormGroup.markAllAsTouched();
+    if (!this.taxComponent?.validate()) {
       return;
     }
 
@@ -722,8 +739,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       this.formGroup.controls.premiumAccessAddon.value;
     request.planType = this.selectedPlan.type;
     if (this.showPayment) {
-      request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
-      request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+      request.billingAddressCountry = this.taxInformation.country;
+      request.billingAddressPostalCode = this.taxInformation.postalCode;
     }
 
     // Secrets Manager
@@ -734,15 +751,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
         const tokenizedPaymentSource = await this.paymentV2Component.tokenize();
         const updatePaymentMethodRequest = new UpdatePaymentMethodRequest();
         updatePaymentMethodRequest.paymentSource = tokenizedPaymentSource;
-        updatePaymentMethodRequest.taxInformation = {
-          country: this.taxComponent.country,
-          postalCode: this.taxComponent.postalCode,
-          taxId: this.taxComponent.taxId,
-          line1: this.taxComponent.line1,
-          line2: this.taxComponent.line2,
-          city: this.taxComponent.city,
-          state: this.taxComponent.state,
-        };
+        updatePaymentMethodRequest.taxInformation = ExpandedTaxInfoUpdateRequest.From(
+          this.taxInformation,
+        );
 
         await this.billingApiService.updateOrganizationPaymentMethod(
           this.organizationId,
@@ -753,8 +764,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
         const paymentRequest = new PaymentRequest();
         paymentRequest.paymentToken = tokenResult[0];
         paymentRequest.paymentMethodType = tokenResult[1];
-        paymentRequest.country = this.taxComponent.taxFormGroup?.value.country;
-        paymentRequest.postalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+        paymentRequest.country = this.taxInformation.country;
+        paymentRequest.postalCode = this.taxInformation.postalCode;
         await this.organizationApiService.updatePayment(this.organizationId, paymentRequest);
       }
     }
@@ -943,4 +954,48 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   manageSelectableProduct(index: number) {
     return index;
   }
+
+  private refreshSalesTax(): void {
+    if (!this.taxInformation.country || !this.taxInformation.postalCode) {
+      return;
+    }
+
+    const request: PreviewOrganizationInvoiceRequest = {
+      organizationId: this.organizationId,
+      passwordManager: {
+        additionalStorage: 0,
+        plan: this.selectedPlan?.type,
+        seats: this.sub.seats,
+      },
+      taxInformation: {
+        postalCode: this.taxInformation.postalCode,
+        country: this.taxInformation.country,
+        taxId: this.taxInformation.taxId,
+      },
+    };
+
+    if (this.organization.useSecretsManager) {
+      request.secretsManager = {
+        seats: this.sub.smSeats,
+        additionalMachineAccounts: this.sub.smServiceAccounts,
+      };
+    }
+
+    this.taxService
+      .previewOrganizationInvoice(request)
+      .then((invoice) => {
+        this.estimatedTax = invoice.taxAmount;
+      })
+      .catch((error) => {
+        this.toastService.showToast({
+          title: "",
+          variant: "error",
+          message: this.i18nService.t(error.message),
+        });
+      });
+  }
+
+  protected canUpdatePaymentInformation(): boolean {
+    return this.upgradeRequiresPaymentMethod || this.showPayment || this.isPaymentSourceEmpty();
+  }
 }
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
index e1b74abea71..3bb25cf1524 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -335,7 +335,7 @@
                   >{{ "additionalUsers" | i18n }}:</span
                 >
                 <span *ngIf="!selectablePlan.PasswordManager.baseSeats">{{ "users" | i18n }}:</span>
-                {{ formGroup.controls["additionalSeats"].value || 0 }} &times;
+                {{ formGroup.controls.additionalSeats.value || 0 }} &times;
                 {{
                   (selectablePlan.isAnnual
                     ? selectablePlan.PasswordManager.seatPrice / 12
@@ -355,7 +355,7 @@
                 *ngIf="selectablePlan.PasswordManager.hasAdditionalStorageOption"
               >
                 {{ "additionalStorageGb" | i18n }}:
-                {{ formGroup.controls["additionalStorage"].value || 0 }} &times;
+                {{ formGroup.controls.additionalStorage.value || 0 }} &times;
                 {{
                   (selectablePlan.isAnnual
                     ? selectablePlan.PasswordManager.additionalStoragePricePerGb / 12
@@ -388,7 +388,7 @@
                   >{{ "additionalUsers" | i18n }}:</span
                 >
                 <span *ngIf="!selectablePlan.PasswordManager.baseSeats">{{ "users" | i18n }}:</span>
-                {{ formGroup.controls["additionalSeats"].value || 0 }} &times;
+                {{ formGroup.controls.additionalSeats.value || 0 }} &times;
                 {{ selectablePlan.PasswordManager.seatPrice | currency: "$" }}
                 {{ "monthAbbr" | i18n }} =
                 {{
@@ -403,7 +403,7 @@
                 *ngIf="selectablePlan.PasswordManager.hasAdditionalStorageOption"
               >
                 {{ "additionalStorageGb" | i18n }}:
-                {{ formGroup.controls["additionalStorage"].value || 0 }} &times;
+                {{ formGroup.controls.additionalStorage.value || 0 }} &times;
                 {{ selectablePlan.PasswordManager.additionalStoragePricePerGb | currency: "$" }}
                 {{ "monthAbbr" | i18n }} =
                 {{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "month" | i18n }}
@@ -440,7 +440,11 @@
     <app-payment-v2
       *ngIf="deprecateStripeSourcesAPI && (createOrganization || upgradeRequiresPaymentMethod)"
     ></app-payment-v2>
-    <app-tax-info (onCountryChanged)="changedCountry()"></app-tax-info>
+    <app-manage-tax-information
+      class="tw-my-4"
+      [startWith]="taxInformation"
+      (taxInformationChanged)="onTaxInformationChanged($event)"
+    />
     <div id="price" class="tw-my-4">
       <div class="tw-text-muted tw-text-base">
         {{ "passwordManagerPlanPrice" | i18n }}: {{ passwordManagerSubtotal | currency: "USD $" }}
@@ -450,7 +454,7 @@
           <br />
         </span>
         <ng-container>
-          {{ "estimatedTax" | i18n }}: {{ taxCharges | currency: "USD $" }}
+          {{ "estimatedTax" | i18n }}: {{ estimatedTax | currency: "USD $" }}
         </ng-container>
       </div>
       <hr class="tw-my-1 tw-grid tw-grid-cols-3 tw-ml-0" />
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index 88b5685431f..c8290f774da 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -10,7 +10,9 @@ import {
 import { FormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 
+import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -24,9 +26,12 @@ import { OrganizationUpgradeRequest } from "@bitwarden/common/admin-console/mode
 import { ProviderOrganizationCreateRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-organization-create.request";
 import { ProviderResponse } from "@bitwarden/common/admin-console/models/response/provider/provider.response";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import { PaymentMethodType, PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
+import { TaxInformation } from "@bitwarden/common/billing/models/domain";
 import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
+import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
 import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
 import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
@@ -48,7 +53,6 @@ import { OrganizationCreateModule } from "../../admin-console/organizations/crea
 import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared";
 import { PaymentV2Component } from "../shared/payment/payment-v2.component";
 import { PaymentComponent } from "../shared/payment/payment.component";
-import { TaxInfoComponent } from "../shared/tax-info.component";
 
 interface OnSuccessArgs {
   organizationId: string;
@@ -70,13 +74,14 @@ const Allowed2020PlansForLegacyProviders = [
 export class OrganizationPlansComponent implements OnInit, OnDestroy {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
   @ViewChild(PaymentV2Component) paymentV2Component: PaymentV2Component;
-  @ViewChild(TaxInfoComponent) taxComponent: TaxInfoComponent;
+  @ViewChild(ManageTaxInformationComponent) taxComponent: ManageTaxInformationComponent;
 
-  @Input() organizationId: string;
+  @Input() organizationId?: string;
   @Input() showFree = true;
   @Input() showCancel = false;
   @Input() acceptingSponsorship = false;
   @Input() currentPlan: PlanResponse;
+
   selectedFile: File;
 
   @Input()
@@ -91,6 +96,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
   private _productTier = ProductTierType.Free;
 
+  protected taxInformation: TaxInformation;
+
   @Input()
   get plan(): PlanType {
     return this._plan;
@@ -147,7 +154,10 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
   billing: BillingResponse;
   provider: ProviderResponse;
 
-  private destroy$ = new Subject<void>();
+  protected estimatedTax: number = 0;
+  protected total: number = 0;
+
+  private destroy$: Subject<void> = new Subject<void>();
 
   constructor(
     private apiService: ApiService,
@@ -166,6 +176,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     private toastService: ToastService,
     private configService: ConfigService,
     private billingApiService: BillingApiServiceAbstraction,
+    private taxService: TaxServiceAbstraction,
   ) {
     this.selfHosted = this.platformUtilsService.isSelfHost();
   }
@@ -179,6 +190,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       this.organization = await this.organizationService.get(this.organizationId);
       this.billing = await this.organizationApiService.getBilling(this.organizationId);
       this.sub = await this.organizationApiService.getSubscription(this.organizationId);
+      this.taxInformation = await this.organizationApiService.getTaxInfo(this.organizationId);
+    } else {
+      this.taxInformation = await this.apiService.getTaxInfo();
     }
 
     if (!this.selfHosted) {
@@ -239,6 +253,16 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     }
 
     this.loading = false;
+
+    this.formGroup.valueChanges.pipe(debounceTime(1000), takeUntil(this.destroy$)).subscribe(() => {
+      this.refreshSalesTax();
+    });
+
+    this.secretsManagerForm.valueChanges
+      .pipe(debounceTime(1000), takeUntil(this.destroy$))
+      .subscribe(() => {
+        this.refreshSalesTax();
+      });
   }
 
   ngOnDestroy() {
@@ -436,17 +460,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     return this.selectedPlan.trialPeriodDays != null;
   }
 
-  get taxCharges() {
-    return this.taxComponent != null && this.taxComponent.taxRate != null
-      ? (this.taxComponent.taxRate / 100) *
-          (this.passwordManagerSubtotal + this.secretsManagerSubtotal)
-      : 0;
-  }
-
-  get total() {
-    return this.passwordManagerSubtotal + this.secretsManagerSubtotal + this.taxCharges || 0;
-  }
-
   get paymentDesc() {
     if (this.acceptingSponsorship) {
       return this.i18nService.t("paymentSponsored");
@@ -552,9 +565,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     this.changedProduct();
   }
 
-  changedCountry() {
+  protected changedCountry(): void {
     if (this.deprecateStripeSourcesAPI) {
-      this.paymentV2Component.showBankAccount = this.taxComponent.country === "US";
+      this.paymentV2Component.showBankAccount = this.taxInformation?.country === "US";
       if (
         !this.paymentV2Component.showBankAccount &&
         this.paymentV2Component.selected === PaymentMethodType.BankAccount
@@ -562,7 +575,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         this.paymentV2Component.select(PaymentMethodType.Card);
       }
     } else {
-      this.paymentComponent.hideBank = this.taxComponent.taxFormGroup?.value.country !== "US";
+      this.paymentComponent.hideBank = this.taxInformation?.country !== "US";
       if (
         this.paymentComponent.hideBank &&
         this.paymentComponent.method === PaymentMethodType.BankAccount
@@ -573,28 +586,31 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     }
   }
 
-  cancel() {
+  protected onTaxInformationChanged(event: TaxInformation): void {
+    this.taxInformation = event;
+    this.changedCountry();
+    this.refreshSalesTax();
+  }
+
+  protected cancel(): void {
     this.onCanceled.emit();
   }
 
-  setSelectedFile(event: Event) {
+  protected setSelectedFile(event: Event): void {
     const fileInputEl = <HTMLInputElement>event.target;
     this.selectedFile = fileInputEl.files.length > 0 ? fileInputEl.files[0] : null;
   }
 
   submit = async () => {
-    if (this.taxComponent) {
-      if (!this.taxComponent?.taxFormGroup.valid) {
-        this.taxComponent?.taxFormGroup.markAllAsTouched();
-        return;
-      }
+    if (this.taxComponent && !this.taxComponent.validate()) {
+      return;
     }
 
     if (this.singleOrgPolicyBlock) {
       return;
     }
     const doSubmit = async (): Promise<string> => {
-      let orgId: string = null;
+      let orgId: string;
       if (this.createOrganization) {
         const orgKey = await this.keyService.makeOrgKey<OrgKey>();
         const key = orgKey[0].encryptedString;
@@ -605,11 +621,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         const collectionCt = collection.encryptedString;
         const orgKeys = await this.keyService.makeKeyPair(orgKey[1]);
 
-        if (this.selfHosted) {
-          orgId = await this.createSelfHosted(key, collectionCt, orgKeys);
-        } else {
-          orgId = await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]);
-        }
+        orgId = this.selfHosted
+          ? await this.createSelfHosted(key, collectionCt, orgKeys)
+          : await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]);
 
         this.toastService.showToast({
           variant: "success",
@@ -617,7 +631,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
           message: this.i18nService.t("organizationReadyToGo"),
         });
       } else {
-        orgId = await this.updateOrganization(orgId);
+        orgId = await this.updateOrganization();
         this.toastService.showToast({
           variant: "success",
           title: null,
@@ -651,7 +665,53 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     this.messagingService.send("organizationCreated", { organizationId });
   };
 
-  private async updateOrganization(orgId: string) {
+  private refreshSalesTax(): void {
+    if (this.formGroup.controls.plan.value == PlanType.Free) {
+      this.estimatedTax = 0;
+      return;
+    }
+
+    if (!this.taxComponent.validate()) {
+      return;
+    }
+
+    const request: PreviewOrganizationInvoiceRequest = {
+      organizationId: this.organizationId,
+      passwordManager: {
+        additionalStorage: this.formGroup.controls.additionalStorage.value,
+        plan: this.formGroup.controls.plan.value,
+        seats: this.formGroup.controls.additionalSeats.value,
+      },
+      taxInformation: {
+        postalCode: this.taxInformation.postalCode,
+        country: this.taxInformation.country,
+        taxId: this.taxInformation.taxId,
+      },
+    };
+
+    if (this.secretsManagerForm.controls.enabled.value === true) {
+      request.secretsManager = {
+        seats: this.secretsManagerForm.controls.userSeats.value,
+        additionalMachineAccounts: this.secretsManagerForm.controls.additionalServiceAccounts.value,
+      };
+    }
+
+    this.taxService
+      .previewOrganizationInvoice(request)
+      .then((invoice) => {
+        this.estimatedTax = invoice.taxAmount;
+        this.total = invoice.totalAmount;
+      })
+      .catch((error) => {
+        this.toastService.showToast({
+          title: "",
+          variant: "error",
+          message: this.i18nService.t(error.message),
+        });
+      });
+  }
+
+  private async updateOrganization() {
     const request = new OrganizationUpgradeRequest();
     request.additionalSeats = this.formGroup.controls.additionalSeats.value;
     request.additionalStorageGb = this.formGroup.controls.additionalStorage.value;
@@ -659,8 +719,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
       this.formGroup.controls.premiumAccessAddon.value;
     request.planType = this.selectedPlan.type;
-    request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
-    request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+    request.billingAddressCountry = this.taxInformation?.country;
+    request.billingAddressPostalCode = this.taxInformation?.postalCode;
 
     // Secrets Manager
     this.buildSecretsManagerRequest(request);
@@ -669,10 +729,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       if (this.deprecateStripeSourcesAPI) {
         const updatePaymentMethodRequest = new UpdatePaymentMethodRequest();
         updatePaymentMethodRequest.paymentSource = await this.paymentV2Component.tokenize();
-        const expandedTaxInfoUpdateRequest = new ExpandedTaxInfoUpdateRequest();
-        expandedTaxInfoUpdateRequest.country = this.taxComponent.country;
-        expandedTaxInfoUpdateRequest.postalCode = this.taxComponent.postalCode;
-        updatePaymentMethodRequest.taxInformation = expandedTaxInfoUpdateRequest;
+        updatePaymentMethodRequest.taxInformation = ExpandedTaxInfoUpdateRequest.From(
+          this.taxInformation,
+        );
         await this.billingApiService.updateOrganizationPaymentMethod(
           this.organizationId,
           updatePaymentMethodRequest,
@@ -682,8 +741,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         const paymentRequest = new PaymentRequest();
         paymentRequest.paymentToken = paymentToken;
         paymentRequest.paymentMethodType = paymentMethodType;
-        paymentRequest.country = this.taxComponent.taxFormGroup?.value.country;
-        paymentRequest.postalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+        paymentRequest.country = this.taxInformation?.country;
+        paymentRequest.postalCode = this.taxInformation?.postalCode;
         await this.organizationApiService.updatePayment(this.organizationId, paymentRequest);
       }
     }
@@ -707,7 +766,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     collectionCt: string,
     orgKeys: [string, EncString],
     orgKey: SymmetricCryptoKey,
-  ) {
+  ): Promise<string> {
     const request = new OrganizationCreateRequest();
     request.key = key;
     request.collectionName = collectionCt;
@@ -736,15 +795,13 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
         this.formGroup.controls.premiumAccessAddon.value;
       request.planType = this.selectedPlan.type;
-      request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
-      request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
-      if (this.taxComponent.taxFormGroup?.value.includeTaxId) {
-        request.taxIdNumber = this.taxComponent.taxFormGroup?.value.taxId;
-        request.billingAddressLine1 = this.taxComponent.taxFormGroup?.value.line1;
-        request.billingAddressLine2 = this.taxComponent.taxFormGroup?.value.line2;
-        request.billingAddressCity = this.taxComponent.taxFormGroup?.value.city;
-        request.billingAddressState = this.taxComponent.taxFormGroup?.value.state;
-      }
+      request.billingAddressPostalCode = this.taxInformation?.postalCode;
+      request.billingAddressCountry = this.taxInformation?.country;
+      request.taxIdNumber = this.taxInformation?.taxId;
+      request.billingAddressLine1 = this.taxInformation?.line1;
+      request.billingAddressLine2 = this.taxInformation?.line2;
+      request.billingAddressCity = this.taxInformation?.city;
+      request.billingAddressState = this.taxInformation?.state;
     }
 
     // Secrets Manager
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
index 7a6e8558bae..57844805f55 100644
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
@@ -63,20 +63,5 @@
         {{ "paymentChargedWithUnpaidSubscription" | i18n }}
       </p>
     </bit-section>
-    <!-- Tax Information -->
-    <bit-section>
-      <h2 bitTypography="h2">{{ "taxInformation" | i18n }}</h2>
-      <p bitTypography="body1">{{ "taxInformationDesc" | i18n }}</p>
-      <app-tax-info></app-tax-info>
-      <button
-        type="button"
-        bitButton
-        bitFormButton
-        buttonType="primary"
-        [bitAction]="updateTaxInformation"
-      >
-        {{ "save" | i18n }}
-      </button>
-    </bit-section>
   </ng-container>
 </bit-container>
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
index e2178e7c02c..a6f04ea6862 100644
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
@@ -9,7 +9,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
@@ -181,32 +180,6 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
     }
   };
 
-  protected updateTaxInformation = async (): Promise<void> => {
-    this.taxInfoComponent.taxFormGroup.updateValueAndValidity();
-    this.taxInfoComponent.taxFormGroup.markAllAsTouched();
-
-    if (this.taxInfoComponent.taxFormGroup.invalid) {
-      return;
-    }
-
-    const request = new ExpandedTaxInfoUpdateRequest();
-    request.country = this.taxInfoComponent.country;
-    request.postalCode = this.taxInfoComponent.postalCode;
-    request.taxId = this.taxInfoComponent.taxId;
-    request.line1 = this.taxInfoComponent.line1;
-    request.line2 = this.taxInfoComponent.line2;
-    request.city = this.taxInfoComponent.city;
-    request.state = this.taxInfoComponent.state;
-
-    await this.billingApiService.updateOrganizationTaxInformation(this.organizationId, request);
-
-    this.toastService.showToast({
-      variant: "success",
-      title: null,
-      message: this.i18nService.t("taxInfoUpdated"),
-    });
-  };
-
   protected verifyBankAccount = async (request: VerifyBankAccountRequest): Promise<void> => {
     await this.billingApiService.verifyOrganizationBankAccount(this.organizationId, request);
     this.toastService.showToast({
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
index e41d3d961cd..1767fb485d0 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
@@ -5,7 +5,11 @@
       [showBankAccount]="!!organizationId"
       [initialPaymentMethod]="initialPaymentMethod"
     ></app-payment-v2>
-    <app-tax-info (onCountryChanged)="onCountryChanged()"></app-tax-info>
+    <app-manage-tax-information
+      *ngIf="taxInformation"
+      [startWith]="taxInformation"
+      (taxInformationChanged)="taxInformationChanged($event)"
+    />
   </ng-container>
   <ng-container bitDialogFooter>
     <button type="submit" bitButton bitFormButton buttonType="primary" [bitAction]="submit">
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.ts b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.ts
index ccf71dc7f88..3ee3c16b235 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.ts
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.ts
@@ -1,15 +1,19 @@
 import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
-import { forwardRef, Component, Inject, ViewChild } from "@angular/core";
+import { forwardRef, Component, Inject, ViewChild, OnInit } from "@angular/core";
 
+import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+import { TaxInformation } from "@bitwarden/common/billing/models/domain";
+import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
 import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
+import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
-import { TaxInfoComponent } from "../";
 import { PaymentV2Component } from "../payment/payment-v2.component";
 
 export interface AdjustPaymentDialogV2Params {
@@ -25,9 +29,10 @@ export enum AdjustPaymentDialogV2ResultType {
 @Component({
   templateUrl: "./adjust-payment-dialog-v2.component.html",
 })
-export class AdjustPaymentDialogV2Component {
+export class AdjustPaymentDialogV2Component implements OnInit {
   @ViewChild(PaymentV2Component) paymentComponent: PaymentV2Component;
-  @ViewChild(forwardRef(() => TaxInfoComponent)) taxInfoComponent: TaxInfoComponent;
+  @ViewChild(forwardRef(() => ManageTaxInformationComponent))
+  taxInfoComponent: ManageTaxInformationComponent;
 
   protected readonly PaymentMethodType = PaymentMethodType;
   protected readonly ResultType = AdjustPaymentDialogV2ResultType;
@@ -36,9 +41,12 @@ export class AdjustPaymentDialogV2Component {
   protected initialPaymentMethod: PaymentMethodType;
   protected organizationId?: string;
 
+  protected taxInformation: TaxInformation;
+
   constructor(
     private apiService: ApiService,
     private billingApiService: BillingApiServiceAbstraction,
+    private organizationApiService: OrganizationApiServiceAbstraction,
     @Inject(DIALOG_DATA) protected dialogParams: AdjustPaymentDialogV2Params,
     private dialogRef: DialogRef<AdjustPaymentDialogV2ResultType>,
     private i18nService: I18nService,
@@ -50,8 +58,31 @@ export class AdjustPaymentDialogV2Component {
     this.organizationId = this.dialogParams.organizationId;
   }
 
-  onCountryChanged = () => {
-    if (this.taxInfoComponent.taxInfo.country === "US") {
+  ngOnInit(): void {
+    if (this.organizationId) {
+      this.organizationApiService
+        .getTaxInfo(this.organizationId)
+        .then((response: TaxInfoResponse) => {
+          this.taxInformation = TaxInformation.from(response);
+        })
+        .catch(() => {
+          this.taxInformation = new TaxInformation();
+        });
+    } else {
+      this.apiService
+        .getTaxInfo()
+        .then((response: TaxInfoResponse) => {
+          this.taxInformation = TaxInformation.from(response);
+        })
+        .catch(() => {
+          this.taxInformation = new TaxInformation();
+        });
+    }
+  }
+
+  taxInformationChanged(event: TaxInformation) {
+    this.taxInformation = event;
+    if (event.country === "US") {
       this.paymentComponent.showBankAccount = !!this.organizationId;
     } else {
       this.paymentComponent.showBankAccount = false;
@@ -59,12 +90,10 @@ export class AdjustPaymentDialogV2Component {
         this.paymentComponent.select(PaymentMethodType.Card);
       }
     }
-  };
+  }
 
   submit = async (): Promise<void> => {
-    this.taxInfoComponent.taxFormGroup.updateValueAndValidity();
-    this.taxInfoComponent.taxFormGroup.markAllAsTouched();
-    if (this.taxInfoComponent.taxFormGroup.invalid) {
+    if (!this.taxInfoComponent.validate()) {
       return;
     }
 
@@ -88,15 +117,7 @@ export class AdjustPaymentDialogV2Component {
 
     const request = new UpdatePaymentMethodRequest();
     request.paymentSource = paymentSource;
-    request.taxInformation = {
-      country: this.taxInfoComponent.country,
-      postalCode: this.taxInfoComponent.postalCode,
-      taxId: this.taxInfoComponent.taxId,
-      line1: this.taxInfoComponent.line1,
-      line2: this.taxInfoComponent.line2,
-      city: this.taxInfoComponent.city,
-      state: this.taxInfoComponent.state,
-    };
+    request.taxInformation = ExpandedTaxInfoUpdateRequest.From(this.taxInformation);
 
     await this.billingApiService.updateOrganizationPaymentMethod(this.organizationId, request);
   };
@@ -107,8 +128,14 @@ export class AdjustPaymentDialogV2Component {
     const request = new PaymentRequest();
     request.paymentMethodType = type;
     request.paymentToken = token;
-    request.country = this.taxInfoComponent.country;
-    request.postalCode = this.taxInfoComponent.postalCode;
+    request.country = this.taxInformation.country;
+    request.postalCode = this.taxInformation.postalCode;
+    request.taxId = this.taxInformation.taxId;
+    request.state = this.taxInformation.state;
+    request.line1 = this.taxInformation.line1;
+    request.line2 = this.taxInformation.line2;
+    request.city = this.taxInformation.city;
+    request.state = this.taxInformation.state;
     await this.apiService.postAccountPayment(request);
   };
 
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
index 0f92b023b15..9979fbd6907 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
@@ -5,7 +5,11 @@
   >
     <ng-container bitDialogContent>
       <app-payment [hideBank]="!organizationId" [hideCredit]="true"></app-payment>
-      <app-tax-info (onCountryChanged)="changeCountry()"></app-tax-info>
+      <app-manage-tax-information
+        *ngIf="taxInformation"
+        [startWith]="taxInformation"
+        (taxInformationChanged)="taxInformationChanged($event)"
+      />
     </ng-container>
     <ng-container bitDialogFooter>
       <button type="submit" bitButton bitFormButton buttonType="primary">
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts
index 0c8e93531ee..c761f45241a 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts
@@ -1,17 +1,19 @@
 import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
-import { Component, Inject, ViewChild } from "@angular/core";
+import { Component, Inject, OnInit, ViewChild } from "@angular/core";
 import { FormGroup } from "@angular/forms";
 
+import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+import { TaxInformation } from "@bitwarden/common/billing/models/domain";
 import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
+import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 import { PaymentComponent } from "../payment/payment.component";
-import { TaxInfoComponent } from "../tax-info.component";
 
 export interface AdjustPaymentDialogData {
   organizationId: string;
@@ -26,9 +28,9 @@ export enum AdjustPaymentDialogResult {
 @Component({
   templateUrl: "adjust-payment-dialog.component.html",
 })
-export class AdjustPaymentDialogComponent {
+export class AdjustPaymentDialogComponent implements OnInit {
   @ViewChild(PaymentComponent, { static: true }) paymentComponent: PaymentComponent;
-  @ViewChild(TaxInfoComponent, { static: true }) taxInfoComponent: TaxInfoComponent;
+  @ViewChild(ManageTaxInformationComponent) taxInfoComponent: ManageTaxInformationComponent;
 
   organizationId: string;
   currentType: PaymentMethodType;
@@ -37,6 +39,8 @@ export class AdjustPaymentDialogComponent {
   protected DialogResult = AdjustPaymentDialogResult;
   protected formGroup = new FormGroup({});
 
+  protected taxInformation: TaxInformation;
+
   constructor(
     private dialogRef: DialogRef,
     @Inject(DIALOG_DATA) protected data: AdjustPaymentDialogData,
@@ -50,26 +54,48 @@ export class AdjustPaymentDialogComponent {
     this.currentType = data.currentType;
   }
 
+  ngOnInit(): void {
+    if (this.organizationId) {
+      this.organizationApiService
+        .getTaxInfo(this.organizationId)
+        .then((response: TaxInfoResponse) => {
+          this.taxInformation = TaxInformation.from(response);
+        })
+        .catch(() => {
+          this.taxInformation = new TaxInformation();
+        });
+    } else {
+      this.apiService
+        .getTaxInfo()
+        .then((response: TaxInfoResponse) => {
+          this.taxInformation = TaxInformation.from(response);
+        })
+        .catch(() => {
+          this.taxInformation = new TaxInformation();
+        });
+    }
+  }
+
   submit = async () => {
-    if (!this.taxInfoComponent?.taxFormGroup.valid && this.taxInfoComponent?.taxFormGroup.touched) {
-      this.taxInfoComponent.taxFormGroup.markAllAsTouched();
+    if (!this.taxInfoComponent?.validate()) {
       return;
     }
+
     const request = new PaymentRequest();
     const response = this.paymentComponent.createPaymentToken().then((result) => {
       request.paymentToken = result[0];
       request.paymentMethodType = result[1];
-      request.postalCode = this.taxInfoComponent.taxFormGroup?.value.postalCode;
-      request.country = this.taxInfoComponent.taxFormGroup?.value.country;
+      request.postalCode = this.taxInformation?.postalCode;
+      request.country = this.taxInformation?.country;
       if (this.organizationId == null) {
         return this.apiService.postAccountPayment(request);
       } else {
-        request.taxId = this.taxInfoComponent.taxFormGroup?.value.taxId;
-        request.state = this.taxInfoComponent.taxFormGroup?.value.state;
-        request.line1 = this.taxInfoComponent.taxFormGroup?.value.line1;
-        request.line2 = this.taxInfoComponent.taxFormGroup?.value.line2;
-        request.city = this.taxInfoComponent.taxFormGroup?.value.city;
-        request.state = this.taxInfoComponent.taxFormGroup?.value.state;
+        request.taxId = this.taxInformation?.taxId;
+        request.state = this.taxInformation?.state;
+        request.line1 = this.taxInformation?.line1;
+        request.line2 = this.taxInformation?.line2;
+        request.city = this.taxInformation?.city;
+        request.state = this.taxInformation?.state;
         return this.organizationApiService.updatePayment(this.organizationId, request);
       }
     });
@@ -83,8 +109,9 @@ export class AdjustPaymentDialogComponent {
     this.dialogRef.close(AdjustPaymentDialogResult.Adjusted);
   };
 
-  changeCountry() {
-    if (this.taxInfoComponent.taxInfo.country === "US") {
+  taxInformationChanged(event: TaxInformation) {
+    this.taxInformation = event;
+    if (event.country === "US") {
       this.paymentComponent.hideBank = !this.organizationId;
     } else {
       this.paymentComponent.hideBank = true;
diff --git a/apps/web/src/app/billing/shared/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html
index 1d4675847a1..d61ef2fa58b 100644
--- a/apps/web/src/app/billing/shared/payment-method.component.html
+++ b/apps/web/src/app/billing/shared/payment-method.component.html
@@ -110,23 +110,5 @@
         {{ "paymentChargedWithUnpaidSubscription" | i18n }}
       </p>
     </bit-section>
-    <bit-section *ngIf="forOrganization">
-      <h2 bitTypography="h2">{{ "taxInformation" | i18n }}</h2>
-      <p bitTypography="body1">{{ "taxInformationDesc" | i18n }}</p>
-      <div *ngIf="!org || loading">
-        <i
-          class="bwi bwi-spinner bwi-spin tw-text-muted"
-          title="{{ 'loading' | i18n }}"
-          aria-hidden="true"
-        ></i>
-        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-      </div>
-      <form *ngIf="org && !loading" [formGroup]="taxForm" [bitSubmit]="submitTaxInfo">
-        <app-tax-info></app-tax-info>
-        <button bitButton bitFormButton buttonType="primary" type="submit">
-          {{ "save" | i18n }}
-        </button>
-      </form>
-    </bit-section>
   </ng-container>
 </bit-container>
diff --git a/apps/web/src/app/billing/shared/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts
index 98e6efcd8bd..3159cfa2902 100644
--- a/apps/web/src/app/billing/shared/payment-method.component.ts
+++ b/apps/web/src/app/billing/shared/payment-method.component.ts
@@ -1,5 +1,5 @@
 import { Location } from "@angular/common";
-import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
+import { Component, OnDestroy, OnInit } from "@angular/core";
 import { FormBuilder, FormControl, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { lastValueFrom } from "rxjs";
@@ -14,7 +14,6 @@ import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/mode
 import { SubscriptionResponse } from "@bitwarden/common/billing/models/response/subscription.response";
 import { VerifyBankRequest } from "@bitwarden/common/models/request/verify-bank.request";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { DialogService, ToastService } from "@bitwarden/components";
@@ -27,15 +26,12 @@ import {
   AdjustPaymentDialogResult,
   openAdjustPaymentDialog,
 } from "./adjust-payment-dialog/adjust-payment-dialog.component";
-import { TaxInfoComponent } from "./tax-info.component";
 
 @Component({
   templateUrl: "payment-method.component.html",
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class PaymentMethodComponent implements OnInit, OnDestroy {
-  @ViewChild(TaxInfoComponent) taxInfo: TaxInfoComponent;
-
   loading = false;
   firstLoaded = false;
   billing: BillingPaymentResponse;
@@ -59,7 +55,6 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     ]),
   });
 
-  taxForm = this.formBuilder.group({});
   launchPaymentModalAutomatically = false;
   protected freeTrialData: FreeTrial;
 
@@ -70,7 +65,6 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     protected platformUtilsService: PlatformUtilsService,
     private router: Router,
     private location: Location,
-    private logService: LogService,
     private route: ActivatedRoute,
     private formBuilder: FormBuilder,
     private dialogService: DialogService,
@@ -196,15 +190,6 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     await this.load();
   };
 
-  submitTaxInfo = async () => {
-    await this.taxInfo.submitTaxInfo();
-    this.toastService.showToast({
-      variant: "success",
-      title: null,
-      message: this.i18nService.t("taxInfoUpdated"),
-    });
-  };
-
   determineOrgsWithUpcomingPaymentIssues() {
     this.freeTrialData = this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
       this.organization,
@@ -229,10 +214,6 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     return this.organizationId != null;
   }
 
-  get headerClass() {
-    return this.forOrganization ? ["page-header"] : ["tabbed-header"];
-  }
-
   get paymentSourceClasses() {
     if (this.paymentSource == null) {
       return [];
diff --git a/apps/web/src/app/billing/shared/tax-info.component.html b/apps/web/src/app/billing/shared/tax-info.component.html
index 82d5104a53a..3955c0db816 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.html
+++ b/apps/web/src/app/billing/shared/tax-info.component.html
@@ -13,51 +13,41 @@
         </bit-select>
       </bit-form-field>
     </div>
-    <div [ngClass]="trialFlow ? 'tw-col-span-6' : 'tw-col-span-4'">
+    <div class="tw-col-span-6">
       <bit-form-field>
         <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
         <input bitInput type="text" formControlName="postalCode" autocomplete="postal-code" />
       </bit-form-field>
     </div>
-    <div class="tw-col-span-6" *ngIf="showTaxIdCheckbox">
-      <bit-form-control>
-        <input bitCheckbox type="checkbox" formControlName="includeTaxId" />
-        <bit-label>{{ "includeVAT" | i18n }}</bit-label>
-      </bit-form-control>
+    <div class="tw-col-span-6" *ngIf="isTaxSupported">
+      <bit-form-field>
+        <bit-label>{{ "address1" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
+      </bit-form-field>
     </div>
-  </div>
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4" *ngIf="showTaxIdFields">
-    <div class="tw-col-span-6">
+    <div class="tw-col-span-6" *ngIf="isTaxSupported">
+      <bit-form-field>
+        <bit-label>{{ "address2" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6" *ngIf="isTaxSupported">
+      <bit-form-field>
+        <bit-label for="addressCity">{{ "cityTown" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6" *ngIf="isTaxSupported">
+      <bit-form-field>
+        <bit-label>{{ "stateProvince" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6" *ngIf="isTaxSupported">
       <bit-form-field>
         <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
         <input bitInput type="text" formControlName="taxId" />
       </bit-form-field>
     </div>
   </div>
-  <div class="tw-grid tw-grid-cols-12 tw-gap-4" *ngIf="showTaxIdFields">
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "address1" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "address2" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label for="addressCity">{{ "cityTown" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "stateProvince" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
-      </bit-form-field>
-    </div>
-  </div>
 </form>
diff --git a/apps/web/src/app/billing/shared/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts
index 2cd8f7dc366..48452528053 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.ts
+++ b/apps/web/src/app/billing/shared/tax-info.component.ts
@@ -1,29 +1,18 @@
-import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
+import { CountryListItem } from "@bitwarden/common/billing/models/domain";
 import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
-import { TaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/tax-info-update.request";
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
-import { TaxRateResponse } from "@bitwarden/common/billing/models/response/tax-rate.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
 import { SharedModule } from "../../shared";
 
-type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
-  includeTaxId: boolean;
-  [key: string]: unknown;
-};
-
-type CountryList = {
-  name: string;
-  value: string;
-  disabled: boolean;
-};
-
 @Component({
   selector: "app-tax-info",
   templateUrl: "tax-info.component.html",
@@ -31,359 +20,64 @@ type CountryList = {
   imports: [SharedModule],
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-export class TaxInfoComponent implements OnInit {
-  @Input() trialFlow = false;
-  @Output() onCountryChanged = new EventEmitter();
+export class TaxInfoComponent implements OnInit, OnDestroy {
   private destroy$ = new Subject<void>();
 
+  @Input() trialFlow = false;
+  @Output() countryChanged = new EventEmitter();
+  @Output() taxInformationChanged: EventEmitter<void> = new EventEmitter<void>();
+
   taxFormGroup = new FormGroup({
-    country: new FormControl(null, [Validators.required]),
-    postalCode: new FormControl(null),
-    includeTaxId: new FormControl(null),
-    taxId: new FormControl(null),
-    line1: new FormControl(null),
-    line2: new FormControl(null),
-    city: new FormControl(null),
-    state: new FormControl(null),
+    country: new FormControl<string>(null, [Validators.required]),
+    postalCode: new FormControl<string>(null, [Validators.required]),
+    taxId: new FormControl<string>(null),
+    line1: new FormControl<string>(null),
+    line2: new FormControl<string>(null),
+    city: new FormControl<string>(null),
+    state: new FormControl<string>(null),
   });
 
+  protected isTaxSupported: boolean;
+
   loading = true;
   organizationId: string;
   providerId: string;
-  taxInfo: TaxInfoView = {
-    taxId: null,
-    line1: null,
-    line2: null,
-    city: null,
-    state: null,
-    postalCode: null,
-    country: "US",
-    includeTaxId: false,
-  };
-  countryList: CountryList[] = [
-    { name: "-- Select --", value: "", disabled: false },
-    { name: "United States", value: "US", disabled: false },
-    { name: "China", value: "CN", disabled: false },
-    { name: "France", value: "FR", disabled: false },
-    { name: "Germany", value: "DE", disabled: false },
-    { name: "Canada", value: "CA", disabled: false },
-    { name: "United Kingdom", value: "GB", disabled: false },
-    { name: "Australia", value: "AU", disabled: false },
-    { name: "India", value: "IN", disabled: false },
-    { name: "", value: "-", disabled: true },
-    { name: "Afghanistan", value: "AF", disabled: false },
-    { name: "Åland Islands", value: "AX", disabled: false },
-    { name: "Albania", value: "AL", disabled: false },
-    { name: "Algeria", value: "DZ", disabled: false },
-    { name: "American Samoa", value: "AS", disabled: false },
-    { name: "Andorra", value: "AD", disabled: false },
-    { name: "Angola", value: "AO", disabled: false },
-    { name: "Anguilla", value: "AI", disabled: false },
-    { name: "Antarctica", value: "AQ", disabled: false },
-    { name: "Antigua and Barbuda", value: "AG", disabled: false },
-    { name: "Argentina", value: "AR", disabled: false },
-    { name: "Armenia", value: "AM", disabled: false },
-    { name: "Aruba", value: "AW", disabled: false },
-    { name: "Austria", value: "AT", disabled: false },
-    { name: "Azerbaijan", value: "AZ", disabled: false },
-    { name: "Bahamas", value: "BS", disabled: false },
-    { name: "Bahrain", value: "BH", disabled: false },
-    { name: "Bangladesh", value: "BD", disabled: false },
-    { name: "Barbados", value: "BB", disabled: false },
-    { name: "Belarus", value: "BY", disabled: false },
-    { name: "Belgium", value: "BE", disabled: false },
-    { name: "Belize", value: "BZ", disabled: false },
-    { name: "Benin", value: "BJ", disabled: false },
-    { name: "Bermuda", value: "BM", disabled: false },
-    { name: "Bhutan", value: "BT", disabled: false },
-    { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
-    { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
-    { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
-    { name: "Botswana", value: "BW", disabled: false },
-    { name: "Bouvet Island", value: "BV", disabled: false },
-    { name: "Brazil", value: "BR", disabled: false },
-    { name: "British Indian Ocean Territory", value: "IO", disabled: false },
-    { name: "Brunei Darussalam", value: "BN", disabled: false },
-    { name: "Bulgaria", value: "BG", disabled: false },
-    { name: "Burkina Faso", value: "BF", disabled: false },
-    { name: "Burundi", value: "BI", disabled: false },
-    { name: "Cambodia", value: "KH", disabled: false },
-    { name: "Cameroon", value: "CM", disabled: false },
-    { name: "Cape Verde", value: "CV", disabled: false },
-    { name: "Cayman Islands", value: "KY", disabled: false },
-    { name: "Central African Republic", value: "CF", disabled: false },
-    { name: "Chad", value: "TD", disabled: false },
-    { name: "Chile", value: "CL", disabled: false },
-    { name: "Christmas Island", value: "CX", disabled: false },
-    { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
-    { name: "Colombia", value: "CO", disabled: false },
-    { name: "Comoros", value: "KM", disabled: false },
-    { name: "Congo", value: "CG", disabled: false },
-    { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
-    { name: "Cook Islands", value: "CK", disabled: false },
-    { name: "Costa Rica", value: "CR", disabled: false },
-    { name: "Côte d'Ivoire", value: "CI", disabled: false },
-    { name: "Croatia", value: "HR", disabled: false },
-    { name: "Cuba", value: "CU", disabled: false },
-    { name: "Curaçao", value: "CW", disabled: false },
-    { name: "Cyprus", value: "CY", disabled: false },
-    { name: "Czech Republic", value: "CZ", disabled: false },
-    { name: "Denmark", value: "DK", disabled: false },
-    { name: "Djibouti", value: "DJ", disabled: false },
-    { name: "Dominica", value: "DM", disabled: false },
-    { name: "Dominican Republic", value: "DO", disabled: false },
-    { name: "Ecuador", value: "EC", disabled: false },
-    { name: "Egypt", value: "EG", disabled: false },
-    { name: "El Salvador", value: "SV", disabled: false },
-    { name: "Equatorial Guinea", value: "GQ", disabled: false },
-    { name: "Eritrea", value: "ER", disabled: false },
-    { name: "Estonia", value: "EE", disabled: false },
-    { name: "Ethiopia", value: "ET", disabled: false },
-    { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
-    { name: "Faroe Islands", value: "FO", disabled: false },
-    { name: "Fiji", value: "FJ", disabled: false },
-    { name: "Finland", value: "FI", disabled: false },
-    { name: "French Guiana", value: "GF", disabled: false },
-    { name: "French Polynesia", value: "PF", disabled: false },
-    { name: "French Southern Territories", value: "TF", disabled: false },
-    { name: "Gabon", value: "GA", disabled: false },
-    { name: "Gambia", value: "GM", disabled: false },
-    { name: "Georgia", value: "GE", disabled: false },
-    { name: "Ghana", value: "GH", disabled: false },
-    { name: "Gibraltar", value: "GI", disabled: false },
-    { name: "Greece", value: "GR", disabled: false },
-    { name: "Greenland", value: "GL", disabled: false },
-    { name: "Grenada", value: "GD", disabled: false },
-    { name: "Guadeloupe", value: "GP", disabled: false },
-    { name: "Guam", value: "GU", disabled: false },
-    { name: "Guatemala", value: "GT", disabled: false },
-    { name: "Guernsey", value: "GG", disabled: false },
-    { name: "Guinea", value: "GN", disabled: false },
-    { name: "Guinea-Bissau", value: "GW", disabled: false },
-    { name: "Guyana", value: "GY", disabled: false },
-    { name: "Haiti", value: "HT", disabled: false },
-    { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
-    { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
-    { name: "Honduras", value: "HN", disabled: false },
-    { name: "Hong Kong", value: "HK", disabled: false },
-    { name: "Hungary", value: "HU", disabled: false },
-    { name: "Iceland", value: "IS", disabled: false },
-    { name: "Indonesia", value: "ID", disabled: false },
-    { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
-    { name: "Iraq", value: "IQ", disabled: false },
-    { name: "Ireland", value: "IE", disabled: false },
-    { name: "Isle of Man", value: "IM", disabled: false },
-    { name: "Israel", value: "IL", disabled: false },
-    { name: "Italy", value: "IT", disabled: false },
-    { name: "Jamaica", value: "JM", disabled: false },
-    { name: "Japan", value: "JP", disabled: false },
-    { name: "Jersey", value: "JE", disabled: false },
-    { name: "Jordan", value: "JO", disabled: false },
-    { name: "Kazakhstan", value: "KZ", disabled: false },
-    { name: "Kenya", value: "KE", disabled: false },
-    { name: "Kiribati", value: "KI", disabled: false },
-    { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
-    { name: "Korea, Republic of", value: "KR", disabled: false },
-    { name: "Kuwait", value: "KW", disabled: false },
-    { name: "Kyrgyzstan", value: "KG", disabled: false },
-    { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
-    { name: "Latvia", value: "LV", disabled: false },
-    { name: "Lebanon", value: "LB", disabled: false },
-    { name: "Lesotho", value: "LS", disabled: false },
-    { name: "Liberia", value: "LR", disabled: false },
-    { name: "Libya", value: "LY", disabled: false },
-    { name: "Liechtenstein", value: "LI", disabled: false },
-    { name: "Lithuania", value: "LT", disabled: false },
-    { name: "Luxembourg", value: "LU", disabled: false },
-    { name: "Macao", value: "MO", disabled: false },
-    { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
-    { name: "Madagascar", value: "MG", disabled: false },
-    { name: "Malawi", value: "MW", disabled: false },
-    { name: "Malaysia", value: "MY", disabled: false },
-    { name: "Maldives", value: "MV", disabled: false },
-    { name: "Mali", value: "ML", disabled: false },
-    { name: "Malta", value: "MT", disabled: false },
-    { name: "Marshall Islands", value: "MH", disabled: false },
-    { name: "Martinique", value: "MQ", disabled: false },
-    { name: "Mauritania", value: "MR", disabled: false },
-    { name: "Mauritius", value: "MU", disabled: false },
-    { name: "Mayotte", value: "YT", disabled: false },
-    { name: "Mexico", value: "MX", disabled: false },
-    { name: "Micronesia, Federated States of", value: "FM", disabled: false },
-    { name: "Moldova, Republic of", value: "MD", disabled: false },
-    { name: "Monaco", value: "MC", disabled: false },
-    { name: "Mongolia", value: "MN", disabled: false },
-    { name: "Montenegro", value: "ME", disabled: false },
-    { name: "Montserrat", value: "MS", disabled: false },
-    { name: "Morocco", value: "MA", disabled: false },
-    { name: "Mozambique", value: "MZ", disabled: false },
-    { name: "Myanmar", value: "MM", disabled: false },
-    { name: "Namibia", value: "NA", disabled: false },
-    { name: "Nauru", value: "NR", disabled: false },
-    { name: "Nepal", value: "NP", disabled: false },
-    { name: "Netherlands", value: "NL", disabled: false },
-    { name: "New Caledonia", value: "NC", disabled: false },
-    { name: "New Zealand", value: "NZ", disabled: false },
-    { name: "Nicaragua", value: "NI", disabled: false },
-    { name: "Niger", value: "NE", disabled: false },
-    { name: "Nigeria", value: "NG", disabled: false },
-    { name: "Niue", value: "NU", disabled: false },
-    { name: "Norfolk Island", value: "NF", disabled: false },
-    { name: "Northern Mariana Islands", value: "MP", disabled: false },
-    { name: "Norway", value: "NO", disabled: false },
-    { name: "Oman", value: "OM", disabled: false },
-    { name: "Pakistan", value: "PK", disabled: false },
-    { name: "Palau", value: "PW", disabled: false },
-    { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
-    { name: "Panama", value: "PA", disabled: false },
-    { name: "Papua New Guinea", value: "PG", disabled: false },
-    { name: "Paraguay", value: "PY", disabled: false },
-    { name: "Peru", value: "PE", disabled: false },
-    { name: "Philippines", value: "PH", disabled: false },
-    { name: "Pitcairn", value: "PN", disabled: false },
-    { name: "Poland", value: "PL", disabled: false },
-    { name: "Portugal", value: "PT", disabled: false },
-    { name: "Puerto Rico", value: "PR", disabled: false },
-    { name: "Qatar", value: "QA", disabled: false },
-    { name: "Réunion", value: "RE", disabled: false },
-    { name: "Romania", value: "RO", disabled: false },
-    { name: "Russian Federation", value: "RU", disabled: false },
-    { name: "Rwanda", value: "RW", disabled: false },
-    { name: "Saint Barthélemy", value: "BL", disabled: false },
-    { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
-    { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
-    { name: "Saint Lucia", value: "LC", disabled: false },
-    { name: "Saint Martin (French part)", value: "MF", disabled: false },
-    { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
-    { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
-    { name: "Samoa", value: "WS", disabled: false },
-    { name: "San Marino", value: "SM", disabled: false },
-    { name: "Sao Tome and Principe", value: "ST", disabled: false },
-    { name: "Saudi Arabia", value: "SA", disabled: false },
-    { name: "Senegal", value: "SN", disabled: false },
-    { name: "Serbia", value: "RS", disabled: false },
-    { name: "Seychelles", value: "SC", disabled: false },
-    { name: "Sierra Leone", value: "SL", disabled: false },
-    { name: "Singapore", value: "SG", disabled: false },
-    { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
-    { name: "Slovakia", value: "SK", disabled: false },
-    { name: "Slovenia", value: "SI", disabled: false },
-    { name: "Solomon Islands", value: "SB", disabled: false },
-    { name: "Somalia", value: "SO", disabled: false },
-    { name: "South Africa", value: "ZA", disabled: false },
-    { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
-    { name: "South Sudan", value: "SS", disabled: false },
-    { name: "Spain", value: "ES", disabled: false },
-    { name: "Sri Lanka", value: "LK", disabled: false },
-    { name: "Sudan", value: "SD", disabled: false },
-    { name: "Suriname", value: "SR", disabled: false },
-    { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
-    { name: "Swaziland", value: "SZ", disabled: false },
-    { name: "Sweden", value: "SE", disabled: false },
-    { name: "Switzerland", value: "CH", disabled: false },
-    { name: "Syrian Arab Republic", value: "SY", disabled: false },
-    { name: "Taiwan", value: "TW", disabled: false },
-    { name: "Tajikistan", value: "TJ", disabled: false },
-    { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
-    { name: "Thailand", value: "TH", disabled: false },
-    { name: "Timor-Leste", value: "TL", disabled: false },
-    { name: "Togo", value: "TG", disabled: false },
-    { name: "Tokelau", value: "TK", disabled: false },
-    { name: "Tonga", value: "TO", disabled: false },
-    { name: "Trinidad and Tobago", value: "TT", disabled: false },
-    { name: "Tunisia", value: "TN", disabled: false },
-    { name: "Turkey", value: "TR", disabled: false },
-    { name: "Turkmenistan", value: "TM", disabled: false },
-    { name: "Turks and Caicos Islands", value: "TC", disabled: false },
-    { name: "Tuvalu", value: "TV", disabled: false },
-    { name: "Uganda", value: "UG", disabled: false },
-    { name: "Ukraine", value: "UA", disabled: false },
-    { name: "United Arab Emirates", value: "AE", disabled: false },
-    { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
-    { name: "Uruguay", value: "UY", disabled: false },
-    { name: "Uzbekistan", value: "UZ", disabled: false },
-    { name: "Vanuatu", value: "VU", disabled: false },
-    { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
-    { name: "Viet Nam", value: "VN", disabled: false },
-    { name: "Virgin Islands, British", value: "VG", disabled: false },
-    { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
-    { name: "Wallis and Futuna", value: "WF", disabled: false },
-    { name: "Western Sahara", value: "EH", disabled: false },
-    { name: "Yemen", value: "YE", disabled: false },
-    { name: "Zambia", value: "ZM", disabled: false },
-    { name: "Zimbabwe", value: "ZW", disabled: false },
-  ];
-  taxRates: TaxRateResponse[];
+  countryList: CountryListItem[] = this.taxService.getCountries();
 
   constructor(
     private apiService: ApiService,
     private route: ActivatedRoute,
     private logService: LogService,
     private organizationApiService: OrganizationApiServiceAbstraction,
+    private taxService: TaxServiceAbstraction,
   ) {}
 
   get country(): string {
-    return this.taxFormGroup.get("country").value;
-  }
-
-  set country(country: string) {
-    this.taxFormGroup.get("country").setValue(country);
+    return this.taxFormGroup.controls.country.value;
   }
 
   get postalCode(): string {
-    return this.taxFormGroup.get("postalCode").value;
-  }
-
-  set postalCode(postalCode: string) {
-    this.taxFormGroup.get("postalCode").setValue(postalCode);
-  }
-
-  get includeTaxId(): boolean {
-    return this.taxFormGroup.get("includeTaxId").value;
-  }
-
-  set includeTaxId(includeTaxId: boolean) {
-    this.taxFormGroup.get("includeTaxId").setValue(includeTaxId);
+    return this.taxFormGroup.controls.postalCode.value;
   }
 
   get taxId(): string {
-    return this.taxFormGroup.get("taxId").value;
-  }
-
-  set taxId(taxId: string) {
-    this.taxFormGroup.get("taxId").setValue(taxId);
+    return this.taxFormGroup.controls.taxId.value;
   }
 
   get line1(): string {
-    return this.taxFormGroup.get("line1").value;
-  }
-
-  set line1(line1: string) {
-    this.taxFormGroup.get("line1").setValue(line1);
+    return this.taxFormGroup.controls.line1.value;
   }
 
   get line2(): string {
-    return this.taxFormGroup.get("line2").value;
-  }
-
-  set line2(line2: string) {
-    this.taxFormGroup.get("line2").setValue(line2);
+    return this.taxFormGroup.controls.line2.value;
   }
 
   get city(): string {
-    return this.taxFormGroup.get("city").value;
-  }
-
-  set city(city: string) {
-    this.taxFormGroup.get("city").setValue(city);
+    return this.taxFormGroup.controls.city.value;
   }
 
   get state(): string {
-    return this.taxFormGroup.get("state").value;
-  }
-
-  set state(state: string) {
-    this.taxFormGroup.get("state").setValue(state);
+    return this.taxFormGroup.controls.state.value;
   }
 
   async ngOnInit() {
@@ -400,22 +94,13 @@ export class TaxInfoComponent implements OnInit {
         try {
           const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
           if (taxInfo) {
-            this.taxId = taxInfo.taxId;
-            this.state = taxInfo.state;
-            this.line1 = taxInfo.line1;
-            this.line2 = taxInfo.line2;
-            this.city = taxInfo.city;
-            this.state = taxInfo.state;
-            this.postalCode = taxInfo.postalCode;
-            this.country = taxInfo.country || "US";
-            this.includeTaxId =
-              this.countrySupportsTax(this.country) &&
-              (!!taxInfo.taxId ||
-                !!taxInfo.line1 ||
-                !!taxInfo.line2 ||
-                !!taxInfo.city ||
-                !!taxInfo.state);
-            this.setTaxInfoObject();
+            this.taxFormGroup.controls.taxId.setValue(taxInfo.taxId);
+            this.taxFormGroup.controls.state.setValue(taxInfo.state);
+            this.taxFormGroup.controls.line1.setValue(taxInfo.line1);
+            this.taxFormGroup.controls.line2.setValue(taxInfo.line2);
+            this.taxFormGroup.controls.city.setValue(taxInfo.city);
+            this.taxFormGroup.controls.postalCode.setValue(taxInfo.postalCode);
+            this.taxFormGroup.controls.country.setValue(taxInfo.country);
           }
         } catch (e) {
           this.logService.error(e);
@@ -424,119 +109,79 @@ export class TaxInfoComponent implements OnInit {
         try {
           const taxInfo = await this.apiService.getTaxInfo();
           if (taxInfo) {
-            this.postalCode = taxInfo.postalCode;
-            this.country = taxInfo.country || "US";
+            this.taxFormGroup.controls.postalCode.setValue(taxInfo.postalCode);
+            this.taxFormGroup.controls.country.setValue(taxInfo.country);
           }
-          this.setTaxInfoObject();
         } catch (e) {
           this.logService.error(e);
         }
       }
 
-      if (this.country === "US") {
-        this.taxFormGroup.get("postalCode").setValidators([Validators.required]);
-        this.taxFormGroup.get("postalCode").updateValueAndValidity();
-      }
+      this.isTaxSupported = await this.taxService.isCountrySupported(
+        this.taxFormGroup.controls.country.value,
+      );
 
-      if (this.country !== "US") {
-        this.onCountryChanged.emit();
-      }
+      this.countryChanged.emit();
     });
 
-    this.taxFormGroup
-      .get("country")
-      .valueChanges.pipe(takeUntil(this.destroy$))
+    this.taxFormGroup.controls.country.valueChanges
+      .pipe(debounceTime(1000), takeUntil(this.destroy$))
       .subscribe((value) => {
-        if (value === "US") {
-          this.taxFormGroup.get("postalCode").setValidators([Validators.required]);
-        } else {
-          this.taxFormGroup.get("postalCode").clearValidators();
-        }
-        this.taxFormGroup.get("postalCode").updateValueAndValidity();
-        this.setTaxInfoObject();
-        this.changeCountry();
+        this.taxService
+          .isCountrySupported(this.taxFormGroup.controls.country.value)
+          .then((isSupported) => {
+            this.isTaxSupported = isSupported;
+          })
+          .catch(() => {
+            this.isTaxSupported = false;
+          })
+          .finally(() => {
+            if (!this.isTaxSupported) {
+              this.taxFormGroup.controls.taxId.setValue(null);
+              this.taxFormGroup.controls.line1.setValue(null);
+              this.taxFormGroup.controls.line2.setValue(null);
+              this.taxFormGroup.controls.city.setValue(null);
+              this.taxFormGroup.controls.state.setValue(null);
+            }
+
+            this.countryChanged.emit();
+          });
+        this.taxInformationChanged.emit();
       });
 
-    try {
-      const taxRates = await this.apiService.getTaxRates();
-      if (taxRates) {
-        this.taxRates = taxRates.data;
-      }
-    } catch (e) {
-      this.logService.error(e);
-    } finally {
-      this.loading = false;
-    }
+    this.taxFormGroup.controls.postalCode.valueChanges
+      .pipe(debounceTime(1000), takeUntil(this.destroy$))
+      .subscribe(() => {
+        this.taxInformationChanged.emit();
+      });
+
+    this.taxFormGroup.controls.taxId.valueChanges
+      .pipe(debounceTime(1000), takeUntil(this.destroy$))
+      .subscribe(() => {
+        this.taxInformationChanged.emit();
+      });
+
+    this.loading = false;
   }
 
-  get taxRate() {
-    if (this.taxRates != null) {
-      const localTaxRate = this.taxRates.find(
-        (x) => x.country === this.country && x.postalCode === this.postalCode,
-      );
-      return localTaxRate?.rate ?? null;
-    }
-  }
-
-  setTaxInfoObject() {
-    this.taxInfo.country = this.country;
-    this.taxInfo.postalCode = this.postalCode;
-    this.taxInfo.includeTaxId = this.includeTaxId;
-    this.taxInfo.taxId = this.taxId;
-    this.taxInfo.line1 = this.line1;
-    this.taxInfo.line2 = this.line2;
-    this.taxInfo.city = this.city;
-    this.taxInfo.state = this.state;
-  }
-
-  get showTaxIdCheckbox() {
-    return (
-      (this.organizationId || this.providerId) &&
-      this.country !== "US" &&
-      this.countrySupportsTax(this.taxInfo.country)
-    );
-  }
-
-  get showTaxIdFields() {
-    return (
-      (this.organizationId || this.providerId) &&
-      this.includeTaxId &&
-      this.countrySupportsTax(this.country)
-    );
-  }
-
-  getTaxInfoRequest(): TaxInfoUpdateRequest {
-    if (this.organizationId || this.providerId) {
-      const request = new ExpandedTaxInfoUpdateRequest();
-      request.country = this.country;
-      request.postalCode = this.postalCode;
-
-      if (this.includeTaxId) {
-        request.taxId = this.taxId;
-        request.line1 = this.line1;
-        request.line2 = this.line2;
-        request.city = this.city;
-        request.state = this.state;
-      } else {
-        request.taxId = null;
-        request.line1 = null;
-        request.line2 = null;
-        request.city = null;
-        request.state = null;
-      }
-      return request;
-    } else {
-      const request = new TaxInfoUpdateRequest();
-      request.postalCode = this.postalCode;
-      request.country = this.country;
-      return request;
-    }
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
   }
 
   submitTaxInfo(): Promise<any> {
     this.taxFormGroup.updateValueAndValidity();
     this.taxFormGroup.markAllAsTouched();
-    const request = this.getTaxInfoRequest();
+
+    const request = new ExpandedTaxInfoUpdateRequest();
+    request.country = this.country;
+    request.postalCode = this.postalCode;
+    request.taxId = this.taxId;
+    request.line1 = this.line1;
+    request.line2 = this.line2;
+    request.city = this.city;
+    request.state = this.state;
+
     return this.organizationId
       ? this.organizationApiService.updateTaxInfo(
           this.organizationId,
@@ -544,97 +189,4 @@ export class TaxInfoComponent implements OnInit {
         )
       : this.apiService.putTaxInfo(request);
   }
-
-  changeCountry() {
-    if (!this.countrySupportsTax(this.country)) {
-      this.includeTaxId = false;
-      this.taxId = null;
-      this.line1 = null;
-      this.line2 = null;
-      this.city = null;
-      this.state = null;
-      this.setTaxInfoObject();
-    }
-    this.onCountryChanged.emit();
-  }
-
-  countrySupportsTax(countryCode: string) {
-    return this.taxSupportedCountryCodes.includes(countryCode);
-  }
-
-  private taxSupportedCountryCodes: string[] = [
-    "CN",
-    "FR",
-    "DE",
-    "CA",
-    "GB",
-    "AU",
-    "IN",
-    "AD",
-    "AR",
-    "AT",
-    "BE",
-    "BO",
-    "BR",
-    "BG",
-    "CL",
-    "CO",
-    "CR",
-    "HR",
-    "CY",
-    "CZ",
-    "DK",
-    "DO",
-    "EC",
-    "EG",
-    "SV",
-    "EE",
-    "FI",
-    "GE",
-    "GR",
-    "HK",
-    "HU",
-    "IS",
-    "ID",
-    "IQ",
-    "IE",
-    "IL",
-    "IT",
-    "JP",
-    "KE",
-    "KR",
-    "LV",
-    "LI",
-    "LT",
-    "LU",
-    "MY",
-    "MT",
-    "MX",
-    "NL",
-    "NZ",
-    "NO",
-    "PE",
-    "PH",
-    "PL",
-    "PT",
-    "RO",
-    "RU",
-    "SA",
-    "RS",
-    "SG",
-    "SK",
-    "SI",
-    "ZA",
-    "ES",
-    "SE",
-    "CH",
-    "TW",
-    "TH",
-    "TR",
-    "UA",
-    "AE",
-    "UY",
-    "VE",
-    "VN",
-  ];
 }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index cab0e703a7d..25172f7c779 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -9224,6 +9224,18 @@
   "updatedTaxInformation": {
     "message": "Updated tax information"
   },
+  "billingInvalidTaxIdError": {
+    "message": "Invalid tax ID, if you believe this is an error please contact support."
+  },
+  "billingTaxIdTypeInferenceError": {
+    "message": "We were unable to validate your tax ID, if you believe this is an error please contact support."
+  },
+  "billingPreviewInvalidTaxIdError": {
+    "message": "Invalid tax ID, if you believe this is an error please contact support."
+  },
+  "billingPreviewInvoiceError": {
+    "message": "An error occurred while previewing the invoice. Please try again later."
+  },
   "unverified": {
     "message": "Unverified"
   },
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
index 33a20444c2b..74aa468c42e 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
@@ -29,7 +29,7 @@
       </div>
     </div>
     <app-manage-tax-information />
-    <button bitButton bitFormButton buttonType="primary" type="submit">
+    <button class="tw-mt-8" bitButton bitFormButton buttonType="primary" type="submit">
       {{ "submit" | i18n }}
     </button>
   </form>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
index 72d954e8cdc..079174b48b5 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
@@ -109,9 +109,7 @@ export class SetupComponent implements OnInit, OnDestroy {
     try {
       this.formGroup.markAllAsTouched();
 
-      const formIsValid = this.formGroup.valid && this.manageTaxInformationComponent.touch();
-
-      if (!formIsValid) {
+      if (!this.manageTaxInformationComponent.validate() || !this.formGroup.valid) {
         return;
       }
 
@@ -129,14 +127,11 @@ export class SetupComponent implements OnInit, OnDestroy {
 
       request.taxInfo.country = taxInformation.country;
       request.taxInfo.postalCode = taxInformation.postalCode;
-
-      if (taxInformation.includeTaxId) {
-        request.taxInfo.taxId = taxInformation.taxId;
-        request.taxInfo.line1 = taxInformation.line1;
-        request.taxInfo.line2 = taxInformation.line2;
-        request.taxInfo.city = taxInformation.city;
-        request.taxInfo.state = taxInformation.state;
-      }
+      request.taxInfo.taxId = taxInformation.taxId;
+      request.taxInfo.line1 = taxInformation.line1;
+      request.taxInfo.line2 = taxInformation.line2;
+      request.taxInfo.city = taxInformation.city;
+      request.taxInfo.state = taxInformation.state;
 
       const provider = await this.providerApiService.postProviderSetup(this.providerId, request);
 
diff --git a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html
index 0b041bd4c06..fbd8af4f8b9 100644
--- a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html
+++ b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <div class="tw-grid tw-grid-cols-12 tw-gap-4">
     <div class="tw-col-span-6">
-      <bit-form-field [disableMargin]="selectionSupportsAdditionalOptions">
+      <bit-form-field disableMargin>
         <bit-label>{{ "country" | i18n }}</bit-label>
         <bit-select formControlName="country">
           <bit-option
@@ -14,59 +14,47 @@
       </bit-form-field>
     </div>
     <div class="tw-col-span-6">
-      <bit-form-field [disableMargin]="selectionSupportsAdditionalOptions">
+      <bit-form-field disableMargin>
         <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
         <input bitInput type="text" formControlName="postalCode" autocomplete="postal-code" />
       </bit-form-field>
     </div>
-    <div class="tw-col-span-6" *ngIf="selectionSupportsAdditionalOptions">
-      <bit-form-control>
-        <input bitCheckbox type="checkbox" formControlName="includeTaxId" />
-        <bit-label>{{ "includeVAT" | i18n }}</bit-label>
-      </bit-form-control>
+    <ng-container *ngIf="isTaxSupported">
+      <div class="tw-col-span-6">
+        <bit-form-field disableMargin>
+          <bit-label>{{ "address1" | i18n }}</bit-label>
+          <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
+        </bit-form-field>
+      </div>
+      <div class="tw-col-span-6">
+        <bit-form-field disableMargin>
+          <bit-label>{{ "address2" | i18n }}</bit-label>
+          <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
+        </bit-form-field>
+      </div>
+      <div class="tw-col-span-6">
+        <bit-form-field disableMargin>
+          <bit-label>{{ "cityTown" | i18n }}</bit-label>
+          <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
+        </bit-form-field>
+      </div>
+      <div class="tw-col-span-6">
+        <bit-form-field disableMargin>
+          <bit-label>{{ "stateProvince" | i18n }}</bit-label>
+          <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
+        </bit-form-field>
+      </div>
+      <div class="tw-col-span-6">
+        <bit-form-field disableMargin>
+          <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
+          <input bitInput type="text" formControlName="taxId" />
+        </bit-form-field>
+      </div>
+    </ng-container>
+    <div class="tw-col-span-12" *ngIf="!!onSubmit">
+      <button bitButton bitFormButton buttonType="primary" type="submit">
+        {{ "submit" | i18n }}
+      </button>
     </div>
   </div>
-  <div
-    class="tw-grid tw-grid-cols-12 tw-gap-4"
-    *ngIf="selectionSupportsAdditionalOptions && includeTaxIdIsSelected"
-  >
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="taxId" />
-      </bit-form-field>
-    </div>
-  </div>
-  <div
-    class="tw-grid tw-grid-cols-12 tw-gap-4"
-    *ngIf="selectionSupportsAdditionalOptions && includeTaxIdIsSelected"
-  >
-    <div class="tw-col-span-6">
-      <bit-form-field disableMargin>
-        <bit-label>{{ "address1" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field disableMargin>
-        <bit-label>{{ "address2" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "cityTown" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6">
-      <bit-form-field>
-        <bit-label>{{ "stateProvince" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
-      </bit-form-field>
-    </div>
-  </div>
-  <button *ngIf="!!onSubmit" bitButton bitFormButton buttonType="primary" type="submit">
-    {{ "submit" | i18n }}
-  </button>
 </form>
diff --git a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
index e73a6968607..2f79c6f5397 100644
--- a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
+++ b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
@@ -1,14 +1,10 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { Subject, takeUntil } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
-
-type Country = {
-  name: string;
-  value: string;
-  disabled: boolean;
-};
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
+import { CountryListItem, TaxInformation } from "@bitwarden/common/billing/models/domain";
 
 @Component({
   selector: "app-manage-tax-information",
@@ -17,12 +13,22 @@ type Country = {
 export class ManageTaxInformationComponent implements OnInit, OnDestroy {
   @Input() startWith: TaxInformation;
   @Input() onSubmit?: (taxInformation: TaxInformation) => Promise<void>;
+
+  /**
+   * Emits when the tax information has changed.
+   */
+  @Output() taxInformationChanged = new EventEmitter<TaxInformation>();
+
+  /**
+   * Emits when the tax information has been updated.
+   */
   @Output() taxInformationUpdated = new EventEmitter();
 
+  private taxInformation: TaxInformation;
+
   protected formGroup = this.formBuilder.group({
     country: ["", Validators.required],
     postalCode: ["", Validators.required],
-    includeTaxId: false,
     taxId: "",
     line1: "",
     line2: "",
@@ -30,16 +36,20 @@ export class ManageTaxInformationComponent implements OnInit, OnDestroy {
     state: "",
   });
 
+  protected isTaxSupported: boolean;
+
   private destroy$ = new Subject<void>();
 
-  private taxInformation: TaxInformation;
+  protected readonly countries: CountryListItem[] = this.taxService.getCountries();
 
-  constructor(private formBuilder: FormBuilder) {}
+  constructor(
+    private formBuilder: FormBuilder,
+    private taxService: TaxServiceAbstraction,
+  ) {}
 
-  getTaxInformation = (): TaxInformation & { includeTaxId: boolean } => ({
-    ...this.taxInformation,
-    includeTaxId: this.formGroup.value.includeTaxId,
-  });
+  getTaxInformation(): TaxInformation {
+    return this.taxInformation;
+  }
 
   submit = async () => {
     this.formGroup.markAllAsTouched();
@@ -50,23 +60,28 @@ export class ManageTaxInformationComponent implements OnInit, OnDestroy {
     this.taxInformationUpdated.emit();
   };
 
-  touch = (): boolean => {
+  validate = (): boolean => {
     this.formGroup.markAllAsTouched();
     return this.formGroup.valid;
   };
 
   async ngOnInit() {
     if (this.startWith) {
-      this.formGroup.patchValue({
-        ...this.startWith,
-        includeTaxId:
-          this.countrySupportsTax(this.startWith.country) &&
-          (!!this.startWith.taxId ||
-            !!this.startWith.line1 ||
-            !!this.startWith.line2 ||
-            !!this.startWith.city ||
-            !!this.startWith.state),
-      });
+      this.formGroup.controls.country.setValue(this.startWith.country);
+      this.formGroup.controls.postalCode.setValue(this.startWith.postalCode);
+
+      this.isTaxSupported =
+        this.startWith && this.startWith.country
+          ? await this.taxService.isCountrySupported(this.startWith.country)
+          : false;
+
+      if (this.isTaxSupported) {
+        this.formGroup.controls.taxId.setValue(this.startWith.taxId);
+        this.formGroup.controls.line1.setValue(this.startWith.line1);
+        this.formGroup.controls.line2.setValue(this.startWith.line2);
+        this.formGroup.controls.city.setValue(this.startWith.city);
+        this.formGroup.controls.state.setValue(this.startWith.state);
+      }
     }
 
     this.formGroup.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((values) => {
@@ -80,354 +95,47 @@ export class ManageTaxInformationComponent implements OnInit, OnDestroy {
         state: values.state,
       };
     });
+
+    this.formGroup.controls.country.valueChanges
+      .pipe(debounceTime(1000), takeUntil(this.destroy$))
+      .subscribe((country: string) => {
+        this.taxService
+          .isCountrySupported(country)
+          .then((isSupported) => (this.isTaxSupported = isSupported))
+          .catch(() => (this.isTaxSupported = false))
+          .finally(() => {
+            if (!this.isTaxSupported) {
+              this.formGroup.controls.taxId.setValue(null);
+              this.formGroup.controls.line1.setValue(null);
+              this.formGroup.controls.line2.setValue(null);
+              this.formGroup.controls.city.setValue(null);
+              this.formGroup.controls.state.setValue(null);
+            }
+            if (this.taxInformationChanged) {
+              this.taxInformationChanged.emit(this.taxInformation);
+            }
+          });
+      });
+
+    this.formGroup.controls.postalCode.valueChanges
+      .pipe(debounceTime(1000), takeUntil(this.destroy$))
+      .subscribe(() => {
+        if (this.taxInformationChanged) {
+          this.taxInformationChanged.emit(this.taxInformation);
+        }
+      });
+
+    this.formGroup.controls.taxId.valueChanges
+      .pipe(debounceTime(1000), takeUntil(this.destroy$))
+      .subscribe(() => {
+        if (this.taxInformationChanged) {
+          this.taxInformationChanged.emit(this.taxInformation);
+        }
+      });
   }
 
   ngOnDestroy() {
     this.destroy$.next();
     this.destroy$.complete();
   }
-
-  protected countrySupportsTax(countryCode: string) {
-    return this.taxSupportedCountryCodes.includes(countryCode);
-  }
-
-  protected get includeTaxIdIsSelected() {
-    return this.formGroup.value.includeTaxId;
-  }
-
-  protected get selectionSupportsAdditionalOptions() {
-    return (
-      this.formGroup.value.country !== "US" && this.countrySupportsTax(this.formGroup.value.country)
-    );
-  }
-
-  protected countries: Country[] = [
-    { name: "-- Select --", value: "", disabled: false },
-    { name: "United States", value: "US", disabled: false },
-    { name: "China", value: "CN", disabled: false },
-    { name: "France", value: "FR", disabled: false },
-    { name: "Germany", value: "DE", disabled: false },
-    { name: "Canada", value: "CA", disabled: false },
-    { name: "United Kingdom", value: "GB", disabled: false },
-    { name: "Australia", value: "AU", disabled: false },
-    { name: "India", value: "IN", disabled: false },
-    { name: "", value: "-", disabled: true },
-    { name: "Afghanistan", value: "AF", disabled: false },
-    { name: "Åland Islands", value: "AX", disabled: false },
-    { name: "Albania", value: "AL", disabled: false },
-    { name: "Algeria", value: "DZ", disabled: false },
-    { name: "American Samoa", value: "AS", disabled: false },
-    { name: "Andorra", value: "AD", disabled: false },
-    { name: "Angola", value: "AO", disabled: false },
-    { name: "Anguilla", value: "AI", disabled: false },
-    { name: "Antarctica", value: "AQ", disabled: false },
-    { name: "Antigua and Barbuda", value: "AG", disabled: false },
-    { name: "Argentina", value: "AR", disabled: false },
-    { name: "Armenia", value: "AM", disabled: false },
-    { name: "Aruba", value: "AW", disabled: false },
-    { name: "Austria", value: "AT", disabled: false },
-    { name: "Azerbaijan", value: "AZ", disabled: false },
-    { name: "Bahamas", value: "BS", disabled: false },
-    { name: "Bahrain", value: "BH", disabled: false },
-    { name: "Bangladesh", value: "BD", disabled: false },
-    { name: "Barbados", value: "BB", disabled: false },
-    { name: "Belarus", value: "BY", disabled: false },
-    { name: "Belgium", value: "BE", disabled: false },
-    { name: "Belize", value: "BZ", disabled: false },
-    { name: "Benin", value: "BJ", disabled: false },
-    { name: "Bermuda", value: "BM", disabled: false },
-    { name: "Bhutan", value: "BT", disabled: false },
-    { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
-    { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
-    { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
-    { name: "Botswana", value: "BW", disabled: false },
-    { name: "Bouvet Island", value: "BV", disabled: false },
-    { name: "Brazil", value: "BR", disabled: false },
-    { name: "British Indian Ocean Territory", value: "IO", disabled: false },
-    { name: "Brunei Darussalam", value: "BN", disabled: false },
-    { name: "Bulgaria", value: "BG", disabled: false },
-    { name: "Burkina Faso", value: "BF", disabled: false },
-    { name: "Burundi", value: "BI", disabled: false },
-    { name: "Cambodia", value: "KH", disabled: false },
-    { name: "Cameroon", value: "CM", disabled: false },
-    { name: "Cape Verde", value: "CV", disabled: false },
-    { name: "Cayman Islands", value: "KY", disabled: false },
-    { name: "Central African Republic", value: "CF", disabled: false },
-    { name: "Chad", value: "TD", disabled: false },
-    { name: "Chile", value: "CL", disabled: false },
-    { name: "Christmas Island", value: "CX", disabled: false },
-    { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
-    { name: "Colombia", value: "CO", disabled: false },
-    { name: "Comoros", value: "KM", disabled: false },
-    { name: "Congo", value: "CG", disabled: false },
-    { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
-    { name: "Cook Islands", value: "CK", disabled: false },
-    { name: "Costa Rica", value: "CR", disabled: false },
-    { name: "Côte d'Ivoire", value: "CI", disabled: false },
-    { name: "Croatia", value: "HR", disabled: false },
-    { name: "Cuba", value: "CU", disabled: false },
-    { name: "Curaçao", value: "CW", disabled: false },
-    { name: "Cyprus", value: "CY", disabled: false },
-    { name: "Czech Republic", value: "CZ", disabled: false },
-    { name: "Denmark", value: "DK", disabled: false },
-    { name: "Djibouti", value: "DJ", disabled: false },
-    { name: "Dominica", value: "DM", disabled: false },
-    { name: "Dominican Republic", value: "DO", disabled: false },
-    { name: "Ecuador", value: "EC", disabled: false },
-    { name: "Egypt", value: "EG", disabled: false },
-    { name: "El Salvador", value: "SV", disabled: false },
-    { name: "Equatorial Guinea", value: "GQ", disabled: false },
-    { name: "Eritrea", value: "ER", disabled: false },
-    { name: "Estonia", value: "EE", disabled: false },
-    { name: "Ethiopia", value: "ET", disabled: false },
-    { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
-    { name: "Faroe Islands", value: "FO", disabled: false },
-    { name: "Fiji", value: "FJ", disabled: false },
-    { name: "Finland", value: "FI", disabled: false },
-    { name: "French Guiana", value: "GF", disabled: false },
-    { name: "French Polynesia", value: "PF", disabled: false },
-    { name: "French Southern Territories", value: "TF", disabled: false },
-    { name: "Gabon", value: "GA", disabled: false },
-    { name: "Gambia", value: "GM", disabled: false },
-    { name: "Georgia", value: "GE", disabled: false },
-    { name: "Ghana", value: "GH", disabled: false },
-    { name: "Gibraltar", value: "GI", disabled: false },
-    { name: "Greece", value: "GR", disabled: false },
-    { name: "Greenland", value: "GL", disabled: false },
-    { name: "Grenada", value: "GD", disabled: false },
-    { name: "Guadeloupe", value: "GP", disabled: false },
-    { name: "Guam", value: "GU", disabled: false },
-    { name: "Guatemala", value: "GT", disabled: false },
-    { name: "Guernsey", value: "GG", disabled: false },
-    { name: "Guinea", value: "GN", disabled: false },
-    { name: "Guinea-Bissau", value: "GW", disabled: false },
-    { name: "Guyana", value: "GY", disabled: false },
-    { name: "Haiti", value: "HT", disabled: false },
-    { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
-    { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
-    { name: "Honduras", value: "HN", disabled: false },
-    { name: "Hong Kong", value: "HK", disabled: false },
-    { name: "Hungary", value: "HU", disabled: false },
-    { name: "Iceland", value: "IS", disabled: false },
-    { name: "Indonesia", value: "ID", disabled: false },
-    { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
-    { name: "Iraq", value: "IQ", disabled: false },
-    { name: "Ireland", value: "IE", disabled: false },
-    { name: "Isle of Man", value: "IM", disabled: false },
-    { name: "Israel", value: "IL", disabled: false },
-    { name: "Italy", value: "IT", disabled: false },
-    { name: "Jamaica", value: "JM", disabled: false },
-    { name: "Japan", value: "JP", disabled: false },
-    { name: "Jersey", value: "JE", disabled: false },
-    { name: "Jordan", value: "JO", disabled: false },
-    { name: "Kazakhstan", value: "KZ", disabled: false },
-    { name: "Kenya", value: "KE", disabled: false },
-    { name: "Kiribati", value: "KI", disabled: false },
-    { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
-    { name: "Korea, Republic of", value: "KR", disabled: false },
-    { name: "Kuwait", value: "KW", disabled: false },
-    { name: "Kyrgyzstan", value: "KG", disabled: false },
-    { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
-    { name: "Latvia", value: "LV", disabled: false },
-    { name: "Lebanon", value: "LB", disabled: false },
-    { name: "Lesotho", value: "LS", disabled: false },
-    { name: "Liberia", value: "LR", disabled: false },
-    { name: "Libya", value: "LY", disabled: false },
-    { name: "Liechtenstein", value: "LI", disabled: false },
-    { name: "Lithuania", value: "LT", disabled: false },
-    { name: "Luxembourg", value: "LU", disabled: false },
-    { name: "Macao", value: "MO", disabled: false },
-    { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
-    { name: "Madagascar", value: "MG", disabled: false },
-    { name: "Malawi", value: "MW", disabled: false },
-    { name: "Malaysia", value: "MY", disabled: false },
-    { name: "Maldives", value: "MV", disabled: false },
-    { name: "Mali", value: "ML", disabled: false },
-    { name: "Malta", value: "MT", disabled: false },
-    { name: "Marshall Islands", value: "MH", disabled: false },
-    { name: "Martinique", value: "MQ", disabled: false },
-    { name: "Mauritania", value: "MR", disabled: false },
-    { name: "Mauritius", value: "MU", disabled: false },
-    { name: "Mayotte", value: "YT", disabled: false },
-    { name: "Mexico", value: "MX", disabled: false },
-    { name: "Micronesia, Federated States of", value: "FM", disabled: false },
-    { name: "Moldova, Republic of", value: "MD", disabled: false },
-    { name: "Monaco", value: "MC", disabled: false },
-    { name: "Mongolia", value: "MN", disabled: false },
-    { name: "Montenegro", value: "ME", disabled: false },
-    { name: "Montserrat", value: "MS", disabled: false },
-    { name: "Morocco", value: "MA", disabled: false },
-    { name: "Mozambique", value: "MZ", disabled: false },
-    { name: "Myanmar", value: "MM", disabled: false },
-    { name: "Namibia", value: "NA", disabled: false },
-    { name: "Nauru", value: "NR", disabled: false },
-    { name: "Nepal", value: "NP", disabled: false },
-    { name: "Netherlands", value: "NL", disabled: false },
-    { name: "New Caledonia", value: "NC", disabled: false },
-    { name: "New Zealand", value: "NZ", disabled: false },
-    { name: "Nicaragua", value: "NI", disabled: false },
-    { name: "Niger", value: "NE", disabled: false },
-    { name: "Nigeria", value: "NG", disabled: false },
-    { name: "Niue", value: "NU", disabled: false },
-    { name: "Norfolk Island", value: "NF", disabled: false },
-    { name: "Northern Mariana Islands", value: "MP", disabled: false },
-    { name: "Norway", value: "NO", disabled: false },
-    { name: "Oman", value: "OM", disabled: false },
-    { name: "Pakistan", value: "PK", disabled: false },
-    { name: "Palau", value: "PW", disabled: false },
-    { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
-    { name: "Panama", value: "PA", disabled: false },
-    { name: "Papua New Guinea", value: "PG", disabled: false },
-    { name: "Paraguay", value: "PY", disabled: false },
-    { name: "Peru", value: "PE", disabled: false },
-    { name: "Philippines", value: "PH", disabled: false },
-    { name: "Pitcairn", value: "PN", disabled: false },
-    { name: "Poland", value: "PL", disabled: false },
-    { name: "Portugal", value: "PT", disabled: false },
-    { name: "Puerto Rico", value: "PR", disabled: false },
-    { name: "Qatar", value: "QA", disabled: false },
-    { name: "Réunion", value: "RE", disabled: false },
-    { name: "Romania", value: "RO", disabled: false },
-    { name: "Russian Federation", value: "RU", disabled: false },
-    { name: "Rwanda", value: "RW", disabled: false },
-    { name: "Saint Barthélemy", value: "BL", disabled: false },
-    { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
-    { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
-    { name: "Saint Lucia", value: "LC", disabled: false },
-    { name: "Saint Martin (French part)", value: "MF", disabled: false },
-    { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
-    { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
-    { name: "Samoa", value: "WS", disabled: false },
-    { name: "San Marino", value: "SM", disabled: false },
-    { name: "Sao Tome and Principe", value: "ST", disabled: false },
-    { name: "Saudi Arabia", value: "SA", disabled: false },
-    { name: "Senegal", value: "SN", disabled: false },
-    { name: "Serbia", value: "RS", disabled: false },
-    { name: "Seychelles", value: "SC", disabled: false },
-    { name: "Sierra Leone", value: "SL", disabled: false },
-    { name: "Singapore", value: "SG", disabled: false },
-    { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
-    { name: "Slovakia", value: "SK", disabled: false },
-    { name: "Slovenia", value: "SI", disabled: false },
-    { name: "Solomon Islands", value: "SB", disabled: false },
-    { name: "Somalia", value: "SO", disabled: false },
-    { name: "South Africa", value: "ZA", disabled: false },
-    { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
-    { name: "South Sudan", value: "SS", disabled: false },
-    { name: "Spain", value: "ES", disabled: false },
-    { name: "Sri Lanka", value: "LK", disabled: false },
-    { name: "Sudan", value: "SD", disabled: false },
-    { name: "Suriname", value: "SR", disabled: false },
-    { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
-    { name: "Swaziland", value: "SZ", disabled: false },
-    { name: "Sweden", value: "SE", disabled: false },
-    { name: "Switzerland", value: "CH", disabled: false },
-    { name: "Syrian Arab Republic", value: "SY", disabled: false },
-    { name: "Taiwan", value: "TW", disabled: false },
-    { name: "Tajikistan", value: "TJ", disabled: false },
-    { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
-    { name: "Thailand", value: "TH", disabled: false },
-    { name: "Timor-Leste", value: "TL", disabled: false },
-    { name: "Togo", value: "TG", disabled: false },
-    { name: "Tokelau", value: "TK", disabled: false },
-    { name: "Tonga", value: "TO", disabled: false },
-    { name: "Trinidad and Tobago", value: "TT", disabled: false },
-    { name: "Tunisia", value: "TN", disabled: false },
-    { name: "Turkey", value: "TR", disabled: false },
-    { name: "Turkmenistan", value: "TM", disabled: false },
-    { name: "Turks and Caicos Islands", value: "TC", disabled: false },
-    { name: "Tuvalu", value: "TV", disabled: false },
-    { name: "Uganda", value: "UG", disabled: false },
-    { name: "Ukraine", value: "UA", disabled: false },
-    { name: "United Arab Emirates", value: "AE", disabled: false },
-    { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
-    { name: "Uruguay", value: "UY", disabled: false },
-    { name: "Uzbekistan", value: "UZ", disabled: false },
-    { name: "Vanuatu", value: "VU", disabled: false },
-    { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
-    { name: "Viet Nam", value: "VN", disabled: false },
-    { name: "Virgin Islands, British", value: "VG", disabled: false },
-    { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
-    { name: "Wallis and Futuna", value: "WF", disabled: false },
-    { name: "Western Sahara", value: "EH", disabled: false },
-    { name: "Yemen", value: "YE", disabled: false },
-    { name: "Zambia", value: "ZM", disabled: false },
-    { name: "Zimbabwe", value: "ZW", disabled: false },
-  ];
-
-  private taxSupportedCountryCodes: string[] = [
-    "CN",
-    "FR",
-    "DE",
-    "CA",
-    "GB",
-    "AU",
-    "IN",
-    "AD",
-    "AR",
-    "AT",
-    "BE",
-    "BO",
-    "BR",
-    "BG",
-    "CL",
-    "CO",
-    "CR",
-    "HR",
-    "CY",
-    "CZ",
-    "DK",
-    "DO",
-    "EC",
-    "EG",
-    "SV",
-    "EE",
-    "FI",
-    "GE",
-    "GR",
-    "HK",
-    "HU",
-    "IS",
-    "ID",
-    "IQ",
-    "IE",
-    "IL",
-    "IT",
-    "JP",
-    "KE",
-    "KR",
-    "LV",
-    "LI",
-    "LT",
-    "LU",
-    "MY",
-    "MT",
-    "MX",
-    "NL",
-    "NZ",
-    "NO",
-    "PE",
-    "PH",
-    "PL",
-    "PT",
-    "RO",
-    "RU",
-    "SA",
-    "RS",
-    "SG",
-    "SK",
-    "SI",
-    "ZA",
-    "ES",
-    "SE",
-    "CH",
-    "TW",
-    "TH",
-    "TR",
-    "UA",
-    "AE",
-    "UY",
-    "VE",
-    "VN",
-  ];
 }
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index a43f1fa07a8..4b876db247d 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -134,11 +134,13 @@ import {
 import { AccountBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/account/account-billing-api.service.abstraction";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import { AccountBillingApiService } from "@bitwarden/common/billing/services/account/account-billing-api.service";
 import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service";
 import { BillingApiService } from "@bitwarden/common/billing/services/billing-api.service";
 import { OrganizationBillingApiService } from "@bitwarden/common/billing/services/organization/organization-billing-api.service";
 import { OrganizationBillingService } from "@bitwarden/common/billing/services/organization-billing.service";
+import { TaxService } from "@bitwarden/common/billing/services/tax.service";
 import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
@@ -1262,6 +1264,11 @@ const safeProviders: SafeProvider[] = [
     useClass: BillingApiService,
     deps: [ApiServiceAbstraction, LogService, ToastService],
   }),
+  safeProvider({
+    provide: TaxServiceAbstraction,
+    useClass: TaxService,
+    deps: [ApiServiceAbstraction],
+  }),
   safeProvider({
     provide: BillingAccountProfileStateService,
     useClass: DefaultBillingAccountProfileStateService,
diff --git a/libs/common/src/billing/abstractions/tax.service.abstraction.ts b/libs/common/src/billing/abstractions/tax.service.abstraction.ts
new file mode 100644
index 00000000000..fea4618bc02
--- /dev/null
+++ b/libs/common/src/billing/abstractions/tax.service.abstraction.ts
@@ -0,0 +1,18 @@
+import { CountryListItem } from "@bitwarden/common/billing/models/domain";
+import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
+import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
+import { PreviewInvoiceResponse } from "@bitwarden/common/billing/models/response/preview-invoice.response";
+
+export abstract class TaxServiceAbstraction {
+  getCountries: () => CountryListItem[];
+
+  isCountrySupported: (country: string) => Promise<boolean>;
+
+  previewIndividualInvoice: (
+    request: PreviewIndividualInvoiceRequest,
+  ) => Promise<PreviewInvoiceResponse>;
+
+  previewOrganizationInvoice: (
+    request: PreviewOrganizationInvoiceRequest,
+  ) => Promise<PreviewInvoiceResponse>;
+}
diff --git a/libs/common/src/billing/models/domain/country-list-item.ts b/libs/common/src/billing/models/domain/country-list-item.ts
new file mode 100644
index 00000000000..79abb96871c
--- /dev/null
+++ b/libs/common/src/billing/models/domain/country-list-item.ts
@@ -0,0 +1,5 @@
+export type CountryListItem = {
+  name: string;
+  value: string;
+  disabled: boolean;
+};
diff --git a/libs/common/src/billing/models/domain/index.ts b/libs/common/src/billing/models/domain/index.ts
index 0f53c3e116c..057f6dc4e84 100644
--- a/libs/common/src/billing/models/domain/index.ts
+++ b/libs/common/src/billing/models/domain/index.ts
@@ -1,2 +1,3 @@
 export * from "./bank-account";
+export * from "./country-list-item";
 export * from "./tax-information";
diff --git a/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts b/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
index f06795c0805..0cedc5d8e67 100644
--- a/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
+++ b/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
@@ -10,6 +10,10 @@ export class ExpandedTaxInfoUpdateRequest extends TaxInfoUpdateRequest {
   state: string;
 
   static From(taxInformation: TaxInformation): ExpandedTaxInfoUpdateRequest {
+    if (!taxInformation) {
+      return null;
+    }
+
     const request = new ExpandedTaxInfoUpdateRequest();
     request.country = taxInformation.country;
     request.postalCode = taxInformation.postalCode;
diff --git a/libs/common/src/billing/models/request/preview-individual-invoice.request.ts b/libs/common/src/billing/models/request/preview-individual-invoice.request.ts
new file mode 100644
index 00000000000..67b7b2f3ee6
--- /dev/null
+++ b/libs/common/src/billing/models/request/preview-individual-invoice.request.ts
@@ -0,0 +1,14 @@
+export class PreviewIndividualInvoiceRequest {
+  passwordManager: PasswordManager;
+  taxInformation: TaxInformation;
+}
+
+class PasswordManager {
+  additionalStorage: number;
+}
+
+class TaxInformation {
+  postalCode: string;
+  country: string;
+  taxId: string;
+}
diff --git a/libs/common/src/billing/models/request/preview-organization-invoice.request.ts b/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
new file mode 100644
index 00000000000..2fe2526fdce
--- /dev/null
+++ b/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
@@ -0,0 +1,25 @@
+import { PlanType } from "@bitwarden/common/billing/enums";
+
+export class PreviewOrganizationInvoiceRequest {
+  organizationId?: string;
+  passwordManager: PasswordManager;
+  secretsManager?: SecretsManager;
+  taxInformation: TaxInformation;
+}
+
+class PasswordManager {
+  plan: PlanType;
+  seats: number;
+  additionalStorage: number;
+}
+
+class SecretsManager {
+  seats: number;
+  additionalMachineAccounts: number;
+}
+
+class TaxInformation {
+  postalCode: string;
+  country: string;
+  taxId: string;
+}
diff --git a/libs/common/src/billing/models/response/preview-invoice.response.ts b/libs/common/src/billing/models/response/preview-invoice.response.ts
new file mode 100644
index 00000000000..c822a569bb3
--- /dev/null
+++ b/libs/common/src/billing/models/response/preview-invoice.response.ts
@@ -0,0 +1,16 @@
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+
+export class PreviewInvoiceResponse extends BaseResponse {
+  effectiveTaxRate: number;
+  taxableBaseAmount: number;
+  taxAmount: number;
+  totalAmount: number;
+
+  constructor(response: any) {
+    super(response);
+    this.effectiveTaxRate = this.getResponseProperty("EffectiveTaxRate");
+    this.taxableBaseAmount = this.getResponseProperty("TaxableBaseAmount");
+    this.taxAmount = this.getResponseProperty("TaxAmount");
+    this.totalAmount = this.getResponseProperty("TotalAmount");
+  }
+}
diff --git a/libs/common/src/billing/models/response/tax-id-types.response.ts b/libs/common/src/billing/models/response/tax-id-types.response.ts
new file mode 100644
index 00000000000..0d5cce46c8c
--- /dev/null
+++ b/libs/common/src/billing/models/response/tax-id-types.response.ts
@@ -0,0 +1,28 @@
+import { BaseResponse } from "@bitwarden/common/models/response/base.response";
+
+export class TaxIdTypesResponse extends BaseResponse {
+  taxIdTypes: TaxIdTypeResponse[] = [];
+
+  constructor(response: any) {
+    super(response);
+    const taxIdTypes = this.getResponseProperty("TaxIdTypes");
+    if (taxIdTypes && taxIdTypes.length) {
+      this.taxIdTypes = taxIdTypes.map((t: any) => new TaxIdTypeResponse(t));
+    }
+  }
+}
+
+export class TaxIdTypeResponse extends BaseResponse {
+  code: string;
+  country: string;
+  description: string;
+  example: string;
+
+  constructor(response: any) {
+    super(response);
+    this.code = this.getResponseProperty("Code");
+    this.country = this.getResponseProperty("Country");
+    this.description = this.getResponseProperty("Description");
+    this.example = this.getResponseProperty("Example");
+  }
+}
diff --git a/libs/common/src/billing/services/tax.service.ts b/libs/common/src/billing/services/tax.service.ts
new file mode 100644
index 00000000000..45e57267ec0
--- /dev/null
+++ b/libs/common/src/billing/services/tax.service.ts
@@ -0,0 +1,303 @@
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
+import { CountryListItem } from "@bitwarden/common/billing/models/domain";
+import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
+import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
+import { PreviewInvoiceResponse } from "@bitwarden/common/billing/models/response/preview-invoice.response";
+
+export class TaxService implements TaxServiceAbstraction {
+  constructor(private apiService: ApiService) {}
+
+  getCountries(): CountryListItem[] {
+    return [
+      { name: "-- Select --", value: "", disabled: false },
+      { name: "United States", value: "US", disabled: false },
+      { name: "China", value: "CN", disabled: false },
+      { name: "France", value: "FR", disabled: false },
+      { name: "Germany", value: "DE", disabled: false },
+      { name: "Canada", value: "CA", disabled: false },
+      { name: "United Kingdom", value: "GB", disabled: false },
+      { name: "Australia", value: "AU", disabled: false },
+      { name: "India", value: "IN", disabled: false },
+      { name: "", value: "-", disabled: true },
+      { name: "Afghanistan", value: "AF", disabled: false },
+      { name: "Åland Islands", value: "AX", disabled: false },
+      { name: "Albania", value: "AL", disabled: false },
+      { name: "Algeria", value: "DZ", disabled: false },
+      { name: "American Samoa", value: "AS", disabled: false },
+      { name: "Andorra", value: "AD", disabled: false },
+      { name: "Angola", value: "AO", disabled: false },
+      { name: "Anguilla", value: "AI", disabled: false },
+      { name: "Antarctica", value: "AQ", disabled: false },
+      { name: "Antigua and Barbuda", value: "AG", disabled: false },
+      { name: "Argentina", value: "AR", disabled: false },
+      { name: "Armenia", value: "AM", disabled: false },
+      { name: "Aruba", value: "AW", disabled: false },
+      { name: "Austria", value: "AT", disabled: false },
+      { name: "Azerbaijan", value: "AZ", disabled: false },
+      { name: "Bahamas", value: "BS", disabled: false },
+      { name: "Bahrain", value: "BH", disabled: false },
+      { name: "Bangladesh", value: "BD", disabled: false },
+      { name: "Barbados", value: "BB", disabled: false },
+      { name: "Belarus", value: "BY", disabled: false },
+      { name: "Belgium", value: "BE", disabled: false },
+      { name: "Belize", value: "BZ", disabled: false },
+      { name: "Benin", value: "BJ", disabled: false },
+      { name: "Bermuda", value: "BM", disabled: false },
+      { name: "Bhutan", value: "BT", disabled: false },
+      { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
+      { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
+      { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
+      { name: "Botswana", value: "BW", disabled: false },
+      { name: "Bouvet Island", value: "BV", disabled: false },
+      { name: "Brazil", value: "BR", disabled: false },
+      { name: "British Indian Ocean Territory", value: "IO", disabled: false },
+      { name: "Brunei Darussalam", value: "BN", disabled: false },
+      { name: "Bulgaria", value: "BG", disabled: false },
+      { name: "Burkina Faso", value: "BF", disabled: false },
+      { name: "Burundi", value: "BI", disabled: false },
+      { name: "Cambodia", value: "KH", disabled: false },
+      { name: "Cameroon", value: "CM", disabled: false },
+      { name: "Cape Verde", value: "CV", disabled: false },
+      { name: "Cayman Islands", value: "KY", disabled: false },
+      { name: "Central African Republic", value: "CF", disabled: false },
+      { name: "Chad", value: "TD", disabled: false },
+      { name: "Chile", value: "CL", disabled: false },
+      { name: "Christmas Island", value: "CX", disabled: false },
+      { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
+      { name: "Colombia", value: "CO", disabled: false },
+      { name: "Comoros", value: "KM", disabled: false },
+      { name: "Congo", value: "CG", disabled: false },
+      { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
+      { name: "Cook Islands", value: "CK", disabled: false },
+      { name: "Costa Rica", value: "CR", disabled: false },
+      { name: "Côte d'Ivoire", value: "CI", disabled: false },
+      { name: "Croatia", value: "HR", disabled: false },
+      { name: "Cuba", value: "CU", disabled: false },
+      { name: "Curaçao", value: "CW", disabled: false },
+      { name: "Cyprus", value: "CY", disabled: false },
+      { name: "Czech Republic", value: "CZ", disabled: false },
+      { name: "Denmark", value: "DK", disabled: false },
+      { name: "Djibouti", value: "DJ", disabled: false },
+      { name: "Dominica", value: "DM", disabled: false },
+      { name: "Dominican Republic", value: "DO", disabled: false },
+      { name: "Ecuador", value: "EC", disabled: false },
+      { name: "Egypt", value: "EG", disabled: false },
+      { name: "El Salvador", value: "SV", disabled: false },
+      { name: "Equatorial Guinea", value: "GQ", disabled: false },
+      { name: "Eritrea", value: "ER", disabled: false },
+      { name: "Estonia", value: "EE", disabled: false },
+      { name: "Ethiopia", value: "ET", disabled: false },
+      { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
+      { name: "Faroe Islands", value: "FO", disabled: false },
+      { name: "Fiji", value: "FJ", disabled: false },
+      { name: "Finland", value: "FI", disabled: false },
+      { name: "French Guiana", value: "GF", disabled: false },
+      { name: "French Polynesia", value: "PF", disabled: false },
+      { name: "French Southern Territories", value: "TF", disabled: false },
+      { name: "Gabon", value: "GA", disabled: false },
+      { name: "Gambia", value: "GM", disabled: false },
+      { name: "Georgia", value: "GE", disabled: false },
+      { name: "Ghana", value: "GH", disabled: false },
+      { name: "Gibraltar", value: "GI", disabled: false },
+      { name: "Greece", value: "GR", disabled: false },
+      { name: "Greenland", value: "GL", disabled: false },
+      { name: "Grenada", value: "GD", disabled: false },
+      { name: "Guadeloupe", value: "GP", disabled: false },
+      { name: "Guam", value: "GU", disabled: false },
+      { name: "Guatemala", value: "GT", disabled: false },
+      { name: "Guernsey", value: "GG", disabled: false },
+      { name: "Guinea", value: "GN", disabled: false },
+      { name: "Guinea-Bissau", value: "GW", disabled: false },
+      { name: "Guyana", value: "GY", disabled: false },
+      { name: "Haiti", value: "HT", disabled: false },
+      { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
+      { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
+      { name: "Honduras", value: "HN", disabled: false },
+      { name: "Hong Kong", value: "HK", disabled: false },
+      { name: "Hungary", value: "HU", disabled: false },
+      { name: "Iceland", value: "IS", disabled: false },
+      { name: "Indonesia", value: "ID", disabled: false },
+      { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
+      { name: "Iraq", value: "IQ", disabled: false },
+      { name: "Ireland", value: "IE", disabled: false },
+      { name: "Isle of Man", value: "IM", disabled: false },
+      { name: "Israel", value: "IL", disabled: false },
+      { name: "Italy", value: "IT", disabled: false },
+      { name: "Jamaica", value: "JM", disabled: false },
+      { name: "Japan", value: "JP", disabled: false },
+      { name: "Jersey", value: "JE", disabled: false },
+      { name: "Jordan", value: "JO", disabled: false },
+      { name: "Kazakhstan", value: "KZ", disabled: false },
+      { name: "Kenya", value: "KE", disabled: false },
+      { name: "Kiribati", value: "KI", disabled: false },
+      { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
+      { name: "Korea, Republic of", value: "KR", disabled: false },
+      { name: "Kuwait", value: "KW", disabled: false },
+      { name: "Kyrgyzstan", value: "KG", disabled: false },
+      { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
+      { name: "Latvia", value: "LV", disabled: false },
+      { name: "Lebanon", value: "LB", disabled: false },
+      { name: "Lesotho", value: "LS", disabled: false },
+      { name: "Liberia", value: "LR", disabled: false },
+      { name: "Libya", value: "LY", disabled: false },
+      { name: "Liechtenstein", value: "LI", disabled: false },
+      { name: "Lithuania", value: "LT", disabled: false },
+      { name: "Luxembourg", value: "LU", disabled: false },
+      { name: "Macao", value: "MO", disabled: false },
+      { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
+      { name: "Madagascar", value: "MG", disabled: false },
+      { name: "Malawi", value: "MW", disabled: false },
+      { name: "Malaysia", value: "MY", disabled: false },
+      { name: "Maldives", value: "MV", disabled: false },
+      { name: "Mali", value: "ML", disabled: false },
+      { name: "Malta", value: "MT", disabled: false },
+      { name: "Marshall Islands", value: "MH", disabled: false },
+      { name: "Martinique", value: "MQ", disabled: false },
+      { name: "Mauritania", value: "MR", disabled: false },
+      { name: "Mauritius", value: "MU", disabled: false },
+      { name: "Mayotte", value: "YT", disabled: false },
+      { name: "Mexico", value: "MX", disabled: false },
+      { name: "Micronesia, Federated States of", value: "FM", disabled: false },
+      { name: "Moldova, Republic of", value: "MD", disabled: false },
+      { name: "Monaco", value: "MC", disabled: false },
+      { name: "Mongolia", value: "MN", disabled: false },
+      { name: "Montenegro", value: "ME", disabled: false },
+      { name: "Montserrat", value: "MS", disabled: false },
+      { name: "Morocco", value: "MA", disabled: false },
+      { name: "Mozambique", value: "MZ", disabled: false },
+      { name: "Myanmar", value: "MM", disabled: false },
+      { name: "Namibia", value: "NA", disabled: false },
+      { name: "Nauru", value: "NR", disabled: false },
+      { name: "Nepal", value: "NP", disabled: false },
+      { name: "Netherlands", value: "NL", disabled: false },
+      { name: "New Caledonia", value: "NC", disabled: false },
+      { name: "New Zealand", value: "NZ", disabled: false },
+      { name: "Nicaragua", value: "NI", disabled: false },
+      { name: "Niger", value: "NE", disabled: false },
+      { name: "Nigeria", value: "NG", disabled: false },
+      { name: "Niue", value: "NU", disabled: false },
+      { name: "Norfolk Island", value: "NF", disabled: false },
+      { name: "Northern Mariana Islands", value: "MP", disabled: false },
+      { name: "Norway", value: "NO", disabled: false },
+      { name: "Oman", value: "OM", disabled: false },
+      { name: "Pakistan", value: "PK", disabled: false },
+      { name: "Palau", value: "PW", disabled: false },
+      { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
+      { name: "Panama", value: "PA", disabled: false },
+      { name: "Papua New Guinea", value: "PG", disabled: false },
+      { name: "Paraguay", value: "PY", disabled: false },
+      { name: "Peru", value: "PE", disabled: false },
+      { name: "Philippines", value: "PH", disabled: false },
+      { name: "Pitcairn", value: "PN", disabled: false },
+      { name: "Poland", value: "PL", disabled: false },
+      { name: "Portugal", value: "PT", disabled: false },
+      { name: "Puerto Rico", value: "PR", disabled: false },
+      { name: "Qatar", value: "QA", disabled: false },
+      { name: "Réunion", value: "RE", disabled: false },
+      { name: "Romania", value: "RO", disabled: false },
+      { name: "Russian Federation", value: "RU", disabled: false },
+      { name: "Rwanda", value: "RW", disabled: false },
+      { name: "Saint Barthélemy", value: "BL", disabled: false },
+      { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
+      { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
+      { name: "Saint Lucia", value: "LC", disabled: false },
+      { name: "Saint Martin (French part)", value: "MF", disabled: false },
+      { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
+      { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
+      { name: "Samoa", value: "WS", disabled: false },
+      { name: "San Marino", value: "SM", disabled: false },
+      { name: "Sao Tome and Principe", value: "ST", disabled: false },
+      { name: "Saudi Arabia", value: "SA", disabled: false },
+      { name: "Senegal", value: "SN", disabled: false },
+      { name: "Serbia", value: "RS", disabled: false },
+      { name: "Seychelles", value: "SC", disabled: false },
+      { name: "Sierra Leone", value: "SL", disabled: false },
+      { name: "Singapore", value: "SG", disabled: false },
+      { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
+      { name: "Slovakia", value: "SK", disabled: false },
+      { name: "Slovenia", value: "SI", disabled: false },
+      { name: "Solomon Islands", value: "SB", disabled: false },
+      { name: "Somalia", value: "SO", disabled: false },
+      { name: "South Africa", value: "ZA", disabled: false },
+      { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
+      { name: "South Sudan", value: "SS", disabled: false },
+      { name: "Spain", value: "ES", disabled: false },
+      { name: "Sri Lanka", value: "LK", disabled: false },
+      { name: "Sudan", value: "SD", disabled: false },
+      { name: "Suriname", value: "SR", disabled: false },
+      { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
+      { name: "Swaziland", value: "SZ", disabled: false },
+      { name: "Sweden", value: "SE", disabled: false },
+      { name: "Switzerland", value: "CH", disabled: false },
+      { name: "Syrian Arab Republic", value: "SY", disabled: false },
+      { name: "Taiwan", value: "TW", disabled: false },
+      { name: "Tajikistan", value: "TJ", disabled: false },
+      { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
+      { name: "Thailand", value: "TH", disabled: false },
+      { name: "Timor-Leste", value: "TL", disabled: false },
+      { name: "Togo", value: "TG", disabled: false },
+      { name: "Tokelau", value: "TK", disabled: false },
+      { name: "Tonga", value: "TO", disabled: false },
+      { name: "Trinidad and Tobago", value: "TT", disabled: false },
+      { name: "Tunisia", value: "TN", disabled: false },
+      { name: "Turkey", value: "TR", disabled: false },
+      { name: "Turkmenistan", value: "TM", disabled: false },
+      { name: "Turks and Caicos Islands", value: "TC", disabled: false },
+      { name: "Tuvalu", value: "TV", disabled: false },
+      { name: "Uganda", value: "UG", disabled: false },
+      { name: "Ukraine", value: "UA", disabled: false },
+      { name: "United Arab Emirates", value: "AE", disabled: false },
+      { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
+      { name: "Uruguay", value: "UY", disabled: false },
+      { name: "Uzbekistan", value: "UZ", disabled: false },
+      { name: "Vanuatu", value: "VU", disabled: false },
+      { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
+      { name: "Viet Nam", value: "VN", disabled: false },
+      { name: "Virgin Islands, British", value: "VG", disabled: false },
+      { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
+      { name: "Wallis and Futuna", value: "WF", disabled: false },
+      { name: "Western Sahara", value: "EH", disabled: false },
+      { name: "Yemen", value: "YE", disabled: false },
+      { name: "Zambia", value: "ZM", disabled: false },
+      { name: "Zimbabwe", value: "ZW", disabled: false },
+    ];
+  }
+
+  async isCountrySupported(country: string): Promise<boolean> {
+    const response = await this.apiService.send(
+      "GET",
+      "/tax/is-country-supported?country=" + country,
+      null,
+      true,
+      true,
+    );
+    return response;
+  }
+
+  async previewIndividualInvoice(
+    request: PreviewIndividualInvoiceRequest,
+  ): Promise<PreviewInvoiceResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      "/accounts/billing/preview-invoice",
+      request,
+      true,
+      true,
+    );
+    return new PreviewInvoiceResponse(response);
+  }
+
+  async previewOrganizationInvoice(
+    request: PreviewOrganizationInvoiceRequest,
+  ): Promise<PreviewInvoiceResponse> {
+    const response = await this.apiService.send(
+      "POST",
+      `/invoices/preview-organization`,
+      request,
+      true,
+      true,
+    );
+    return new PreviewInvoiceResponse(response);
+  }
+}

From 864e6759fdb8afd5a96f011a5cc13f60a7701d6b Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 4 Dec 2024 12:54:55 +0100
Subject: [PATCH 19/46] Switch to rustcrypto argon2 on desktop (#11753)

* Switch to rustcrypto argon2 on desktop

* Make argon2 use zeroize

* Remove argon2 native modules from electron-builder config

* Clean rust implementation of argon2

* Update cargo.lock

* Update apps/desktop/desktop_native/napi/src/lib.rs

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>

* Add tests

* Clean up test

* Remove argon2 external from webpack main

* Fix build

* Fix argon2 module causing a startup crash

---------

Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com>
---
 apps/desktop/desktop_native/Cargo.lock        | 42 +++++++++++++--
 apps/desktop/desktop_native/core/Cargo.toml   |  1 +
 .../desktop_native/core/src/crypto/crypto.rs  | 52 ++++++++++++++++++-
 apps/desktop/desktop_native/core/src/error.rs |  8 +++
 apps/desktop/desktop_native/napi/Cargo.toml   |  2 +-
 apps/desktop/desktop_native/napi/index.d.ts   |  3 ++
 apps/desktop/desktop_native/napi/src/lib.rs   | 19 +++++++
 apps/desktop/electron-builder.json            |  7 +--
 .../renderer-crypto-function.service.ts       |  7 +++
 apps/desktop/src/package-lock.json            |  3 +-
 apps/desktop/src/package.json                 |  3 +-
 .../main/main-crypto-function.service.ts      | 11 ++--
 apps/desktop/src/platform/preload.ts          |  4 +-
 apps/desktop/webpack.main.js                  |  2 -
 .../services/node-crypto-function.service.ts  |  2 +-
 15 files changed, 140 insertions(+), 26 deletions(-)

diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index 16a5a48cd06..5e6a697c6cb 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -83,6 +83,19 @@ dependencies = [
  "x11rb",
 ]
 
+[[package]]
+name = "argon2"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072"
+dependencies = [
+ "base64ct",
+ "blake2",
+ "cpufeatures",
+ "password-hash",
+ "zeroize",
+]
+
 [[package]]
 name = "async-broadcast"
 version = "0.7.1"
@@ -320,6 +333,15 @@ dependencies = [
  "tokio-util",
 ]
 
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -660,6 +682,7 @@ dependencies = [
  "aes",
  "anyhow",
  "arboard",
+ "argon2",
  "async-stream",
  "base64",
  "bitwarden-russh",
@@ -1418,9 +1441,9 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a"
 
 [[package]]
 name = "napi-derive"
-version = "2.16.12"
+version = "2.16.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17435f7a00bfdab20b0c27d9c56f58f6499e418252253081bfff448099da31d1"
+checksum = "7cbe2585d8ac223f7d34f13701434b9d5f4eb9c332cccce8dee57ea18ab8ab0c"
 dependencies = [
  "cfg-if",
  "convert_case",
@@ -1432,9 +1455,9 @@ dependencies = [
 
 [[package]]
 name = "napi-derive-backend"
-version = "1.0.74"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "967c485e00f0bf3b1bdbe510a38a4606919cf1d34d9a37ad41f25a81aa077abe"
+checksum = "1639aaa9eeb76e91c6ae66da8ce3e89e921cd3885e99ec85f4abacae72fc91bf"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -1726,6 +1749,17 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "password-hash"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core",
+ "subtle",
+]
+
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml
index 6abf7fbb0a7..f9b58b7a27d 100644
--- a/apps/desktop/desktop_native/core/Cargo.toml
+++ b/apps/desktop/desktop_native/core/Cargo.toml
@@ -27,6 +27,7 @@ anyhow = "=1.0.93"
 arboard = { version = "=3.4.1", default-features = false, features = [
     "wayland-data-control",
 ] }
+argon2 = { version = "=0.5.3", features = ["zeroize"] }
 async-stream = "=0.3.6"
 base64 = "=0.22.1"
 byteorder = "=1.5.0"
diff --git a/apps/desktop/desktop_native/core/src/crypto/crypto.rs b/apps/desktop/desktop_native/core/src/crypto/crypto.rs
index b1fd4426fa6..4427138cb1d 100644
--- a/apps/desktop/desktop_native/core/src/crypto/crypto.rs
+++ b/apps/desktop/desktop_native/core/src/crypto/crypto.rs
@@ -5,7 +5,7 @@ use aes::cipher::{
     BlockEncryptMut, KeyIvInit,
 };
 
-use crate::error::{CryptoError, Result};
+use crate::error::{CryptoError, KdfParamError, Result};
 
 use super::CipherString;
 
@@ -37,3 +37,53 @@ pub fn encrypt_aes256(
 
     Ok(CipherString::AesCbc256_B64 { iv, data })
 }
+
+pub fn argon2(
+    secret: &[u8],
+    salt: &[u8],
+    iterations: u32,
+    memory: u32,
+    parallelism: u32,
+) -> Result<[u8; 32]> {
+    use argon2::*;
+
+    let params = Params::new(memory, iterations, parallelism, Some(32)).map_err(|e| {
+        KdfParamError::InvalidParams(format!("Argon2 parameters are invalid: {e}",))
+    })?;
+    let argon = Argon2::new(Algorithm::Argon2id, Version::V0x13, params);
+
+    let mut hash = [0u8; 32];
+    argon
+        .hash_password_into(secret, &salt, &mut hash)
+        .map_err(|e| KdfParamError::InvalidParams(format!("Argon2 hashing failed: {e}",)))?;
+
+    // Argon2 is using some stack memory that is not zeroed. Eventually some function will
+    // overwrite the stack, but we use this trick to force the used stack to be zeroed.
+    #[inline(never)]
+    fn clear_stack() {
+        std::hint::black_box([0u8; 4096]);
+    }
+    clear_stack();
+    Ok(hash)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_argon2() {
+        let test_hash: [u8; 32] = [
+            112, 200, 85, 209, 100, 4, 246, 146, 117, 180, 152, 44, 103, 198, 75, 14, 166, 77, 201,
+            22, 62, 178, 87, 224, 95, 209, 253, 68, 166, 209, 47, 218,
+        ];
+        let secret = b"supersecurepassword";
+        let salt = b"mail@example.com";
+        let iterations = 3;
+        let memory = 1024 * 64;
+        let parallelism = 4;
+
+        let hash = argon2(secret, salt, iterations, memory, parallelism).unwrap();
+        assert_eq!(hash, test_hash,);
+    }
+}
diff --git a/apps/desktop/desktop_native/core/src/error.rs b/apps/desktop/desktop_native/core/src/error.rs
index d3104cb6f44..34624ed630e 100644
--- a/apps/desktop/desktop_native/core/src/error.rs
+++ b/apps/desktop/desktop_native/core/src/error.rs
@@ -9,6 +9,8 @@ pub enum Error {
 
     #[error("Cryptography Error, {0}")]
     Crypto(#[from] CryptoError),
+    #[error("KDF Parameter Error, {0}")]
+    KdfParam(#[from] KdfParamError),
 }
 
 #[derive(Debug, Error)]
@@ -29,6 +31,12 @@ pub enum CryptoError {
     KeyDecrypt,
 }
 
+#[derive(Debug, Error)]
+pub enum KdfParamError {
+    #[error("Invalid KDF parameters: {0}")]
+    InvalidParams(String),
+}
+
 // Ensure that the error messages implement Send and Sync
 #[cfg(test)]
 const _: () = {
diff --git a/apps/desktop/desktop_native/napi/Cargo.toml b/apps/desktop/desktop_native/napi/Cargo.toml
index 644ff8a51d8..6efd662b351 100644
--- a/apps/desktop/desktop_native/napi/Cargo.toml
+++ b/apps/desktop/desktop_native/napi/Cargo.toml
@@ -19,7 +19,7 @@ hex = "=0.4.3"
 anyhow = "=1.0.93"
 desktop_core = { path = "../core" }
 napi = { version = "=2.16.13", features = ["async"] }
-napi-derive = "=2.16.12"
+napi-derive = "=2.16.13"
 tokio = { version = "=1.41.1" }
 tokio-util = "=0.7.12"
 tokio-stream = "=0.1.15"
diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts
index 956b2d726da..009f29333a5 100644
--- a/apps/desktop/desktop_native/napi/index.d.ts
+++ b/apps/desktop/desktop_native/napi/index.d.ts
@@ -124,3 +124,6 @@ export declare namespace ipc {
     send(message: string): number
   }
 }
+export declare namespace crypto {
+  export function argon2(secret: Buffer, salt: Buffer, iterations: number, memory: number, parallelism: number): Promise<Buffer>
+}
diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs
index 4c7bc8eaa93..c5ca655bce6 100644
--- a/apps/desktop/desktop_native/napi/src/lib.rs
+++ b/apps/desktop/desktop_native/napi/src/lib.rs
@@ -528,3 +528,22 @@ pub mod ipc {
         }
     }
 }
+
+#[napi]
+pub mod crypto {
+    use napi::bindgen_prelude::Buffer;
+
+    #[napi]
+    pub async fn argon2(
+        secret: Buffer,
+        salt: Buffer,
+        iterations: u32,
+        memory: u32,
+        parallelism: u32,
+    ) -> napi::Result<Buffer> {
+        desktop_core::crypto::argon2(&secret, &salt, iterations, memory, parallelism)
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+            .map(|v| v.to_vec())
+            .map(|v| Buffer::from(v))
+    }
+}
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index 9a8bc45ae20..e4649a083a3 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -18,12 +18,7 @@
     "**/*",
     "!**/node_modules/@bitwarden/desktop-napi/**/*",
     "**/node_modules/@bitwarden/desktop-napi/index.js",
-    "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node",
-
-    "!**/node_modules/argon2/**/*",
-    "**/node_modules/argon2/argon2.cjs",
-    "**/node_modules/argon2/package.json",
-    "**/node_modules/argon2/build/Release/argon2.node"
+    "**/node_modules/@bitwarden/desktop-napi/desktop_napi.${platform}-${arch}*.node"
   ],
   "electronVersion": "32.1.1",
   "generateUpdatesFilesForAllChannels": true,
diff --git a/apps/desktop/src/app/services/renderer-crypto-function.service.ts b/apps/desktop/src/app/services/renderer-crypto-function.service.ts
index 604e70b1ebd..ee80dc25933 100644
--- a/apps/desktop/src/app/services/renderer-crypto-function.service.ts
+++ b/apps/desktop/src/app/services/renderer-crypto-function.service.ts
@@ -19,6 +19,13 @@ export class RendererCryptoFunctionService
     memory: number,
     parallelism: number,
   ): Promise<Uint8Array> {
+    if (typeof password === "string") {
+      password = new TextEncoder().encode(password);
+    }
+    if (typeof salt === "string") {
+      salt = new TextEncoder().encode(salt);
+    }
+
     return await ipc.platform.crypto.argon2(password, salt, iterations, memory, parallelism);
   }
 }
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index 085181e34b2..0300b0b93cc 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -9,8 +9,7 @@
       "version": "2024.12.0",
       "license": "GPL-3.0",
       "dependencies": {
-        "@bitwarden/desktop-napi": "file:../desktop_native/napi",
-        "argon2": "0.41.1"
+        "@bitwarden/desktop-napi": "file:../desktop_native/napi"
       }
     },
     "../desktop_native/napi": {
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index 0f82609b767..9a3c56cf17c 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -12,7 +12,6 @@
     "url": "git+https://github.com/bitwarden/clients.git"
   },
   "dependencies": {
-    "@bitwarden/desktop-napi": "file:../desktop_native/napi",
-    "argon2": "0.41.1"
+    "@bitwarden/desktop-napi": "file:../desktop_native/napi"
   }
 }
diff --git a/apps/desktop/src/platform/main/main-crypto-function.service.ts b/apps/desktop/src/platform/main/main-crypto-function.service.ts
index 848e33113e5..2fc3fde1db2 100644
--- a/apps/desktop/src/platform/main/main-crypto-function.service.ts
+++ b/apps/desktop/src/platform/main/main-crypto-function.service.ts
@@ -1,6 +1,7 @@
 import { ipcMain } from "electron";
 
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
+import { crypto } from "@bitwarden/desktop-napi";
 import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service";
 
 export class MainCryptoFunctionService
@@ -13,16 +14,16 @@ export class MainCryptoFunctionService
       async (
         event,
         opts: {
-          password: string | Uint8Array;
-          salt: string | Uint8Array;
+          password: Uint8Array;
+          salt: Uint8Array;
           iterations: number;
           memory: number;
           parallelism: number;
         },
       ) => {
-        return await this.argon2(
-          opts.password,
-          opts.salt,
+        return await crypto.argon2(
+          Buffer.from(opts.password),
+          Buffer.from(opts.salt),
           opts.iterations,
           opts.memory,
           opts.parallelism,
diff --git a/apps/desktop/src/platform/preload.ts b/apps/desktop/src/platform/preload.ts
index 519ed684320..30e248d352c 100644
--- a/apps/desktop/src/platform/preload.ts
+++ b/apps/desktop/src/platform/preload.ts
@@ -99,8 +99,8 @@ const nativeMessaging = {
 
 const crypto = {
   argon2: (
-    password: string | Uint8Array,
-    salt: string | Uint8Array,
+    password: Uint8Array,
+    salt: Uint8Array,
     iterations: number,
     memory: number,
     parallelism: number,
diff --git a/apps/desktop/webpack.main.js b/apps/desktop/webpack.main.js
index d52a947e362..25a68d8c867 100644
--- a/apps/desktop/webpack.main.js
+++ b/apps/desktop/webpack.main.js
@@ -81,8 +81,6 @@ const main = {
   externals: {
     "electron-reload": "commonjs2 electron-reload",
     "@bitwarden/desktop-napi": "commonjs2 @bitwarden/desktop-napi",
-
-    argon2: "commonjs2 argon2",
   },
 };
 
diff --git a/libs/node/src/services/node-crypto-function.service.ts b/libs/node/src/services/node-crypto-function.service.ts
index c8d676eeaa5..b4126b0813f 100644
--- a/libs/node/src/services/node-crypto-function.service.ts
+++ b/libs/node/src/services/node-crypto-function.service.ts
@@ -1,6 +1,5 @@
 import * as crypto from "crypto";
 
-import * as argon2 from "argon2";
 import * as forge from "node-forge";
 
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
@@ -40,6 +39,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService {
     const nodePassword = this.toNodeValue(password);
     const nodeSalt = this.toNodeBuffer(this.toUint8Buffer(salt));
 
+    const argon2 = await import("argon2");
     const hash = await argon2.hash(nodePassword, {
       salt: nodeSalt,
       raw: true,

From b25dc6300cd8bd835cd6dd2319e1505d2734164f Mon Sep 17 00:00:00 2001
From: Jonas Hendrickx <jhendrickx@bitwarden.com>
Date: Wed, 4 Dec 2024 15:40:57 +0100
Subject: [PATCH 20/46] Revert "[PM-13999] Show estimated tax for taxable
 countries (#12145)" (#12244)

This reverts commit 1dce7f5ba0f66207faa2277f35e1fe3f64c74864.
---
 .../trial-billing-step.component.html         |   2 +-
 .../premium/premium-v2.component.html         |   3 +-
 .../premium/premium-v2.component.ts           |  50 +-
 .../individual/premium/premium.component.html |   2 +-
 .../individual/premium/premium.component.ts   |  51 +-
 .../change-plan-dialog.component.html         |  41 +-
 .../change-plan-dialog.component.ts           | 121 +---
 .../organization-plans.component.html         |  16 +-
 .../organization-plans.component.ts           | 159 ++---
 ...organization-payment-method.component.html |  15 +
 .../organization-payment-method.component.ts  |  27 +
 .../adjust-payment-dialog-v2.component.html   |   6 +-
 .../adjust-payment-dialog-v2.component.ts     |  69 +-
 .../adjust-payment-dialog.component.html      |   6 +-
 .../adjust-payment-dialog.component.ts        |  59 +-
 .../shared/payment-method.component.html      |  18 +
 .../shared/payment-method.component.ts        |  21 +-
 .../billing/shared/tax-info.component.html    |  60 +-
 .../app/billing/shared/tax-info.component.ts  | 624 +++++++++++++++---
 apps/web/src/locales/en/messages.json         |  12 -
 .../providers/setup/setup.component.html      |   2 +-
 .../providers/setup/setup.component.ts        |  17 +-
 .../manage-tax-information.component.html     |  88 +--
 .../manage-tax-information.component.ts       | 446 ++++++++++---
 .../src/services/jslib-services.module.ts     |   7 -
 .../abstractions/tax.service.abstraction.ts   |  18 -
 .../models/domain/country-list-item.ts        |   5 -
 .../common/src/billing/models/domain/index.ts |   1 -
 .../expanded-tax-info-update.request.ts       |   4 -
 .../preview-individual-invoice.request.ts     |  14 -
 .../preview-organization-invoice.request.ts   |  25 -
 .../response/preview-invoice.response.ts      |  16 -
 .../models/response/tax-id-types.response.ts  |  28 -
 .../src/billing/services/tax.service.ts       | 303 ---------
 34 files changed, 1243 insertions(+), 1093 deletions(-)
 delete mode 100644 libs/common/src/billing/abstractions/tax.service.abstraction.ts
 delete mode 100644 libs/common/src/billing/models/domain/country-list-item.ts
 delete mode 100644 libs/common/src/billing/models/request/preview-individual-invoice.request.ts
 delete mode 100644 libs/common/src/billing/models/request/preview-organization-invoice.request.ts
 delete mode 100644 libs/common/src/billing/models/response/preview-invoice.response.ts
 delete mode 100644 libs/common/src/billing/models/response/tax-id-types.response.ts
 delete mode 100644 libs/common/src/billing/services/tax.service.ts

diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
index 2f983944b70..f927a7ca613 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
@@ -58,7 +58,7 @@
         *ngIf="deprecateStripeSourcesAPI"
         [showAccountCredit]="false"
       ></app-payment-v2>
-      <app-tax-info [trialFlow]="true" (countryChanged)="changedCountry()"></app-tax-info>
+      <app-tax-info [trialFlow]="true" (onCountryChanged)="changedCountry()"></app-tax-info>
     </div>
     <div class="tw-flex tw-space-x-2">
       <button type="submit" buttonType="primary" bitButton [loading]="form.loading">
diff --git a/apps/web/src/app/billing/individual/premium/premium-v2.component.html b/apps/web/src/app/billing/individual/premium/premium-v2.component.html
index 7adc93fd962..eb93d8ef6a3 100644
--- a/apps/web/src/app/billing/individual/premium/premium-v2.component.html
+++ b/apps/web/src/app/billing/individual/premium/premium-v2.component.html
@@ -131,10 +131,11 @@
   <bit-section>
     <h3 bitTypography="h2">{{ "paymentInformation" | i18n }}</h3>
     <app-payment-v2 [showBankAccount]="false"></app-payment-v2>
-    <app-tax-info (taxInformationChanged)="onTaxInformationChanged()"></app-tax-info>
+    <app-tax-info></app-tax-info>
     <div class="tw-mb-4">
       <div class="tw-text-muted tw-text-sm tw-flex tw-flex-col">
         <span>{{ "planPrice" | i18n }}: {{ subtotal | currency: "USD $" }}</span>
+        <!-- TODO: Currently incorrect - https://bitwarden.atlassian.net/browse/PM-11525 -->
         <span>{{ "estimatedTax" | i18n }}: {{ estimatedTax | currency: "USD $" }}</span>
       </div>
     </div>
diff --git a/apps/web/src/app/billing/individual/premium/premium-v2.component.ts b/apps/web/src/app/billing/individual/premium/premium-v2.component.ts
index f723cf4f3c0..4f6d30530c2 100644
--- a/apps/web/src/app/billing/individual/premium/premium-v2.component.ts
+++ b/apps/web/src/app/billing/individual/premium/premium-v2.component.ts
@@ -3,13 +3,10 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { combineLatest, concatMap, from, Observable, of } from "rxjs";
-import { debounceTime } from "rxjs/operators";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -45,7 +42,6 @@ export class PremiumV2Component {
     FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader,
   );
 
-  protected estimatedTax: number = 0;
   protected readonly familyPlanMaxUserCount = 6;
   protected readonly premiumPrice = 10;
   protected readonly storageGBPrice = 4;
@@ -62,7 +58,6 @@ export class PremiumV2Component {
     private syncService: SyncService,
     private toastService: ToastService,
     private tokenService: TokenService,
-    private taxService: TaxServiceAbstraction,
   ) {
     this.isSelfHost = this.platformUtilsService.isSelfHost();
 
@@ -85,12 +80,6 @@ export class PremiumV2Component {
         }),
       )
       .subscribe();
-
-    this.addOnFormGroup.controls.additionalStorage.valueChanges
-      .pipe(debounceTime(1000), takeUntilDestroyed())
-      .subscribe(() => {
-        this.refreshSalesTax();
-      });
   }
 
   finalizeUpgrade = async () => {
@@ -167,6 +156,12 @@ export class PremiumV2Component {
     return this.storageGBPrice * this.addOnFormGroup.value.additionalStorage;
   }
 
+  protected get estimatedTax(): number {
+    return this.taxInfoComponent?.taxRate != null
+      ? (this.taxInfoComponent.taxRate / 100) * this.subtotal
+      : 0;
+  }
+
   protected get premiumURL(): string {
     return `${this.cloudWebVaultURL}/#/settings/subscription/premium`;
   }
@@ -182,37 +177,4 @@ export class PremiumV2Component {
   protected async onLicenseFileSelectedChanged(): Promise<void> {
     await this.postFinalizeUpgrade();
   }
-
-  private refreshSalesTax(): void {
-    if (!this.taxInfoComponent.country || !this.taxInfoComponent.postalCode) {
-      return;
-    }
-    const request: PreviewIndividualInvoiceRequest = {
-      passwordManager: {
-        additionalStorage: this.addOnFormGroup.value.additionalStorage,
-      },
-      taxInformation: {
-        postalCode: this.taxInfoComponent.postalCode,
-        country: this.taxInfoComponent.country,
-        taxId: this.taxInfoComponent.taxId,
-      },
-    };
-
-    this.taxService
-      .previewIndividualInvoice(request)
-      .then((invoice) => {
-        this.estimatedTax = invoice.taxAmount;
-      })
-      .catch((error) => {
-        this.toastService.showToast({
-          title: "",
-          variant: "error",
-          message: this.i18nService.t(error.message),
-        });
-      });
-  }
-
-  protected onTaxInformationChanged(): void {
-    this.refreshSalesTax();
-  }
 }
diff --git a/apps/web/src/app/billing/individual/premium/premium.component.html b/apps/web/src/app/billing/individual/premium/premium.component.html
index 12b6932d0f5..8b848b48dab 100644
--- a/apps/web/src/app/billing/individual/premium/premium.component.html
+++ b/apps/web/src/app/billing/individual/premium/premium.component.html
@@ -122,7 +122,7 @@
   <bit-section>
     <h3 bitTypography="h2">{{ "paymentInformation" | i18n }}</h3>
     <app-payment [hideBank]="true"></app-payment>
-    <app-tax-info (taxInformationChanged)="onTaxInformationChanged()" />
+    <app-tax-info></app-tax-info>
     <div id="price" class="tw-my-4">
       <div class="tw-text-muted tw-text-sm">
         {{ "planPrice" | i18n }}: {{ subtotal | currency: "USD $" }}
diff --git a/apps/web/src/app/billing/individual/premium/premium.component.ts b/apps/web/src/app/billing/individual/premium/premium.component.ts
index 740d1bd22c6..c45b6b882d4 100644
--- a/apps/web/src/app/billing/individual/premium/premium.component.ts
+++ b/apps/web/src/app/billing/individual/premium/premium.component.ts
@@ -1,15 +1,11 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
-import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 import { firstValueFrom, Observable } from "rxjs";
-import { debounceTime } from "rxjs/operators";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
@@ -41,9 +37,6 @@ export class PremiumComponent implements OnInit {
   protected addonForm = new FormGroup({
     additionalStorage: new FormControl(0, [Validators.max(99), Validators.min(0)]),
   });
-
-  private estimatedTax: number = 0;
-
   constructor(
     private apiService: ApiService,
     private i18nService: I18nService,
@@ -55,16 +48,9 @@ export class PremiumComponent implements OnInit {
     private environmentService: EnvironmentService,
     private billingAccountProfileStateService: BillingAccountProfileStateService,
     private toastService: ToastService,
-    private taxService: TaxServiceAbstraction,
   ) {
     this.selfHosted = platformUtilsService.isSelfHost();
     this.canAccessPremium$ = billingAccountProfileStateService.hasPremiumFromAnySource$;
-
-    this.addonForm.controls.additionalStorage.valueChanges
-      .pipe(debounceTime(1000), takeUntilDestroyed())
-      .subscribe(() => {
-        this.refreshSalesTax();
-      });
   }
   protected setSelectedFile(event: Event) {
     const fileInputEl = <HTMLInputElement>event.target;
@@ -166,43 +152,12 @@ export class PremiumComponent implements OnInit {
   }
 
   get taxCharges(): number {
-    return this.estimatedTax;
+    return this.taxInfoComponent != null && this.taxInfoComponent.taxRate != null
+      ? (this.taxInfoComponent.taxRate / 100) * this.subtotal
+      : 0;
   }
 
   get total(): number {
     return this.subtotal + this.taxCharges || 0;
   }
-
-  private refreshSalesTax(): void {
-    if (!this.taxInfoComponent.country || !this.taxInfoComponent.postalCode) {
-      return;
-    }
-    const request: PreviewIndividualInvoiceRequest = {
-      passwordManager: {
-        additionalStorage: this.addonForm.value.additionalStorage,
-      },
-      taxInformation: {
-        postalCode: this.taxInfoComponent.postalCode,
-        country: this.taxInfoComponent.country,
-        taxId: this.taxInfoComponent.taxId,
-      },
-    };
-
-    this.taxService
-      .previewIndividualInvoice(request)
-      .then((invoice) => {
-        this.estimatedTax = invoice.taxAmount;
-      })
-      .catch((error) => {
-        this.toastService.showToast({
-          title: "",
-          variant: "error",
-          message: this.i18nService.t(error.message),
-        });
-      });
-  }
-
-  protected onTaxInformationChanged(): void {
-    this.refreshSalesTax();
-  }
 }
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
index 80a6d73f566..878672a1fb9 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html
@@ -344,14 +344,25 @@
           </span>
           <a></a>
         </p>
-        <ng-container *ngIf="canUpdatePaymentInformation()">
-          <app-payment *ngIf="!deprecateStripeSourcesAPI" [hideCredit]="true" />
-          <app-payment-v2 *ngIf="deprecateStripeSourcesAPI" [showAccountCredit]="false" />
-          <app-manage-tax-information
-            [startWith]="taxInformation"
-            (taxInformationChanged)="taxInformationChanged($event)"
-          ></app-manage-tax-information>
-        </ng-container>
+        <app-payment
+          *ngIf="
+            (upgradeRequiresPaymentMethod || showPayment || isPaymentSourceEmpty()) &&
+            !deprecateStripeSourcesAPI
+          "
+          [hideCredit]="true"
+        ></app-payment>
+        <app-payment-v2
+          *ngIf="
+            (upgradeRequiresPaymentMethod || showPayment || isPaymentSourceEmpty()) &&
+            deprecateStripeSourcesAPI
+          "
+          [showAccountCredit]="false"
+        >
+        </app-payment-v2>
+        <app-tax-info
+          *ngIf="showPayment || upgradeRequiresPaymentMethod || isPaymentSourceEmpty()"
+          (onCountryChanged)="changedCountry()"
+        ></app-tax-info>
         <div id="price" class="tw-mt-4">
           <p class="tw-text-lg tw-mb-1">
             <span class="tw-font-semibold"
@@ -936,20 +947,6 @@
             </p>
           </bit-hint>
         </div>
-        <div *ngIf="totalOpened" class="row tw-mt-4">
-          <bit-hint class="col-6">
-            <p
-              class="tw-flex tw-justify-between tw-border-0 tw-border-solid tw-border-t tw-border-secondary-300 tw-pt-2 tw-mb-0"
-            >
-              <span class="tw-font-semibold">
-                {{ "estimatedTax" | i18n }}
-              </span>
-              <span>
-                {{ estimatedTax | currency: "USD" : "$" }}
-              </span>
-            </p>
-          </bit-hint>
-        </div>
         <div *ngIf="totalOpened" id="price" class="row tw-mt-4">
           <bit-hint class="col-6">
             <p
diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
index 6909de9e9c4..5a6ac8c896a 100644
--- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
+++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts
@@ -13,7 +13,6 @@ import { FormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
 
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -23,17 +22,13 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request";
 import { OrganizationUpgradeRequest } from "@bitwarden/common/admin-console/models/request/organization-upgrade.request";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import {
   PaymentMethodType,
   PlanInterval,
   PlanType,
   ProductTierType,
 } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
 import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
 import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
@@ -49,6 +44,7 @@ import { KeyService } from "@bitwarden/key-management";
 
 import { PaymentV2Component } from "../shared/payment/payment-v2.component";
 import { PaymentComponent } from "../shared/payment/payment.component";
+import { TaxInfoComponent } from "../shared/tax-info.component";
 
 type ChangePlanDialogParams = {
   organizationId: string;
@@ -91,12 +87,13 @@ interface OnSuccessArgs {
 export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
   @ViewChild(PaymentV2Component) paymentV2Component: PaymentV2Component;
-  @ViewChild(ManageTaxInformationComponent) taxComponent: ManageTaxInformationComponent;
+  @ViewChild(TaxInfoComponent) taxComponent: TaxInfoComponent;
 
   @Input() acceptingSponsorship = false;
   @Input() organizationId: string;
   @Input() showFree = false;
   @Input() showCancel = false;
+  selectedFile: File;
 
   @Input()
   get productTier(): ProductTierType {
@@ -108,7 +105,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     this.formGroup?.controls?.productTier?.setValue(product);
   }
 
-  protected estimatedTax: number = 0;
   private _productTier = ProductTierType.Free;
 
   @Input()
@@ -175,8 +171,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
   private destroy$ = new Subject<void>();
 
-  protected taxInformation: TaxInformation;
-
   constructor(
     @Inject(DIALOG_DATA) private dialogParams: ChangePlanDialogParams,
     private dialogRef: DialogRef<ChangePlanDialogResultType>,
@@ -193,7 +187,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     private organizationApiService: OrganizationApiServiceAbstraction,
     private configService: ConfigService,
     private billingApiService: BillingApiServiceAbstraction,
-    private taxService: TaxServiceAbstraction,
   ) {}
 
   async ngOnInit(): Promise<void> {
@@ -272,11 +265,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
 
     this.setInitialPlanSelection();
     this.loading = false;
-
-    const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
-    this.taxInformation = TaxInformation.from(taxInfo);
-
-    this.refreshSalesTax();
   }
 
   setInitialPlanSelection() {
@@ -413,12 +401,6 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
     this.selectedPlan = plan;
     this.formGroup.patchValue({ productTier: plan.productTier });
-
-    try {
-      this.refreshSalesTax();
-    } catch {
-      this.estimatedTax = 0;
-    }
   }
 
   ngOnDestroy() {
@@ -584,6 +566,12 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     );
   }
 
+  get taxCharges() {
+    return this.taxComponent != null && this.taxComponent.taxRate != null
+      ? (this.taxComponent.taxRate / 100) * this.passwordManagerSubtotal
+      : 0;
+  }
+
   get passwordManagerSeats() {
     if (this.selectedPlan.productTier === ProductTierType.Families) {
       return this.selectedPlan.PasswordManager.baseSeats;
@@ -595,15 +583,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     if (this.organization.useSecretsManager) {
       return (
         this.passwordManagerSubtotal +
-        this.additionalStorageTotal(this.selectedPlan) +
-        this.secretsManagerSubtotal +
-        this.estimatedTax
+          this.additionalStorageTotal(this.selectedPlan) +
+          this.secretsManagerSubtotal +
+          this.taxCharges || 0
       );
     }
     return (
       this.passwordManagerSubtotal +
-      this.additionalStorageTotal(this.selectedPlan) +
-      this.estimatedTax
+        this.additionalStorageTotal(this.selectedPlan) +
+        this.taxCharges || 0
     );
   }
 
@@ -656,8 +644,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   }
 
   changedCountry() {
-    if (this.deprecateStripeSourcesAPI && this.paymentV2Component) {
-      this.paymentV2Component.showBankAccount = this.taxInformation.country === "US";
+    if (this.deprecateStripeSourcesAPI && this.paymentV2Component && this.taxComponent) {
+      this.paymentV2Component.showBankAccount = this.taxComponent.country === "US";
 
       if (
         !this.paymentV2Component.showBankAccount &&
@@ -665,8 +653,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       ) {
         this.paymentV2Component.select(PaymentMethodType.Card);
       }
-    } else if (this.paymentComponent && this.taxInformation) {
-      this.paymentComponent!.hideBank = this.taxInformation.country !== "US";
+    } else if (this.paymentComponent && this.taxComponent) {
+      this.paymentComponent!.hideBank = this.taxComponent?.taxFormGroup?.value.country !== "US";
       // Bank Account payments are only available for US customers
       if (
         this.paymentComponent.hideBank &&
@@ -678,14 +666,9 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
     }
   }
 
-  protected taxInformationChanged(event: TaxInformation): void {
-    this.taxInformation = event;
-    this.changedCountry();
-    this.refreshSalesTax();
-  }
-
   submit = async () => {
-    if (!this.taxComponent?.validate()) {
+    if (!this.taxComponent?.taxFormGroup.valid && this.taxComponent?.taxFormGroup.touched) {
+      this.taxComponent?.taxFormGroup.markAllAsTouched();
       return;
     }
 
@@ -739,8 +722,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
       this.formGroup.controls.premiumAccessAddon.value;
     request.planType = this.selectedPlan.type;
     if (this.showPayment) {
-      request.billingAddressCountry = this.taxInformation.country;
-      request.billingAddressPostalCode = this.taxInformation.postalCode;
+      request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
+      request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
     }
 
     // Secrets Manager
@@ -751,9 +734,15 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
         const tokenizedPaymentSource = await this.paymentV2Component.tokenize();
         const updatePaymentMethodRequest = new UpdatePaymentMethodRequest();
         updatePaymentMethodRequest.paymentSource = tokenizedPaymentSource;
-        updatePaymentMethodRequest.taxInformation = ExpandedTaxInfoUpdateRequest.From(
-          this.taxInformation,
-        );
+        updatePaymentMethodRequest.taxInformation = {
+          country: this.taxComponent.country,
+          postalCode: this.taxComponent.postalCode,
+          taxId: this.taxComponent.taxId,
+          line1: this.taxComponent.line1,
+          line2: this.taxComponent.line2,
+          city: this.taxComponent.city,
+          state: this.taxComponent.state,
+        };
 
         await this.billingApiService.updateOrganizationPaymentMethod(
           this.organizationId,
@@ -764,8 +753,8 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
         const paymentRequest = new PaymentRequest();
         paymentRequest.paymentToken = tokenResult[0];
         paymentRequest.paymentMethodType = tokenResult[1];
-        paymentRequest.country = this.taxInformation.country;
-        paymentRequest.postalCode = this.taxInformation.postalCode;
+        paymentRequest.country = this.taxComponent.taxFormGroup?.value.country;
+        paymentRequest.postalCode = this.taxComponent.taxFormGroup?.value.postalCode;
         await this.organizationApiService.updatePayment(this.organizationId, paymentRequest);
       }
     }
@@ -954,48 +943,4 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy {
   manageSelectableProduct(index: number) {
     return index;
   }
-
-  private refreshSalesTax(): void {
-    if (!this.taxInformation.country || !this.taxInformation.postalCode) {
-      return;
-    }
-
-    const request: PreviewOrganizationInvoiceRequest = {
-      organizationId: this.organizationId,
-      passwordManager: {
-        additionalStorage: 0,
-        plan: this.selectedPlan?.type,
-        seats: this.sub.seats,
-      },
-      taxInformation: {
-        postalCode: this.taxInformation.postalCode,
-        country: this.taxInformation.country,
-        taxId: this.taxInformation.taxId,
-      },
-    };
-
-    if (this.organization.useSecretsManager) {
-      request.secretsManager = {
-        seats: this.sub.smSeats,
-        additionalMachineAccounts: this.sub.smServiceAccounts,
-      };
-    }
-
-    this.taxService
-      .previewOrganizationInvoice(request)
-      .then((invoice) => {
-        this.estimatedTax = invoice.taxAmount;
-      })
-      .catch((error) => {
-        this.toastService.showToast({
-          title: "",
-          variant: "error",
-          message: this.i18nService.t(error.message),
-        });
-      });
-  }
-
-  protected canUpdatePaymentInformation(): boolean {
-    return this.upgradeRequiresPaymentMethod || this.showPayment || this.isPaymentSourceEmpty();
-  }
 }
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
index 3bb25cf1524..e1b74abea71 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -335,7 +335,7 @@
                   >{{ "additionalUsers" | i18n }}:</span
                 >
                 <span *ngIf="!selectablePlan.PasswordManager.baseSeats">{{ "users" | i18n }}:</span>
-                {{ formGroup.controls.additionalSeats.value || 0 }} &times;
+                {{ formGroup.controls["additionalSeats"].value || 0 }} &times;
                 {{
                   (selectablePlan.isAnnual
                     ? selectablePlan.PasswordManager.seatPrice / 12
@@ -355,7 +355,7 @@
                 *ngIf="selectablePlan.PasswordManager.hasAdditionalStorageOption"
               >
                 {{ "additionalStorageGb" | i18n }}:
-                {{ formGroup.controls.additionalStorage.value || 0 }} &times;
+                {{ formGroup.controls["additionalStorage"].value || 0 }} &times;
                 {{
                   (selectablePlan.isAnnual
                     ? selectablePlan.PasswordManager.additionalStoragePricePerGb / 12
@@ -388,7 +388,7 @@
                   >{{ "additionalUsers" | i18n }}:</span
                 >
                 <span *ngIf="!selectablePlan.PasswordManager.baseSeats">{{ "users" | i18n }}:</span>
-                {{ formGroup.controls.additionalSeats.value || 0 }} &times;
+                {{ formGroup.controls["additionalSeats"].value || 0 }} &times;
                 {{ selectablePlan.PasswordManager.seatPrice | currency: "$" }}
                 {{ "monthAbbr" | i18n }} =
                 {{
@@ -403,7 +403,7 @@
                 *ngIf="selectablePlan.PasswordManager.hasAdditionalStorageOption"
               >
                 {{ "additionalStorageGb" | i18n }}:
-                {{ formGroup.controls.additionalStorage.value || 0 }} &times;
+                {{ formGroup.controls["additionalStorage"].value || 0 }} &times;
                 {{ selectablePlan.PasswordManager.additionalStoragePricePerGb | currency: "$" }}
                 {{ "monthAbbr" | i18n }} =
                 {{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "month" | i18n }}
@@ -440,11 +440,7 @@
     <app-payment-v2
       *ngIf="deprecateStripeSourcesAPI && (createOrganization || upgradeRequiresPaymentMethod)"
     ></app-payment-v2>
-    <app-manage-tax-information
-      class="tw-my-4"
-      [startWith]="taxInformation"
-      (taxInformationChanged)="onTaxInformationChanged($event)"
-    />
+    <app-tax-info (onCountryChanged)="changedCountry()"></app-tax-info>
     <div id="price" class="tw-my-4">
       <div class="tw-text-muted tw-text-base">
         {{ "passwordManagerPlanPrice" | i18n }}: {{ passwordManagerSubtotal | currency: "USD $" }}
@@ -454,7 +450,7 @@
           <br />
         </span>
         <ng-container>
-          {{ "estimatedTax" | i18n }}: {{ estimatedTax | currency: "USD $" }}
+          {{ "estimatedTax" | i18n }}: {{ taxCharges | currency: "USD $" }}
         </ng-container>
       </div>
       <hr class="tw-my-1 tw-grid tw-grid-cols-3 tw-ml-0" />
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts
index c8290f774da..88b5685431f 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -10,9 +10,7 @@ import {
 import { FormBuilder, Validators } from "@angular/forms";
 import { Router } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
-import { debounceTime } from "rxjs/operators";
 
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
@@ -26,12 +24,9 @@ import { OrganizationUpgradeRequest } from "@bitwarden/common/admin-console/mode
 import { ProviderOrganizationCreateRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-organization-create.request";
 import { ProviderResponse } from "@bitwarden/common/admin-console/models/response/provider/provider.response";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import { PaymentMethodType, PlanType, ProductTierType } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
 import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
 import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
 import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
@@ -53,6 +48,7 @@ import { OrganizationCreateModule } from "../../admin-console/organizations/crea
 import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared";
 import { PaymentV2Component } from "../shared/payment/payment-v2.component";
 import { PaymentComponent } from "../shared/payment/payment.component";
+import { TaxInfoComponent } from "../shared/tax-info.component";
 
 interface OnSuccessArgs {
   organizationId: string;
@@ -74,14 +70,13 @@ const Allowed2020PlansForLegacyProviders = [
 export class OrganizationPlansComponent implements OnInit, OnDestroy {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;
   @ViewChild(PaymentV2Component) paymentV2Component: PaymentV2Component;
-  @ViewChild(ManageTaxInformationComponent) taxComponent: ManageTaxInformationComponent;
+  @ViewChild(TaxInfoComponent) taxComponent: TaxInfoComponent;
 
-  @Input() organizationId?: string;
+  @Input() organizationId: string;
   @Input() showFree = true;
   @Input() showCancel = false;
   @Input() acceptingSponsorship = false;
   @Input() currentPlan: PlanResponse;
-
   selectedFile: File;
 
   @Input()
@@ -96,8 +91,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
   private _productTier = ProductTierType.Free;
 
-  protected taxInformation: TaxInformation;
-
   @Input()
   get plan(): PlanType {
     return this._plan;
@@ -154,10 +147,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
   billing: BillingResponse;
   provider: ProviderResponse;
 
-  protected estimatedTax: number = 0;
-  protected total: number = 0;
-
-  private destroy$: Subject<void> = new Subject<void>();
+  private destroy$ = new Subject<void>();
 
   constructor(
     private apiService: ApiService,
@@ -176,7 +166,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     private toastService: ToastService,
     private configService: ConfigService,
     private billingApiService: BillingApiServiceAbstraction,
-    private taxService: TaxServiceAbstraction,
   ) {
     this.selfHosted = this.platformUtilsService.isSelfHost();
   }
@@ -190,9 +179,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       this.organization = await this.organizationService.get(this.organizationId);
       this.billing = await this.organizationApiService.getBilling(this.organizationId);
       this.sub = await this.organizationApiService.getSubscription(this.organizationId);
-      this.taxInformation = await this.organizationApiService.getTaxInfo(this.organizationId);
-    } else {
-      this.taxInformation = await this.apiService.getTaxInfo();
     }
 
     if (!this.selfHosted) {
@@ -253,16 +239,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     }
 
     this.loading = false;
-
-    this.formGroup.valueChanges.pipe(debounceTime(1000), takeUntil(this.destroy$)).subscribe(() => {
-      this.refreshSalesTax();
-    });
-
-    this.secretsManagerForm.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        this.refreshSalesTax();
-      });
   }
 
   ngOnDestroy() {
@@ -460,6 +436,17 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     return this.selectedPlan.trialPeriodDays != null;
   }
 
+  get taxCharges() {
+    return this.taxComponent != null && this.taxComponent.taxRate != null
+      ? (this.taxComponent.taxRate / 100) *
+          (this.passwordManagerSubtotal + this.secretsManagerSubtotal)
+      : 0;
+  }
+
+  get total() {
+    return this.passwordManagerSubtotal + this.secretsManagerSubtotal + this.taxCharges || 0;
+  }
+
   get paymentDesc() {
     if (this.acceptingSponsorship) {
       return this.i18nService.t("paymentSponsored");
@@ -565,9 +552,9 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     this.changedProduct();
   }
 
-  protected changedCountry(): void {
+  changedCountry() {
     if (this.deprecateStripeSourcesAPI) {
-      this.paymentV2Component.showBankAccount = this.taxInformation?.country === "US";
+      this.paymentV2Component.showBankAccount = this.taxComponent.country === "US";
       if (
         !this.paymentV2Component.showBankAccount &&
         this.paymentV2Component.selected === PaymentMethodType.BankAccount
@@ -575,7 +562,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         this.paymentV2Component.select(PaymentMethodType.Card);
       }
     } else {
-      this.paymentComponent.hideBank = this.taxInformation?.country !== "US";
+      this.paymentComponent.hideBank = this.taxComponent.taxFormGroup?.value.country !== "US";
       if (
         this.paymentComponent.hideBank &&
         this.paymentComponent.method === PaymentMethodType.BankAccount
@@ -586,31 +573,28 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     }
   }
 
-  protected onTaxInformationChanged(event: TaxInformation): void {
-    this.taxInformation = event;
-    this.changedCountry();
-    this.refreshSalesTax();
-  }
-
-  protected cancel(): void {
+  cancel() {
     this.onCanceled.emit();
   }
 
-  protected setSelectedFile(event: Event): void {
+  setSelectedFile(event: Event) {
     const fileInputEl = <HTMLInputElement>event.target;
     this.selectedFile = fileInputEl.files.length > 0 ? fileInputEl.files[0] : null;
   }
 
   submit = async () => {
-    if (this.taxComponent && !this.taxComponent.validate()) {
-      return;
+    if (this.taxComponent) {
+      if (!this.taxComponent?.taxFormGroup.valid) {
+        this.taxComponent?.taxFormGroup.markAllAsTouched();
+        return;
+      }
     }
 
     if (this.singleOrgPolicyBlock) {
       return;
     }
     const doSubmit = async (): Promise<string> => {
-      let orgId: string;
+      let orgId: string = null;
       if (this.createOrganization) {
         const orgKey = await this.keyService.makeOrgKey<OrgKey>();
         const key = orgKey[0].encryptedString;
@@ -621,9 +605,11 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         const collectionCt = collection.encryptedString;
         const orgKeys = await this.keyService.makeKeyPair(orgKey[1]);
 
-        orgId = this.selfHosted
-          ? await this.createSelfHosted(key, collectionCt, orgKeys)
-          : await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]);
+        if (this.selfHosted) {
+          orgId = await this.createSelfHosted(key, collectionCt, orgKeys);
+        } else {
+          orgId = await this.createCloudHosted(key, collectionCt, orgKeys, orgKey[1]);
+        }
 
         this.toastService.showToast({
           variant: "success",
@@ -631,7 +617,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
           message: this.i18nService.t("organizationReadyToGo"),
         });
       } else {
-        orgId = await this.updateOrganization();
+        orgId = await this.updateOrganization(orgId);
         this.toastService.showToast({
           variant: "success",
           title: null,
@@ -665,53 +651,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     this.messagingService.send("organizationCreated", { organizationId });
   };
 
-  private refreshSalesTax(): void {
-    if (this.formGroup.controls.plan.value == PlanType.Free) {
-      this.estimatedTax = 0;
-      return;
-    }
-
-    if (!this.taxComponent.validate()) {
-      return;
-    }
-
-    const request: PreviewOrganizationInvoiceRequest = {
-      organizationId: this.organizationId,
-      passwordManager: {
-        additionalStorage: this.formGroup.controls.additionalStorage.value,
-        plan: this.formGroup.controls.plan.value,
-        seats: this.formGroup.controls.additionalSeats.value,
-      },
-      taxInformation: {
-        postalCode: this.taxInformation.postalCode,
-        country: this.taxInformation.country,
-        taxId: this.taxInformation.taxId,
-      },
-    };
-
-    if (this.secretsManagerForm.controls.enabled.value === true) {
-      request.secretsManager = {
-        seats: this.secretsManagerForm.controls.userSeats.value,
-        additionalMachineAccounts: this.secretsManagerForm.controls.additionalServiceAccounts.value,
-      };
-    }
-
-    this.taxService
-      .previewOrganizationInvoice(request)
-      .then((invoice) => {
-        this.estimatedTax = invoice.taxAmount;
-        this.total = invoice.totalAmount;
-      })
-      .catch((error) => {
-        this.toastService.showToast({
-          title: "",
-          variant: "error",
-          message: this.i18nService.t(error.message),
-        });
-      });
-  }
-
-  private async updateOrganization() {
+  private async updateOrganization(orgId: string) {
     const request = new OrganizationUpgradeRequest();
     request.additionalSeats = this.formGroup.controls.additionalSeats.value;
     request.additionalStorageGb = this.formGroup.controls.additionalStorage.value;
@@ -719,8 +659,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
       this.formGroup.controls.premiumAccessAddon.value;
     request.planType = this.selectedPlan.type;
-    request.billingAddressCountry = this.taxInformation?.country;
-    request.billingAddressPostalCode = this.taxInformation?.postalCode;
+    request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
+    request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
 
     // Secrets Manager
     this.buildSecretsManagerRequest(request);
@@ -729,9 +669,10 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
       if (this.deprecateStripeSourcesAPI) {
         const updatePaymentMethodRequest = new UpdatePaymentMethodRequest();
         updatePaymentMethodRequest.paymentSource = await this.paymentV2Component.tokenize();
-        updatePaymentMethodRequest.taxInformation = ExpandedTaxInfoUpdateRequest.From(
-          this.taxInformation,
-        );
+        const expandedTaxInfoUpdateRequest = new ExpandedTaxInfoUpdateRequest();
+        expandedTaxInfoUpdateRequest.country = this.taxComponent.country;
+        expandedTaxInfoUpdateRequest.postalCode = this.taxComponent.postalCode;
+        updatePaymentMethodRequest.taxInformation = expandedTaxInfoUpdateRequest;
         await this.billingApiService.updateOrganizationPaymentMethod(
           this.organizationId,
           updatePaymentMethodRequest,
@@ -741,8 +682,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         const paymentRequest = new PaymentRequest();
         paymentRequest.paymentToken = paymentToken;
         paymentRequest.paymentMethodType = paymentMethodType;
-        paymentRequest.country = this.taxInformation?.country;
-        paymentRequest.postalCode = this.taxInformation?.postalCode;
+        paymentRequest.country = this.taxComponent.taxFormGroup?.value.country;
+        paymentRequest.postalCode = this.taxComponent.taxFormGroup?.value.postalCode;
         await this.organizationApiService.updatePayment(this.organizationId, paymentRequest);
       }
     }
@@ -766,7 +707,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     collectionCt: string,
     orgKeys: [string, EncString],
     orgKey: SymmetricCryptoKey,
-  ): Promise<string> {
+  ) {
     const request = new OrganizationCreateRequest();
     request.key = key;
     request.collectionName = collectionCt;
@@ -795,13 +736,15 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
         this.selectedPlan.PasswordManager.hasPremiumAccessOption &&
         this.formGroup.controls.premiumAccessAddon.value;
       request.planType = this.selectedPlan.type;
-      request.billingAddressPostalCode = this.taxInformation?.postalCode;
-      request.billingAddressCountry = this.taxInformation?.country;
-      request.taxIdNumber = this.taxInformation?.taxId;
-      request.billingAddressLine1 = this.taxInformation?.line1;
-      request.billingAddressLine2 = this.taxInformation?.line2;
-      request.billingAddressCity = this.taxInformation?.city;
-      request.billingAddressState = this.taxInformation?.state;
+      request.billingAddressPostalCode = this.taxComponent.taxFormGroup?.value.postalCode;
+      request.billingAddressCountry = this.taxComponent.taxFormGroup?.value.country;
+      if (this.taxComponent.taxFormGroup?.value.includeTaxId) {
+        request.taxIdNumber = this.taxComponent.taxFormGroup?.value.taxId;
+        request.billingAddressLine1 = this.taxComponent.taxFormGroup?.value.line1;
+        request.billingAddressLine2 = this.taxComponent.taxFormGroup?.value.line2;
+        request.billingAddressCity = this.taxComponent.taxFormGroup?.value.city;
+        request.billingAddressState = this.taxComponent.taxFormGroup?.value.state;
+      }
     }
 
     // Secrets Manager
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
index 57844805f55..7a6e8558bae 100644
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
@@ -63,5 +63,20 @@
         {{ "paymentChargedWithUnpaidSubscription" | i18n }}
       </p>
     </bit-section>
+    <!-- Tax Information -->
+    <bit-section>
+      <h2 bitTypography="h2">{{ "taxInformation" | i18n }}</h2>
+      <p bitTypography="body1">{{ "taxInformationDesc" | i18n }}</p>
+      <app-tax-info></app-tax-info>
+      <button
+        type="button"
+        bitButton
+        bitFormButton
+        buttonType="primary"
+        [bitAction]="updateTaxInformation"
+      >
+        {{ "save" | i18n }}
+      </button>
+    </bit-section>
   </ng-container>
 </bit-container>
diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
index a6f04ea6862..e2178e7c02c 100644
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts
@@ -9,6 +9,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
+import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { VerifyBankAccountRequest } from "@bitwarden/common/billing/models/request/verify-bank-account.request";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { PaymentSourceResponse } from "@bitwarden/common/billing/models/response/payment-source.response";
@@ -180,6 +181,32 @@ export class OrganizationPaymentMethodComponent implements OnDestroy {
     }
   };
 
+  protected updateTaxInformation = async (): Promise<void> => {
+    this.taxInfoComponent.taxFormGroup.updateValueAndValidity();
+    this.taxInfoComponent.taxFormGroup.markAllAsTouched();
+
+    if (this.taxInfoComponent.taxFormGroup.invalid) {
+      return;
+    }
+
+    const request = new ExpandedTaxInfoUpdateRequest();
+    request.country = this.taxInfoComponent.country;
+    request.postalCode = this.taxInfoComponent.postalCode;
+    request.taxId = this.taxInfoComponent.taxId;
+    request.line1 = this.taxInfoComponent.line1;
+    request.line2 = this.taxInfoComponent.line2;
+    request.city = this.taxInfoComponent.city;
+    request.state = this.taxInfoComponent.state;
+
+    await this.billingApiService.updateOrganizationTaxInformation(this.organizationId, request);
+
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("taxInfoUpdated"),
+    });
+  };
+
   protected verifyBankAccount = async (request: VerifyBankAccountRequest): Promise<void> => {
     await this.billingApiService.verifyOrganizationBankAccount(this.organizationId, request);
     this.toastService.showToast({
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
index 1767fb485d0..e41d3d961cd 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.html
@@ -5,11 +5,7 @@
       [showBankAccount]="!!organizationId"
       [initialPaymentMethod]="initialPaymentMethod"
     ></app-payment-v2>
-    <app-manage-tax-information
-      *ngIf="taxInformation"
-      [startWith]="taxInformation"
-      (taxInformationChanged)="taxInformationChanged($event)"
-    />
+    <app-tax-info (onCountryChanged)="onCountryChanged()"></app-tax-info>
   </ng-container>
   <ng-container bitDialogFooter>
     <button type="submit" bitButton bitFormButton buttonType="primary" [bitAction]="submit">
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.ts b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.ts
index 3ee3c16b235..ccf71dc7f88 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.ts
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog-v2.component.ts
@@ -1,19 +1,15 @@
 import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
-import { forwardRef, Component, Inject, ViewChild, OnInit } from "@angular/core";
+import { forwardRef, Component, Inject, ViewChild } from "@angular/core";
 
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
-import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
 import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
 import { UpdatePaymentMethodRequest } from "@bitwarden/common/billing/models/request/update-payment-method.request";
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
+import { TaxInfoComponent } from "../";
 import { PaymentV2Component } from "../payment/payment-v2.component";
 
 export interface AdjustPaymentDialogV2Params {
@@ -29,10 +25,9 @@ export enum AdjustPaymentDialogV2ResultType {
 @Component({
   templateUrl: "./adjust-payment-dialog-v2.component.html",
 })
-export class AdjustPaymentDialogV2Component implements OnInit {
+export class AdjustPaymentDialogV2Component {
   @ViewChild(PaymentV2Component) paymentComponent: PaymentV2Component;
-  @ViewChild(forwardRef(() => ManageTaxInformationComponent))
-  taxInfoComponent: ManageTaxInformationComponent;
+  @ViewChild(forwardRef(() => TaxInfoComponent)) taxInfoComponent: TaxInfoComponent;
 
   protected readonly PaymentMethodType = PaymentMethodType;
   protected readonly ResultType = AdjustPaymentDialogV2ResultType;
@@ -41,12 +36,9 @@ export class AdjustPaymentDialogV2Component implements OnInit {
   protected initialPaymentMethod: PaymentMethodType;
   protected organizationId?: string;
 
-  protected taxInformation: TaxInformation;
-
   constructor(
     private apiService: ApiService,
     private billingApiService: BillingApiServiceAbstraction,
-    private organizationApiService: OrganizationApiServiceAbstraction,
     @Inject(DIALOG_DATA) protected dialogParams: AdjustPaymentDialogV2Params,
     private dialogRef: DialogRef<AdjustPaymentDialogV2ResultType>,
     private i18nService: I18nService,
@@ -58,31 +50,8 @@ export class AdjustPaymentDialogV2Component implements OnInit {
     this.organizationId = this.dialogParams.organizationId;
   }
 
-  ngOnInit(): void {
-    if (this.organizationId) {
-      this.organizationApiService
-        .getTaxInfo(this.organizationId)
-        .then((response: TaxInfoResponse) => {
-          this.taxInformation = TaxInformation.from(response);
-        })
-        .catch(() => {
-          this.taxInformation = new TaxInformation();
-        });
-    } else {
-      this.apiService
-        .getTaxInfo()
-        .then((response: TaxInfoResponse) => {
-          this.taxInformation = TaxInformation.from(response);
-        })
-        .catch(() => {
-          this.taxInformation = new TaxInformation();
-        });
-    }
-  }
-
-  taxInformationChanged(event: TaxInformation) {
-    this.taxInformation = event;
-    if (event.country === "US") {
+  onCountryChanged = () => {
+    if (this.taxInfoComponent.taxInfo.country === "US") {
       this.paymentComponent.showBankAccount = !!this.organizationId;
     } else {
       this.paymentComponent.showBankAccount = false;
@@ -90,10 +59,12 @@ export class AdjustPaymentDialogV2Component implements OnInit {
         this.paymentComponent.select(PaymentMethodType.Card);
       }
     }
-  }
+  };
 
   submit = async (): Promise<void> => {
-    if (!this.taxInfoComponent.validate()) {
+    this.taxInfoComponent.taxFormGroup.updateValueAndValidity();
+    this.taxInfoComponent.taxFormGroup.markAllAsTouched();
+    if (this.taxInfoComponent.taxFormGroup.invalid) {
       return;
     }
 
@@ -117,7 +88,15 @@ export class AdjustPaymentDialogV2Component implements OnInit {
 
     const request = new UpdatePaymentMethodRequest();
     request.paymentSource = paymentSource;
-    request.taxInformation = ExpandedTaxInfoUpdateRequest.From(this.taxInformation);
+    request.taxInformation = {
+      country: this.taxInfoComponent.country,
+      postalCode: this.taxInfoComponent.postalCode,
+      taxId: this.taxInfoComponent.taxId,
+      line1: this.taxInfoComponent.line1,
+      line2: this.taxInfoComponent.line2,
+      city: this.taxInfoComponent.city,
+      state: this.taxInfoComponent.state,
+    };
 
     await this.billingApiService.updateOrganizationPaymentMethod(this.organizationId, request);
   };
@@ -128,14 +107,8 @@ export class AdjustPaymentDialogV2Component implements OnInit {
     const request = new PaymentRequest();
     request.paymentMethodType = type;
     request.paymentToken = token;
-    request.country = this.taxInformation.country;
-    request.postalCode = this.taxInformation.postalCode;
-    request.taxId = this.taxInformation.taxId;
-    request.state = this.taxInformation.state;
-    request.line1 = this.taxInformation.line1;
-    request.line2 = this.taxInformation.line2;
-    request.city = this.taxInformation.city;
-    request.state = this.taxInformation.state;
+    request.country = this.taxInfoComponent.country;
+    request.postalCode = this.taxInfoComponent.postalCode;
     await this.apiService.postAccountPayment(request);
   };
 
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
index 9979fbd6907..0f92b023b15 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.html
@@ -5,11 +5,7 @@
   >
     <ng-container bitDialogContent>
       <app-payment [hideBank]="!organizationId" [hideCredit]="true"></app-payment>
-      <app-manage-tax-information
-        *ngIf="taxInformation"
-        [startWith]="taxInformation"
-        (taxInformationChanged)="taxInformationChanged($event)"
-      />
+      <app-tax-info (onCountryChanged)="changeCountry()"></app-tax-info>
     </ng-container>
     <ng-container bitDialogFooter>
       <button type="submit" bitButton bitFormButton buttonType="primary">
diff --git a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts
index c761f45241a..0c8e93531ee 100644
--- a/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts
+++ b/apps/web/src/app/billing/shared/adjust-payment-dialog/adjust-payment-dialog.component.ts
@@ -1,19 +1,17 @@
 import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
-import { Component, Inject, OnInit, ViewChild } from "@angular/core";
+import { Component, Inject, ViewChild } from "@angular/core";
 import { FormGroup } from "@angular/forms";
 
-import { ManageTaxInformationComponent } from "@bitwarden/angular/billing/components";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
-import { TaxInformation } from "@bitwarden/common/billing/models/domain";
 import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment.request";
-import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
 import { PaymentComponent } from "../payment/payment.component";
+import { TaxInfoComponent } from "../tax-info.component";
 
 export interface AdjustPaymentDialogData {
   organizationId: string;
@@ -28,9 +26,9 @@ export enum AdjustPaymentDialogResult {
 @Component({
   templateUrl: "adjust-payment-dialog.component.html",
 })
-export class AdjustPaymentDialogComponent implements OnInit {
+export class AdjustPaymentDialogComponent {
   @ViewChild(PaymentComponent, { static: true }) paymentComponent: PaymentComponent;
-  @ViewChild(ManageTaxInformationComponent) taxInfoComponent: ManageTaxInformationComponent;
+  @ViewChild(TaxInfoComponent, { static: true }) taxInfoComponent: TaxInfoComponent;
 
   organizationId: string;
   currentType: PaymentMethodType;
@@ -39,8 +37,6 @@ export class AdjustPaymentDialogComponent implements OnInit {
   protected DialogResult = AdjustPaymentDialogResult;
   protected formGroup = new FormGroup({});
 
-  protected taxInformation: TaxInformation;
-
   constructor(
     private dialogRef: DialogRef,
     @Inject(DIALOG_DATA) protected data: AdjustPaymentDialogData,
@@ -54,48 +50,26 @@ export class AdjustPaymentDialogComponent implements OnInit {
     this.currentType = data.currentType;
   }
 
-  ngOnInit(): void {
-    if (this.organizationId) {
-      this.organizationApiService
-        .getTaxInfo(this.organizationId)
-        .then((response: TaxInfoResponse) => {
-          this.taxInformation = TaxInformation.from(response);
-        })
-        .catch(() => {
-          this.taxInformation = new TaxInformation();
-        });
-    } else {
-      this.apiService
-        .getTaxInfo()
-        .then((response: TaxInfoResponse) => {
-          this.taxInformation = TaxInformation.from(response);
-        })
-        .catch(() => {
-          this.taxInformation = new TaxInformation();
-        });
-    }
-  }
-
   submit = async () => {
-    if (!this.taxInfoComponent?.validate()) {
+    if (!this.taxInfoComponent?.taxFormGroup.valid && this.taxInfoComponent?.taxFormGroup.touched) {
+      this.taxInfoComponent.taxFormGroup.markAllAsTouched();
       return;
     }
-
     const request = new PaymentRequest();
     const response = this.paymentComponent.createPaymentToken().then((result) => {
       request.paymentToken = result[0];
       request.paymentMethodType = result[1];
-      request.postalCode = this.taxInformation?.postalCode;
-      request.country = this.taxInformation?.country;
+      request.postalCode = this.taxInfoComponent.taxFormGroup?.value.postalCode;
+      request.country = this.taxInfoComponent.taxFormGroup?.value.country;
       if (this.organizationId == null) {
         return this.apiService.postAccountPayment(request);
       } else {
-        request.taxId = this.taxInformation?.taxId;
-        request.state = this.taxInformation?.state;
-        request.line1 = this.taxInformation?.line1;
-        request.line2 = this.taxInformation?.line2;
-        request.city = this.taxInformation?.city;
-        request.state = this.taxInformation?.state;
+        request.taxId = this.taxInfoComponent.taxFormGroup?.value.taxId;
+        request.state = this.taxInfoComponent.taxFormGroup?.value.state;
+        request.line1 = this.taxInfoComponent.taxFormGroup?.value.line1;
+        request.line2 = this.taxInfoComponent.taxFormGroup?.value.line2;
+        request.city = this.taxInfoComponent.taxFormGroup?.value.city;
+        request.state = this.taxInfoComponent.taxFormGroup?.value.state;
         return this.organizationApiService.updatePayment(this.organizationId, request);
       }
     });
@@ -109,9 +83,8 @@ export class AdjustPaymentDialogComponent implements OnInit {
     this.dialogRef.close(AdjustPaymentDialogResult.Adjusted);
   };
 
-  taxInformationChanged(event: TaxInformation) {
-    this.taxInformation = event;
-    if (event.country === "US") {
+  changeCountry() {
+    if (this.taxInfoComponent.taxInfo.country === "US") {
       this.paymentComponent.hideBank = !this.organizationId;
     } else {
       this.paymentComponent.hideBank = true;
diff --git a/apps/web/src/app/billing/shared/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html
index d61ef2fa58b..1d4675847a1 100644
--- a/apps/web/src/app/billing/shared/payment-method.component.html
+++ b/apps/web/src/app/billing/shared/payment-method.component.html
@@ -110,5 +110,23 @@
         {{ "paymentChargedWithUnpaidSubscription" | i18n }}
       </p>
     </bit-section>
+    <bit-section *ngIf="forOrganization">
+      <h2 bitTypography="h2">{{ "taxInformation" | i18n }}</h2>
+      <p bitTypography="body1">{{ "taxInformationDesc" | i18n }}</p>
+      <div *ngIf="!org || loading">
+        <i
+          class="bwi bwi-spinner bwi-spin tw-text-muted"
+          title="{{ 'loading' | i18n }}"
+          aria-hidden="true"
+        ></i>
+        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
+      </div>
+      <form *ngIf="org && !loading" [formGroup]="taxForm" [bitSubmit]="submitTaxInfo">
+        <app-tax-info></app-tax-info>
+        <button bitButton bitFormButton buttonType="primary" type="submit">
+          {{ "save" | i18n }}
+        </button>
+      </form>
+    </bit-section>
   </ng-container>
 </bit-container>
diff --git a/apps/web/src/app/billing/shared/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts
index 3159cfa2902..98e6efcd8bd 100644
--- a/apps/web/src/app/billing/shared/payment-method.component.ts
+++ b/apps/web/src/app/billing/shared/payment-method.component.ts
@@ -1,5 +1,5 @@
 import { Location } from "@angular/common";
-import { Component, OnDestroy, OnInit } from "@angular/core";
+import { Component, OnDestroy, OnInit, ViewChild } from "@angular/core";
 import { FormBuilder, FormControl, Validators } from "@angular/forms";
 import { ActivatedRoute, Router } from "@angular/router";
 import { lastValueFrom } from "rxjs";
@@ -14,6 +14,7 @@ import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/mode
 import { SubscriptionResponse } from "@bitwarden/common/billing/models/response/subscription.response";
 import { VerifyBankRequest } from "@bitwarden/common/models/request/verify-bank.request";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { DialogService, ToastService } from "@bitwarden/components";
@@ -26,12 +27,15 @@ import {
   AdjustPaymentDialogResult,
   openAdjustPaymentDialog,
 } from "./adjust-payment-dialog/adjust-payment-dialog.component";
+import { TaxInfoComponent } from "./tax-info.component";
 
 @Component({
   templateUrl: "payment-method.component.html",
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class PaymentMethodComponent implements OnInit, OnDestroy {
+  @ViewChild(TaxInfoComponent) taxInfo: TaxInfoComponent;
+
   loading = false;
   firstLoaded = false;
   billing: BillingPaymentResponse;
@@ -55,6 +59,7 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     ]),
   });
 
+  taxForm = this.formBuilder.group({});
   launchPaymentModalAutomatically = false;
   protected freeTrialData: FreeTrial;
 
@@ -65,6 +70,7 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     protected platformUtilsService: PlatformUtilsService,
     private router: Router,
     private location: Location,
+    private logService: LogService,
     private route: ActivatedRoute,
     private formBuilder: FormBuilder,
     private dialogService: DialogService,
@@ -190,6 +196,15 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     await this.load();
   };
 
+  submitTaxInfo = async () => {
+    await this.taxInfo.submitTaxInfo();
+    this.toastService.showToast({
+      variant: "success",
+      title: null,
+      message: this.i18nService.t("taxInfoUpdated"),
+    });
+  };
+
   determineOrgsWithUpcomingPaymentIssues() {
     this.freeTrialData = this.trialFlowService.checkForOrgsWithUpcomingPaymentIssues(
       this.organization,
@@ -214,6 +229,10 @@ export class PaymentMethodComponent implements OnInit, OnDestroy {
     return this.organizationId != null;
   }
 
+  get headerClass() {
+    return this.forOrganization ? ["page-header"] : ["tabbed-header"];
+  }
+
   get paymentSourceClasses() {
     if (this.paymentSource == null) {
       return [];
diff --git a/apps/web/src/app/billing/shared/tax-info.component.html b/apps/web/src/app/billing/shared/tax-info.component.html
index 3955c0db816..82d5104a53a 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.html
+++ b/apps/web/src/app/billing/shared/tax-info.component.html
@@ -13,41 +13,51 @@
         </bit-select>
       </bit-form-field>
     </div>
-    <div class="tw-col-span-6">
+    <div [ngClass]="trialFlow ? 'tw-col-span-6' : 'tw-col-span-4'">
       <bit-form-field>
         <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
         <input bitInput type="text" formControlName="postalCode" autocomplete="postal-code" />
       </bit-form-field>
     </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
-      <bit-form-field>
-        <bit-label>{{ "address1" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
-      </bit-form-field>
+    <div class="tw-col-span-6" *ngIf="showTaxIdCheckbox">
+      <bit-form-control>
+        <input bitCheckbox type="checkbox" formControlName="includeTaxId" />
+        <bit-label>{{ "includeVAT" | i18n }}</bit-label>
+      </bit-form-control>
     </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
-      <bit-form-field>
-        <bit-label>{{ "address2" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
-      <bit-form-field>
-        <bit-label for="addressCity">{{ "cityTown" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
-      <bit-form-field>
-        <bit-label>{{ "stateProvince" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
-      </bit-form-field>
-    </div>
-    <div class="tw-col-span-6" *ngIf="isTaxSupported">
+  </div>
+  <div class="tw-grid tw-grid-cols-12 tw-gap-4" *ngIf="showTaxIdFields">
+    <div class="tw-col-span-6">
       <bit-form-field>
         <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
         <input bitInput type="text" formControlName="taxId" />
       </bit-form-field>
     </div>
   </div>
+  <div class="tw-grid tw-grid-cols-12 tw-gap-4" *ngIf="showTaxIdFields">
+    <div class="tw-col-span-6">
+      <bit-form-field>
+        <bit-label>{{ "address1" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6">
+      <bit-form-field>
+        <bit-label>{{ "address2" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6">
+      <bit-form-field>
+        <bit-label for="addressCity">{{ "cityTown" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6">
+      <bit-form-field>
+        <bit-label>{{ "stateProvince" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
+      </bit-form-field>
+    </div>
+  </div>
 </form>
diff --git a/apps/web/src/app/billing/shared/tax-info.component.ts b/apps/web/src/app/billing/shared/tax-info.component.ts
index 48452528053..2cd8f7dc366 100644
--- a/apps/web/src/app/billing/shared/tax-info.component.ts
+++ b/apps/web/src/app/billing/shared/tax-info.component.ts
@@ -1,18 +1,29 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 import { Subject, takeUntil } from "rxjs";
-import { debounceTime } from "rxjs/operators";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { CountryListItem } from "@bitwarden/common/billing/models/domain";
 import { ExpandedTaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/expanded-tax-info-update.request";
+import { TaxInfoUpdateRequest } from "@bitwarden/common/billing/models/request/tax-info-update.request";
+import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-info.response";
+import { TaxRateResponse } from "@bitwarden/common/billing/models/response/tax-rate.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
 import { SharedModule } from "../../shared";
 
+type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
+  includeTaxId: boolean;
+  [key: string]: unknown;
+};
+
+type CountryList = {
+  name: string;
+  value: string;
+  disabled: boolean;
+};
+
 @Component({
   selector: "app-tax-info",
   templateUrl: "tax-info.component.html",
@@ -20,64 +31,359 @@ import { SharedModule } from "../../shared";
   imports: [SharedModule],
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
-export class TaxInfoComponent implements OnInit, OnDestroy {
+export class TaxInfoComponent implements OnInit {
+  @Input() trialFlow = false;
+  @Output() onCountryChanged = new EventEmitter();
   private destroy$ = new Subject<void>();
 
-  @Input() trialFlow = false;
-  @Output() countryChanged = new EventEmitter();
-  @Output() taxInformationChanged: EventEmitter<void> = new EventEmitter<void>();
-
   taxFormGroup = new FormGroup({
-    country: new FormControl<string>(null, [Validators.required]),
-    postalCode: new FormControl<string>(null, [Validators.required]),
-    taxId: new FormControl<string>(null),
-    line1: new FormControl<string>(null),
-    line2: new FormControl<string>(null),
-    city: new FormControl<string>(null),
-    state: new FormControl<string>(null),
+    country: new FormControl(null, [Validators.required]),
+    postalCode: new FormControl(null),
+    includeTaxId: new FormControl(null),
+    taxId: new FormControl(null),
+    line1: new FormControl(null),
+    line2: new FormControl(null),
+    city: new FormControl(null),
+    state: new FormControl(null),
   });
 
-  protected isTaxSupported: boolean;
-
   loading = true;
   organizationId: string;
   providerId: string;
-  countryList: CountryListItem[] = this.taxService.getCountries();
+  taxInfo: TaxInfoView = {
+    taxId: null,
+    line1: null,
+    line2: null,
+    city: null,
+    state: null,
+    postalCode: null,
+    country: "US",
+    includeTaxId: false,
+  };
+  countryList: CountryList[] = [
+    { name: "-- Select --", value: "", disabled: false },
+    { name: "United States", value: "US", disabled: false },
+    { name: "China", value: "CN", disabled: false },
+    { name: "France", value: "FR", disabled: false },
+    { name: "Germany", value: "DE", disabled: false },
+    { name: "Canada", value: "CA", disabled: false },
+    { name: "United Kingdom", value: "GB", disabled: false },
+    { name: "Australia", value: "AU", disabled: false },
+    { name: "India", value: "IN", disabled: false },
+    { name: "", value: "-", disabled: true },
+    { name: "Afghanistan", value: "AF", disabled: false },
+    { name: "Åland Islands", value: "AX", disabled: false },
+    { name: "Albania", value: "AL", disabled: false },
+    { name: "Algeria", value: "DZ", disabled: false },
+    { name: "American Samoa", value: "AS", disabled: false },
+    { name: "Andorra", value: "AD", disabled: false },
+    { name: "Angola", value: "AO", disabled: false },
+    { name: "Anguilla", value: "AI", disabled: false },
+    { name: "Antarctica", value: "AQ", disabled: false },
+    { name: "Antigua and Barbuda", value: "AG", disabled: false },
+    { name: "Argentina", value: "AR", disabled: false },
+    { name: "Armenia", value: "AM", disabled: false },
+    { name: "Aruba", value: "AW", disabled: false },
+    { name: "Austria", value: "AT", disabled: false },
+    { name: "Azerbaijan", value: "AZ", disabled: false },
+    { name: "Bahamas", value: "BS", disabled: false },
+    { name: "Bahrain", value: "BH", disabled: false },
+    { name: "Bangladesh", value: "BD", disabled: false },
+    { name: "Barbados", value: "BB", disabled: false },
+    { name: "Belarus", value: "BY", disabled: false },
+    { name: "Belgium", value: "BE", disabled: false },
+    { name: "Belize", value: "BZ", disabled: false },
+    { name: "Benin", value: "BJ", disabled: false },
+    { name: "Bermuda", value: "BM", disabled: false },
+    { name: "Bhutan", value: "BT", disabled: false },
+    { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
+    { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
+    { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
+    { name: "Botswana", value: "BW", disabled: false },
+    { name: "Bouvet Island", value: "BV", disabled: false },
+    { name: "Brazil", value: "BR", disabled: false },
+    { name: "British Indian Ocean Territory", value: "IO", disabled: false },
+    { name: "Brunei Darussalam", value: "BN", disabled: false },
+    { name: "Bulgaria", value: "BG", disabled: false },
+    { name: "Burkina Faso", value: "BF", disabled: false },
+    { name: "Burundi", value: "BI", disabled: false },
+    { name: "Cambodia", value: "KH", disabled: false },
+    { name: "Cameroon", value: "CM", disabled: false },
+    { name: "Cape Verde", value: "CV", disabled: false },
+    { name: "Cayman Islands", value: "KY", disabled: false },
+    { name: "Central African Republic", value: "CF", disabled: false },
+    { name: "Chad", value: "TD", disabled: false },
+    { name: "Chile", value: "CL", disabled: false },
+    { name: "Christmas Island", value: "CX", disabled: false },
+    { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
+    { name: "Colombia", value: "CO", disabled: false },
+    { name: "Comoros", value: "KM", disabled: false },
+    { name: "Congo", value: "CG", disabled: false },
+    { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
+    { name: "Cook Islands", value: "CK", disabled: false },
+    { name: "Costa Rica", value: "CR", disabled: false },
+    { name: "Côte d'Ivoire", value: "CI", disabled: false },
+    { name: "Croatia", value: "HR", disabled: false },
+    { name: "Cuba", value: "CU", disabled: false },
+    { name: "Curaçao", value: "CW", disabled: false },
+    { name: "Cyprus", value: "CY", disabled: false },
+    { name: "Czech Republic", value: "CZ", disabled: false },
+    { name: "Denmark", value: "DK", disabled: false },
+    { name: "Djibouti", value: "DJ", disabled: false },
+    { name: "Dominica", value: "DM", disabled: false },
+    { name: "Dominican Republic", value: "DO", disabled: false },
+    { name: "Ecuador", value: "EC", disabled: false },
+    { name: "Egypt", value: "EG", disabled: false },
+    { name: "El Salvador", value: "SV", disabled: false },
+    { name: "Equatorial Guinea", value: "GQ", disabled: false },
+    { name: "Eritrea", value: "ER", disabled: false },
+    { name: "Estonia", value: "EE", disabled: false },
+    { name: "Ethiopia", value: "ET", disabled: false },
+    { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
+    { name: "Faroe Islands", value: "FO", disabled: false },
+    { name: "Fiji", value: "FJ", disabled: false },
+    { name: "Finland", value: "FI", disabled: false },
+    { name: "French Guiana", value: "GF", disabled: false },
+    { name: "French Polynesia", value: "PF", disabled: false },
+    { name: "French Southern Territories", value: "TF", disabled: false },
+    { name: "Gabon", value: "GA", disabled: false },
+    { name: "Gambia", value: "GM", disabled: false },
+    { name: "Georgia", value: "GE", disabled: false },
+    { name: "Ghana", value: "GH", disabled: false },
+    { name: "Gibraltar", value: "GI", disabled: false },
+    { name: "Greece", value: "GR", disabled: false },
+    { name: "Greenland", value: "GL", disabled: false },
+    { name: "Grenada", value: "GD", disabled: false },
+    { name: "Guadeloupe", value: "GP", disabled: false },
+    { name: "Guam", value: "GU", disabled: false },
+    { name: "Guatemala", value: "GT", disabled: false },
+    { name: "Guernsey", value: "GG", disabled: false },
+    { name: "Guinea", value: "GN", disabled: false },
+    { name: "Guinea-Bissau", value: "GW", disabled: false },
+    { name: "Guyana", value: "GY", disabled: false },
+    { name: "Haiti", value: "HT", disabled: false },
+    { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
+    { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
+    { name: "Honduras", value: "HN", disabled: false },
+    { name: "Hong Kong", value: "HK", disabled: false },
+    { name: "Hungary", value: "HU", disabled: false },
+    { name: "Iceland", value: "IS", disabled: false },
+    { name: "Indonesia", value: "ID", disabled: false },
+    { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
+    { name: "Iraq", value: "IQ", disabled: false },
+    { name: "Ireland", value: "IE", disabled: false },
+    { name: "Isle of Man", value: "IM", disabled: false },
+    { name: "Israel", value: "IL", disabled: false },
+    { name: "Italy", value: "IT", disabled: false },
+    { name: "Jamaica", value: "JM", disabled: false },
+    { name: "Japan", value: "JP", disabled: false },
+    { name: "Jersey", value: "JE", disabled: false },
+    { name: "Jordan", value: "JO", disabled: false },
+    { name: "Kazakhstan", value: "KZ", disabled: false },
+    { name: "Kenya", value: "KE", disabled: false },
+    { name: "Kiribati", value: "KI", disabled: false },
+    { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
+    { name: "Korea, Republic of", value: "KR", disabled: false },
+    { name: "Kuwait", value: "KW", disabled: false },
+    { name: "Kyrgyzstan", value: "KG", disabled: false },
+    { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
+    { name: "Latvia", value: "LV", disabled: false },
+    { name: "Lebanon", value: "LB", disabled: false },
+    { name: "Lesotho", value: "LS", disabled: false },
+    { name: "Liberia", value: "LR", disabled: false },
+    { name: "Libya", value: "LY", disabled: false },
+    { name: "Liechtenstein", value: "LI", disabled: false },
+    { name: "Lithuania", value: "LT", disabled: false },
+    { name: "Luxembourg", value: "LU", disabled: false },
+    { name: "Macao", value: "MO", disabled: false },
+    { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
+    { name: "Madagascar", value: "MG", disabled: false },
+    { name: "Malawi", value: "MW", disabled: false },
+    { name: "Malaysia", value: "MY", disabled: false },
+    { name: "Maldives", value: "MV", disabled: false },
+    { name: "Mali", value: "ML", disabled: false },
+    { name: "Malta", value: "MT", disabled: false },
+    { name: "Marshall Islands", value: "MH", disabled: false },
+    { name: "Martinique", value: "MQ", disabled: false },
+    { name: "Mauritania", value: "MR", disabled: false },
+    { name: "Mauritius", value: "MU", disabled: false },
+    { name: "Mayotte", value: "YT", disabled: false },
+    { name: "Mexico", value: "MX", disabled: false },
+    { name: "Micronesia, Federated States of", value: "FM", disabled: false },
+    { name: "Moldova, Republic of", value: "MD", disabled: false },
+    { name: "Monaco", value: "MC", disabled: false },
+    { name: "Mongolia", value: "MN", disabled: false },
+    { name: "Montenegro", value: "ME", disabled: false },
+    { name: "Montserrat", value: "MS", disabled: false },
+    { name: "Morocco", value: "MA", disabled: false },
+    { name: "Mozambique", value: "MZ", disabled: false },
+    { name: "Myanmar", value: "MM", disabled: false },
+    { name: "Namibia", value: "NA", disabled: false },
+    { name: "Nauru", value: "NR", disabled: false },
+    { name: "Nepal", value: "NP", disabled: false },
+    { name: "Netherlands", value: "NL", disabled: false },
+    { name: "New Caledonia", value: "NC", disabled: false },
+    { name: "New Zealand", value: "NZ", disabled: false },
+    { name: "Nicaragua", value: "NI", disabled: false },
+    { name: "Niger", value: "NE", disabled: false },
+    { name: "Nigeria", value: "NG", disabled: false },
+    { name: "Niue", value: "NU", disabled: false },
+    { name: "Norfolk Island", value: "NF", disabled: false },
+    { name: "Northern Mariana Islands", value: "MP", disabled: false },
+    { name: "Norway", value: "NO", disabled: false },
+    { name: "Oman", value: "OM", disabled: false },
+    { name: "Pakistan", value: "PK", disabled: false },
+    { name: "Palau", value: "PW", disabled: false },
+    { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
+    { name: "Panama", value: "PA", disabled: false },
+    { name: "Papua New Guinea", value: "PG", disabled: false },
+    { name: "Paraguay", value: "PY", disabled: false },
+    { name: "Peru", value: "PE", disabled: false },
+    { name: "Philippines", value: "PH", disabled: false },
+    { name: "Pitcairn", value: "PN", disabled: false },
+    { name: "Poland", value: "PL", disabled: false },
+    { name: "Portugal", value: "PT", disabled: false },
+    { name: "Puerto Rico", value: "PR", disabled: false },
+    { name: "Qatar", value: "QA", disabled: false },
+    { name: "Réunion", value: "RE", disabled: false },
+    { name: "Romania", value: "RO", disabled: false },
+    { name: "Russian Federation", value: "RU", disabled: false },
+    { name: "Rwanda", value: "RW", disabled: false },
+    { name: "Saint Barthélemy", value: "BL", disabled: false },
+    { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
+    { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
+    { name: "Saint Lucia", value: "LC", disabled: false },
+    { name: "Saint Martin (French part)", value: "MF", disabled: false },
+    { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
+    { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
+    { name: "Samoa", value: "WS", disabled: false },
+    { name: "San Marino", value: "SM", disabled: false },
+    { name: "Sao Tome and Principe", value: "ST", disabled: false },
+    { name: "Saudi Arabia", value: "SA", disabled: false },
+    { name: "Senegal", value: "SN", disabled: false },
+    { name: "Serbia", value: "RS", disabled: false },
+    { name: "Seychelles", value: "SC", disabled: false },
+    { name: "Sierra Leone", value: "SL", disabled: false },
+    { name: "Singapore", value: "SG", disabled: false },
+    { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
+    { name: "Slovakia", value: "SK", disabled: false },
+    { name: "Slovenia", value: "SI", disabled: false },
+    { name: "Solomon Islands", value: "SB", disabled: false },
+    { name: "Somalia", value: "SO", disabled: false },
+    { name: "South Africa", value: "ZA", disabled: false },
+    { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
+    { name: "South Sudan", value: "SS", disabled: false },
+    { name: "Spain", value: "ES", disabled: false },
+    { name: "Sri Lanka", value: "LK", disabled: false },
+    { name: "Sudan", value: "SD", disabled: false },
+    { name: "Suriname", value: "SR", disabled: false },
+    { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
+    { name: "Swaziland", value: "SZ", disabled: false },
+    { name: "Sweden", value: "SE", disabled: false },
+    { name: "Switzerland", value: "CH", disabled: false },
+    { name: "Syrian Arab Republic", value: "SY", disabled: false },
+    { name: "Taiwan", value: "TW", disabled: false },
+    { name: "Tajikistan", value: "TJ", disabled: false },
+    { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
+    { name: "Thailand", value: "TH", disabled: false },
+    { name: "Timor-Leste", value: "TL", disabled: false },
+    { name: "Togo", value: "TG", disabled: false },
+    { name: "Tokelau", value: "TK", disabled: false },
+    { name: "Tonga", value: "TO", disabled: false },
+    { name: "Trinidad and Tobago", value: "TT", disabled: false },
+    { name: "Tunisia", value: "TN", disabled: false },
+    { name: "Turkey", value: "TR", disabled: false },
+    { name: "Turkmenistan", value: "TM", disabled: false },
+    { name: "Turks and Caicos Islands", value: "TC", disabled: false },
+    { name: "Tuvalu", value: "TV", disabled: false },
+    { name: "Uganda", value: "UG", disabled: false },
+    { name: "Ukraine", value: "UA", disabled: false },
+    { name: "United Arab Emirates", value: "AE", disabled: false },
+    { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
+    { name: "Uruguay", value: "UY", disabled: false },
+    { name: "Uzbekistan", value: "UZ", disabled: false },
+    { name: "Vanuatu", value: "VU", disabled: false },
+    { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
+    { name: "Viet Nam", value: "VN", disabled: false },
+    { name: "Virgin Islands, British", value: "VG", disabled: false },
+    { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
+    { name: "Wallis and Futuna", value: "WF", disabled: false },
+    { name: "Western Sahara", value: "EH", disabled: false },
+    { name: "Yemen", value: "YE", disabled: false },
+    { name: "Zambia", value: "ZM", disabled: false },
+    { name: "Zimbabwe", value: "ZW", disabled: false },
+  ];
+  taxRates: TaxRateResponse[];
 
   constructor(
     private apiService: ApiService,
     private route: ActivatedRoute,
     private logService: LogService,
     private organizationApiService: OrganizationApiServiceAbstraction,
-    private taxService: TaxServiceAbstraction,
   ) {}
 
   get country(): string {
-    return this.taxFormGroup.controls.country.value;
+    return this.taxFormGroup.get("country").value;
+  }
+
+  set country(country: string) {
+    this.taxFormGroup.get("country").setValue(country);
   }
 
   get postalCode(): string {
-    return this.taxFormGroup.controls.postalCode.value;
+    return this.taxFormGroup.get("postalCode").value;
+  }
+
+  set postalCode(postalCode: string) {
+    this.taxFormGroup.get("postalCode").setValue(postalCode);
+  }
+
+  get includeTaxId(): boolean {
+    return this.taxFormGroup.get("includeTaxId").value;
+  }
+
+  set includeTaxId(includeTaxId: boolean) {
+    this.taxFormGroup.get("includeTaxId").setValue(includeTaxId);
   }
 
   get taxId(): string {
-    return this.taxFormGroup.controls.taxId.value;
+    return this.taxFormGroup.get("taxId").value;
+  }
+
+  set taxId(taxId: string) {
+    this.taxFormGroup.get("taxId").setValue(taxId);
   }
 
   get line1(): string {
-    return this.taxFormGroup.controls.line1.value;
+    return this.taxFormGroup.get("line1").value;
+  }
+
+  set line1(line1: string) {
+    this.taxFormGroup.get("line1").setValue(line1);
   }
 
   get line2(): string {
-    return this.taxFormGroup.controls.line2.value;
+    return this.taxFormGroup.get("line2").value;
+  }
+
+  set line2(line2: string) {
+    this.taxFormGroup.get("line2").setValue(line2);
   }
 
   get city(): string {
-    return this.taxFormGroup.controls.city.value;
+    return this.taxFormGroup.get("city").value;
+  }
+
+  set city(city: string) {
+    this.taxFormGroup.get("city").setValue(city);
   }
 
   get state(): string {
-    return this.taxFormGroup.controls.state.value;
+    return this.taxFormGroup.get("state").value;
+  }
+
+  set state(state: string) {
+    this.taxFormGroup.get("state").setValue(state);
   }
 
   async ngOnInit() {
@@ -94,13 +400,22 @@ export class TaxInfoComponent implements OnInit, OnDestroy {
         try {
           const taxInfo = await this.organizationApiService.getTaxInfo(this.organizationId);
           if (taxInfo) {
-            this.taxFormGroup.controls.taxId.setValue(taxInfo.taxId);
-            this.taxFormGroup.controls.state.setValue(taxInfo.state);
-            this.taxFormGroup.controls.line1.setValue(taxInfo.line1);
-            this.taxFormGroup.controls.line2.setValue(taxInfo.line2);
-            this.taxFormGroup.controls.city.setValue(taxInfo.city);
-            this.taxFormGroup.controls.postalCode.setValue(taxInfo.postalCode);
-            this.taxFormGroup.controls.country.setValue(taxInfo.country);
+            this.taxId = taxInfo.taxId;
+            this.state = taxInfo.state;
+            this.line1 = taxInfo.line1;
+            this.line2 = taxInfo.line2;
+            this.city = taxInfo.city;
+            this.state = taxInfo.state;
+            this.postalCode = taxInfo.postalCode;
+            this.country = taxInfo.country || "US";
+            this.includeTaxId =
+              this.countrySupportsTax(this.country) &&
+              (!!taxInfo.taxId ||
+                !!taxInfo.line1 ||
+                !!taxInfo.line2 ||
+                !!taxInfo.city ||
+                !!taxInfo.state);
+            this.setTaxInfoObject();
           }
         } catch (e) {
           this.logService.error(e);
@@ -109,79 +424,119 @@ export class TaxInfoComponent implements OnInit, OnDestroy {
         try {
           const taxInfo = await this.apiService.getTaxInfo();
           if (taxInfo) {
-            this.taxFormGroup.controls.postalCode.setValue(taxInfo.postalCode);
-            this.taxFormGroup.controls.country.setValue(taxInfo.country);
+            this.postalCode = taxInfo.postalCode;
+            this.country = taxInfo.country || "US";
           }
+          this.setTaxInfoObject();
         } catch (e) {
           this.logService.error(e);
         }
       }
 
-      this.isTaxSupported = await this.taxService.isCountrySupported(
-        this.taxFormGroup.controls.country.value,
-      );
+      if (this.country === "US") {
+        this.taxFormGroup.get("postalCode").setValidators([Validators.required]);
+        this.taxFormGroup.get("postalCode").updateValueAndValidity();
+      }
 
-      this.countryChanged.emit();
+      if (this.country !== "US") {
+        this.onCountryChanged.emit();
+      }
     });
 
-    this.taxFormGroup.controls.country.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
+    this.taxFormGroup
+      .get("country")
+      .valueChanges.pipe(takeUntil(this.destroy$))
       .subscribe((value) => {
-        this.taxService
-          .isCountrySupported(this.taxFormGroup.controls.country.value)
-          .then((isSupported) => {
-            this.isTaxSupported = isSupported;
-          })
-          .catch(() => {
-            this.isTaxSupported = false;
-          })
-          .finally(() => {
-            if (!this.isTaxSupported) {
-              this.taxFormGroup.controls.taxId.setValue(null);
-              this.taxFormGroup.controls.line1.setValue(null);
-              this.taxFormGroup.controls.line2.setValue(null);
-              this.taxFormGroup.controls.city.setValue(null);
-              this.taxFormGroup.controls.state.setValue(null);
-            }
-
-            this.countryChanged.emit();
-          });
-        this.taxInformationChanged.emit();
+        if (value === "US") {
+          this.taxFormGroup.get("postalCode").setValidators([Validators.required]);
+        } else {
+          this.taxFormGroup.get("postalCode").clearValidators();
+        }
+        this.taxFormGroup.get("postalCode").updateValueAndValidity();
+        this.setTaxInfoObject();
+        this.changeCountry();
       });
 
-    this.taxFormGroup.controls.postalCode.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        this.taxInformationChanged.emit();
-      });
-
-    this.taxFormGroup.controls.taxId.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        this.taxInformationChanged.emit();
-      });
-
-    this.loading = false;
+    try {
+      const taxRates = await this.apiService.getTaxRates();
+      if (taxRates) {
+        this.taxRates = taxRates.data;
+      }
+    } catch (e) {
+      this.logService.error(e);
+    } finally {
+      this.loading = false;
+    }
   }
 
-  ngOnDestroy() {
-    this.destroy$.next();
-    this.destroy$.complete();
+  get taxRate() {
+    if (this.taxRates != null) {
+      const localTaxRate = this.taxRates.find(
+        (x) => x.country === this.country && x.postalCode === this.postalCode,
+      );
+      return localTaxRate?.rate ?? null;
+    }
+  }
+
+  setTaxInfoObject() {
+    this.taxInfo.country = this.country;
+    this.taxInfo.postalCode = this.postalCode;
+    this.taxInfo.includeTaxId = this.includeTaxId;
+    this.taxInfo.taxId = this.taxId;
+    this.taxInfo.line1 = this.line1;
+    this.taxInfo.line2 = this.line2;
+    this.taxInfo.city = this.city;
+    this.taxInfo.state = this.state;
+  }
+
+  get showTaxIdCheckbox() {
+    return (
+      (this.organizationId || this.providerId) &&
+      this.country !== "US" &&
+      this.countrySupportsTax(this.taxInfo.country)
+    );
+  }
+
+  get showTaxIdFields() {
+    return (
+      (this.organizationId || this.providerId) &&
+      this.includeTaxId &&
+      this.countrySupportsTax(this.country)
+    );
+  }
+
+  getTaxInfoRequest(): TaxInfoUpdateRequest {
+    if (this.organizationId || this.providerId) {
+      const request = new ExpandedTaxInfoUpdateRequest();
+      request.country = this.country;
+      request.postalCode = this.postalCode;
+
+      if (this.includeTaxId) {
+        request.taxId = this.taxId;
+        request.line1 = this.line1;
+        request.line2 = this.line2;
+        request.city = this.city;
+        request.state = this.state;
+      } else {
+        request.taxId = null;
+        request.line1 = null;
+        request.line2 = null;
+        request.city = null;
+        request.state = null;
+      }
+      return request;
+    } else {
+      const request = new TaxInfoUpdateRequest();
+      request.postalCode = this.postalCode;
+      request.country = this.country;
+      return request;
+    }
   }
 
   submitTaxInfo(): Promise<any> {
     this.taxFormGroup.updateValueAndValidity();
     this.taxFormGroup.markAllAsTouched();
-
-    const request = new ExpandedTaxInfoUpdateRequest();
-    request.country = this.country;
-    request.postalCode = this.postalCode;
-    request.taxId = this.taxId;
-    request.line1 = this.line1;
-    request.line2 = this.line2;
-    request.city = this.city;
-    request.state = this.state;
-
+    const request = this.getTaxInfoRequest();
     return this.organizationId
       ? this.organizationApiService.updateTaxInfo(
           this.organizationId,
@@ -189,4 +544,97 @@ export class TaxInfoComponent implements OnInit, OnDestroy {
         )
       : this.apiService.putTaxInfo(request);
   }
+
+  changeCountry() {
+    if (!this.countrySupportsTax(this.country)) {
+      this.includeTaxId = false;
+      this.taxId = null;
+      this.line1 = null;
+      this.line2 = null;
+      this.city = null;
+      this.state = null;
+      this.setTaxInfoObject();
+    }
+    this.onCountryChanged.emit();
+  }
+
+  countrySupportsTax(countryCode: string) {
+    return this.taxSupportedCountryCodes.includes(countryCode);
+  }
+
+  private taxSupportedCountryCodes: string[] = [
+    "CN",
+    "FR",
+    "DE",
+    "CA",
+    "GB",
+    "AU",
+    "IN",
+    "AD",
+    "AR",
+    "AT",
+    "BE",
+    "BO",
+    "BR",
+    "BG",
+    "CL",
+    "CO",
+    "CR",
+    "HR",
+    "CY",
+    "CZ",
+    "DK",
+    "DO",
+    "EC",
+    "EG",
+    "SV",
+    "EE",
+    "FI",
+    "GE",
+    "GR",
+    "HK",
+    "HU",
+    "IS",
+    "ID",
+    "IQ",
+    "IE",
+    "IL",
+    "IT",
+    "JP",
+    "KE",
+    "KR",
+    "LV",
+    "LI",
+    "LT",
+    "LU",
+    "MY",
+    "MT",
+    "MX",
+    "NL",
+    "NZ",
+    "NO",
+    "PE",
+    "PH",
+    "PL",
+    "PT",
+    "RO",
+    "RU",
+    "SA",
+    "RS",
+    "SG",
+    "SK",
+    "SI",
+    "ZA",
+    "ES",
+    "SE",
+    "CH",
+    "TW",
+    "TH",
+    "TR",
+    "UA",
+    "AE",
+    "UY",
+    "VE",
+    "VN",
+  ];
 }
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 25172f7c779..cab0e703a7d 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -9224,18 +9224,6 @@
   "updatedTaxInformation": {
     "message": "Updated tax information"
   },
-  "billingInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
-  },
-  "billingTaxIdTypeInferenceError": {
-    "message": "We were unable to validate your tax ID, if you believe this is an error please contact support."
-  },
-  "billingPreviewInvalidTaxIdError": {
-    "message": "Invalid tax ID, if you believe this is an error please contact support."
-  },
-  "billingPreviewInvoiceError": {
-    "message": "An error occurred while previewing the invoice. Please try again later."
-  },
   "unverified": {
     "message": "Unverified"
   },
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
index 74aa468c42e..33a20444c2b 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
@@ -29,7 +29,7 @@
       </div>
     </div>
     <app-manage-tax-information />
-    <button class="tw-mt-8" bitButton bitFormButton buttonType="primary" type="submit">
+    <button bitButton bitFormButton buttonType="primary" type="submit">
       {{ "submit" | i18n }}
     </button>
   </form>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
index 079174b48b5..72d954e8cdc 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.ts
@@ -109,7 +109,9 @@ export class SetupComponent implements OnInit, OnDestroy {
     try {
       this.formGroup.markAllAsTouched();
 
-      if (!this.manageTaxInformationComponent.validate() || !this.formGroup.valid) {
+      const formIsValid = this.formGroup.valid && this.manageTaxInformationComponent.touch();
+
+      if (!formIsValid) {
         return;
       }
 
@@ -127,11 +129,14 @@ export class SetupComponent implements OnInit, OnDestroy {
 
       request.taxInfo.country = taxInformation.country;
       request.taxInfo.postalCode = taxInformation.postalCode;
-      request.taxInfo.taxId = taxInformation.taxId;
-      request.taxInfo.line1 = taxInformation.line1;
-      request.taxInfo.line2 = taxInformation.line2;
-      request.taxInfo.city = taxInformation.city;
-      request.taxInfo.state = taxInformation.state;
+
+      if (taxInformation.includeTaxId) {
+        request.taxInfo.taxId = taxInformation.taxId;
+        request.taxInfo.line1 = taxInformation.line1;
+        request.taxInfo.line2 = taxInformation.line2;
+        request.taxInfo.city = taxInformation.city;
+        request.taxInfo.state = taxInformation.state;
+      }
 
       const provider = await this.providerApiService.postProviderSetup(this.providerId, request);
 
diff --git a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html
index fbd8af4f8b9..0b041bd4c06 100644
--- a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html
+++ b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.html
@@ -1,7 +1,7 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <div class="tw-grid tw-grid-cols-12 tw-gap-4">
     <div class="tw-col-span-6">
-      <bit-form-field disableMargin>
+      <bit-form-field [disableMargin]="selectionSupportsAdditionalOptions">
         <bit-label>{{ "country" | i18n }}</bit-label>
         <bit-select formControlName="country">
           <bit-option
@@ -14,47 +14,59 @@
       </bit-form-field>
     </div>
     <div class="tw-col-span-6">
-      <bit-form-field disableMargin>
+      <bit-form-field [disableMargin]="selectionSupportsAdditionalOptions">
         <bit-label>{{ "zipPostalCode" | i18n }}</bit-label>
         <input bitInput type="text" formControlName="postalCode" autocomplete="postal-code" />
       </bit-form-field>
     </div>
-    <ng-container *ngIf="isTaxSupported">
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "address1" | i18n }}</bit-label>
-          <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
-        </bit-form-field>
-      </div>
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "address2" | i18n }}</bit-label>
-          <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
-        </bit-form-field>
-      </div>
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "cityTown" | i18n }}</bit-label>
-          <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
-        </bit-form-field>
-      </div>
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "stateProvince" | i18n }}</bit-label>
-          <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
-        </bit-form-field>
-      </div>
-      <div class="tw-col-span-6">
-        <bit-form-field disableMargin>
-          <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
-          <input bitInput type="text" formControlName="taxId" />
-        </bit-form-field>
-      </div>
-    </ng-container>
-    <div class="tw-col-span-12" *ngIf="!!onSubmit">
-      <button bitButton bitFormButton buttonType="primary" type="submit">
-        {{ "submit" | i18n }}
-      </button>
+    <div class="tw-col-span-6" *ngIf="selectionSupportsAdditionalOptions">
+      <bit-form-control>
+        <input bitCheckbox type="checkbox" formControlName="includeTaxId" />
+        <bit-label>{{ "includeVAT" | i18n }}</bit-label>
+      </bit-form-control>
     </div>
   </div>
+  <div
+    class="tw-grid tw-grid-cols-12 tw-gap-4"
+    *ngIf="selectionSupportsAdditionalOptions && includeTaxIdIsSelected"
+  >
+    <div class="tw-col-span-6">
+      <bit-form-field>
+        <bit-label>{{ "taxIdNumber" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="taxId" />
+      </bit-form-field>
+    </div>
+  </div>
+  <div
+    class="tw-grid tw-grid-cols-12 tw-gap-4"
+    *ngIf="selectionSupportsAdditionalOptions && includeTaxIdIsSelected"
+  >
+    <div class="tw-col-span-6">
+      <bit-form-field disableMargin>
+        <bit-label>{{ "address1" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="line1" autocomplete="address-line1" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6">
+      <bit-form-field disableMargin>
+        <bit-label>{{ "address2" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="line2" autocomplete="address-line2" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6">
+      <bit-form-field>
+        <bit-label>{{ "cityTown" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="city" autocomplete="address-level2" />
+      </bit-form-field>
+    </div>
+    <div class="tw-col-span-6">
+      <bit-form-field>
+        <bit-label>{{ "stateProvince" | i18n }}</bit-label>
+        <input bitInput type="text" formControlName="state" autocomplete="address-level1" />
+      </bit-form-field>
+    </div>
+  </div>
+  <button *ngIf="!!onSubmit" bitButton bitFormButton buttonType="primary" type="submit">
+    {{ "submit" | i18n }}
+  </button>
 </form>
diff --git a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
index 2f79c6f5397..e73a6968607 100644
--- a/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
+++ b/libs/angular/src/billing/components/manage-tax-information/manage-tax-information.component.ts
@@ -1,10 +1,14 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { Subject, takeUntil } from "rxjs";
-import { debounceTime } from "rxjs/operators";
 
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { CountryListItem, TaxInformation } from "@bitwarden/common/billing/models/domain";
+import { TaxInformation } from "@bitwarden/common/billing/models/domain";
+
+type Country = {
+  name: string;
+  value: string;
+  disabled: boolean;
+};
 
 @Component({
   selector: "app-manage-tax-information",
@@ -13,22 +17,12 @@ import { CountryListItem, TaxInformation } from "@bitwarden/common/billing/model
 export class ManageTaxInformationComponent implements OnInit, OnDestroy {
   @Input() startWith: TaxInformation;
   @Input() onSubmit?: (taxInformation: TaxInformation) => Promise<void>;
-
-  /**
-   * Emits when the tax information has changed.
-   */
-  @Output() taxInformationChanged = new EventEmitter<TaxInformation>();
-
-  /**
-   * Emits when the tax information has been updated.
-   */
   @Output() taxInformationUpdated = new EventEmitter();
 
-  private taxInformation: TaxInformation;
-
   protected formGroup = this.formBuilder.group({
     country: ["", Validators.required],
     postalCode: ["", Validators.required],
+    includeTaxId: false,
     taxId: "",
     line1: "",
     line2: "",
@@ -36,20 +30,16 @@ export class ManageTaxInformationComponent implements OnInit, OnDestroy {
     state: "",
   });
 
-  protected isTaxSupported: boolean;
-
   private destroy$ = new Subject<void>();
 
-  protected readonly countries: CountryListItem[] = this.taxService.getCountries();
+  private taxInformation: TaxInformation;
 
-  constructor(
-    private formBuilder: FormBuilder,
-    private taxService: TaxServiceAbstraction,
-  ) {}
+  constructor(private formBuilder: FormBuilder) {}
 
-  getTaxInformation(): TaxInformation {
-    return this.taxInformation;
-  }
+  getTaxInformation = (): TaxInformation & { includeTaxId: boolean } => ({
+    ...this.taxInformation,
+    includeTaxId: this.formGroup.value.includeTaxId,
+  });
 
   submit = async () => {
     this.formGroup.markAllAsTouched();
@@ -60,28 +50,23 @@ export class ManageTaxInformationComponent implements OnInit, OnDestroy {
     this.taxInformationUpdated.emit();
   };
 
-  validate = (): boolean => {
+  touch = (): boolean => {
     this.formGroup.markAllAsTouched();
     return this.formGroup.valid;
   };
 
   async ngOnInit() {
     if (this.startWith) {
-      this.formGroup.controls.country.setValue(this.startWith.country);
-      this.formGroup.controls.postalCode.setValue(this.startWith.postalCode);
-
-      this.isTaxSupported =
-        this.startWith && this.startWith.country
-          ? await this.taxService.isCountrySupported(this.startWith.country)
-          : false;
-
-      if (this.isTaxSupported) {
-        this.formGroup.controls.taxId.setValue(this.startWith.taxId);
-        this.formGroup.controls.line1.setValue(this.startWith.line1);
-        this.formGroup.controls.line2.setValue(this.startWith.line2);
-        this.formGroup.controls.city.setValue(this.startWith.city);
-        this.formGroup.controls.state.setValue(this.startWith.state);
-      }
+      this.formGroup.patchValue({
+        ...this.startWith,
+        includeTaxId:
+          this.countrySupportsTax(this.startWith.country) &&
+          (!!this.startWith.taxId ||
+            !!this.startWith.line1 ||
+            !!this.startWith.line2 ||
+            !!this.startWith.city ||
+            !!this.startWith.state),
+      });
     }
 
     this.formGroup.valueChanges.pipe(takeUntil(this.destroy$)).subscribe((values) => {
@@ -95,47 +80,354 @@ export class ManageTaxInformationComponent implements OnInit, OnDestroy {
         state: values.state,
       };
     });
-
-    this.formGroup.controls.country.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe((country: string) => {
-        this.taxService
-          .isCountrySupported(country)
-          .then((isSupported) => (this.isTaxSupported = isSupported))
-          .catch(() => (this.isTaxSupported = false))
-          .finally(() => {
-            if (!this.isTaxSupported) {
-              this.formGroup.controls.taxId.setValue(null);
-              this.formGroup.controls.line1.setValue(null);
-              this.formGroup.controls.line2.setValue(null);
-              this.formGroup.controls.city.setValue(null);
-              this.formGroup.controls.state.setValue(null);
-            }
-            if (this.taxInformationChanged) {
-              this.taxInformationChanged.emit(this.taxInformation);
-            }
-          });
-      });
-
-    this.formGroup.controls.postalCode.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        if (this.taxInformationChanged) {
-          this.taxInformationChanged.emit(this.taxInformation);
-        }
-      });
-
-    this.formGroup.controls.taxId.valueChanges
-      .pipe(debounceTime(1000), takeUntil(this.destroy$))
-      .subscribe(() => {
-        if (this.taxInformationChanged) {
-          this.taxInformationChanged.emit(this.taxInformation);
-        }
-      });
   }
 
   ngOnDestroy() {
     this.destroy$.next();
     this.destroy$.complete();
   }
+
+  protected countrySupportsTax(countryCode: string) {
+    return this.taxSupportedCountryCodes.includes(countryCode);
+  }
+
+  protected get includeTaxIdIsSelected() {
+    return this.formGroup.value.includeTaxId;
+  }
+
+  protected get selectionSupportsAdditionalOptions() {
+    return (
+      this.formGroup.value.country !== "US" && this.countrySupportsTax(this.formGroup.value.country)
+    );
+  }
+
+  protected countries: Country[] = [
+    { name: "-- Select --", value: "", disabled: false },
+    { name: "United States", value: "US", disabled: false },
+    { name: "China", value: "CN", disabled: false },
+    { name: "France", value: "FR", disabled: false },
+    { name: "Germany", value: "DE", disabled: false },
+    { name: "Canada", value: "CA", disabled: false },
+    { name: "United Kingdom", value: "GB", disabled: false },
+    { name: "Australia", value: "AU", disabled: false },
+    { name: "India", value: "IN", disabled: false },
+    { name: "", value: "-", disabled: true },
+    { name: "Afghanistan", value: "AF", disabled: false },
+    { name: "Åland Islands", value: "AX", disabled: false },
+    { name: "Albania", value: "AL", disabled: false },
+    { name: "Algeria", value: "DZ", disabled: false },
+    { name: "American Samoa", value: "AS", disabled: false },
+    { name: "Andorra", value: "AD", disabled: false },
+    { name: "Angola", value: "AO", disabled: false },
+    { name: "Anguilla", value: "AI", disabled: false },
+    { name: "Antarctica", value: "AQ", disabled: false },
+    { name: "Antigua and Barbuda", value: "AG", disabled: false },
+    { name: "Argentina", value: "AR", disabled: false },
+    { name: "Armenia", value: "AM", disabled: false },
+    { name: "Aruba", value: "AW", disabled: false },
+    { name: "Austria", value: "AT", disabled: false },
+    { name: "Azerbaijan", value: "AZ", disabled: false },
+    { name: "Bahamas", value: "BS", disabled: false },
+    { name: "Bahrain", value: "BH", disabled: false },
+    { name: "Bangladesh", value: "BD", disabled: false },
+    { name: "Barbados", value: "BB", disabled: false },
+    { name: "Belarus", value: "BY", disabled: false },
+    { name: "Belgium", value: "BE", disabled: false },
+    { name: "Belize", value: "BZ", disabled: false },
+    { name: "Benin", value: "BJ", disabled: false },
+    { name: "Bermuda", value: "BM", disabled: false },
+    { name: "Bhutan", value: "BT", disabled: false },
+    { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
+    { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
+    { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
+    { name: "Botswana", value: "BW", disabled: false },
+    { name: "Bouvet Island", value: "BV", disabled: false },
+    { name: "Brazil", value: "BR", disabled: false },
+    { name: "British Indian Ocean Territory", value: "IO", disabled: false },
+    { name: "Brunei Darussalam", value: "BN", disabled: false },
+    { name: "Bulgaria", value: "BG", disabled: false },
+    { name: "Burkina Faso", value: "BF", disabled: false },
+    { name: "Burundi", value: "BI", disabled: false },
+    { name: "Cambodia", value: "KH", disabled: false },
+    { name: "Cameroon", value: "CM", disabled: false },
+    { name: "Cape Verde", value: "CV", disabled: false },
+    { name: "Cayman Islands", value: "KY", disabled: false },
+    { name: "Central African Republic", value: "CF", disabled: false },
+    { name: "Chad", value: "TD", disabled: false },
+    { name: "Chile", value: "CL", disabled: false },
+    { name: "Christmas Island", value: "CX", disabled: false },
+    { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
+    { name: "Colombia", value: "CO", disabled: false },
+    { name: "Comoros", value: "KM", disabled: false },
+    { name: "Congo", value: "CG", disabled: false },
+    { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
+    { name: "Cook Islands", value: "CK", disabled: false },
+    { name: "Costa Rica", value: "CR", disabled: false },
+    { name: "Côte d'Ivoire", value: "CI", disabled: false },
+    { name: "Croatia", value: "HR", disabled: false },
+    { name: "Cuba", value: "CU", disabled: false },
+    { name: "Curaçao", value: "CW", disabled: false },
+    { name: "Cyprus", value: "CY", disabled: false },
+    { name: "Czech Republic", value: "CZ", disabled: false },
+    { name: "Denmark", value: "DK", disabled: false },
+    { name: "Djibouti", value: "DJ", disabled: false },
+    { name: "Dominica", value: "DM", disabled: false },
+    { name: "Dominican Republic", value: "DO", disabled: false },
+    { name: "Ecuador", value: "EC", disabled: false },
+    { name: "Egypt", value: "EG", disabled: false },
+    { name: "El Salvador", value: "SV", disabled: false },
+    { name: "Equatorial Guinea", value: "GQ", disabled: false },
+    { name: "Eritrea", value: "ER", disabled: false },
+    { name: "Estonia", value: "EE", disabled: false },
+    { name: "Ethiopia", value: "ET", disabled: false },
+    { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
+    { name: "Faroe Islands", value: "FO", disabled: false },
+    { name: "Fiji", value: "FJ", disabled: false },
+    { name: "Finland", value: "FI", disabled: false },
+    { name: "French Guiana", value: "GF", disabled: false },
+    { name: "French Polynesia", value: "PF", disabled: false },
+    { name: "French Southern Territories", value: "TF", disabled: false },
+    { name: "Gabon", value: "GA", disabled: false },
+    { name: "Gambia", value: "GM", disabled: false },
+    { name: "Georgia", value: "GE", disabled: false },
+    { name: "Ghana", value: "GH", disabled: false },
+    { name: "Gibraltar", value: "GI", disabled: false },
+    { name: "Greece", value: "GR", disabled: false },
+    { name: "Greenland", value: "GL", disabled: false },
+    { name: "Grenada", value: "GD", disabled: false },
+    { name: "Guadeloupe", value: "GP", disabled: false },
+    { name: "Guam", value: "GU", disabled: false },
+    { name: "Guatemala", value: "GT", disabled: false },
+    { name: "Guernsey", value: "GG", disabled: false },
+    { name: "Guinea", value: "GN", disabled: false },
+    { name: "Guinea-Bissau", value: "GW", disabled: false },
+    { name: "Guyana", value: "GY", disabled: false },
+    { name: "Haiti", value: "HT", disabled: false },
+    { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
+    { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
+    { name: "Honduras", value: "HN", disabled: false },
+    { name: "Hong Kong", value: "HK", disabled: false },
+    { name: "Hungary", value: "HU", disabled: false },
+    { name: "Iceland", value: "IS", disabled: false },
+    { name: "Indonesia", value: "ID", disabled: false },
+    { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
+    { name: "Iraq", value: "IQ", disabled: false },
+    { name: "Ireland", value: "IE", disabled: false },
+    { name: "Isle of Man", value: "IM", disabled: false },
+    { name: "Israel", value: "IL", disabled: false },
+    { name: "Italy", value: "IT", disabled: false },
+    { name: "Jamaica", value: "JM", disabled: false },
+    { name: "Japan", value: "JP", disabled: false },
+    { name: "Jersey", value: "JE", disabled: false },
+    { name: "Jordan", value: "JO", disabled: false },
+    { name: "Kazakhstan", value: "KZ", disabled: false },
+    { name: "Kenya", value: "KE", disabled: false },
+    { name: "Kiribati", value: "KI", disabled: false },
+    { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
+    { name: "Korea, Republic of", value: "KR", disabled: false },
+    { name: "Kuwait", value: "KW", disabled: false },
+    { name: "Kyrgyzstan", value: "KG", disabled: false },
+    { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
+    { name: "Latvia", value: "LV", disabled: false },
+    { name: "Lebanon", value: "LB", disabled: false },
+    { name: "Lesotho", value: "LS", disabled: false },
+    { name: "Liberia", value: "LR", disabled: false },
+    { name: "Libya", value: "LY", disabled: false },
+    { name: "Liechtenstein", value: "LI", disabled: false },
+    { name: "Lithuania", value: "LT", disabled: false },
+    { name: "Luxembourg", value: "LU", disabled: false },
+    { name: "Macao", value: "MO", disabled: false },
+    { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
+    { name: "Madagascar", value: "MG", disabled: false },
+    { name: "Malawi", value: "MW", disabled: false },
+    { name: "Malaysia", value: "MY", disabled: false },
+    { name: "Maldives", value: "MV", disabled: false },
+    { name: "Mali", value: "ML", disabled: false },
+    { name: "Malta", value: "MT", disabled: false },
+    { name: "Marshall Islands", value: "MH", disabled: false },
+    { name: "Martinique", value: "MQ", disabled: false },
+    { name: "Mauritania", value: "MR", disabled: false },
+    { name: "Mauritius", value: "MU", disabled: false },
+    { name: "Mayotte", value: "YT", disabled: false },
+    { name: "Mexico", value: "MX", disabled: false },
+    { name: "Micronesia, Federated States of", value: "FM", disabled: false },
+    { name: "Moldova, Republic of", value: "MD", disabled: false },
+    { name: "Monaco", value: "MC", disabled: false },
+    { name: "Mongolia", value: "MN", disabled: false },
+    { name: "Montenegro", value: "ME", disabled: false },
+    { name: "Montserrat", value: "MS", disabled: false },
+    { name: "Morocco", value: "MA", disabled: false },
+    { name: "Mozambique", value: "MZ", disabled: false },
+    { name: "Myanmar", value: "MM", disabled: false },
+    { name: "Namibia", value: "NA", disabled: false },
+    { name: "Nauru", value: "NR", disabled: false },
+    { name: "Nepal", value: "NP", disabled: false },
+    { name: "Netherlands", value: "NL", disabled: false },
+    { name: "New Caledonia", value: "NC", disabled: false },
+    { name: "New Zealand", value: "NZ", disabled: false },
+    { name: "Nicaragua", value: "NI", disabled: false },
+    { name: "Niger", value: "NE", disabled: false },
+    { name: "Nigeria", value: "NG", disabled: false },
+    { name: "Niue", value: "NU", disabled: false },
+    { name: "Norfolk Island", value: "NF", disabled: false },
+    { name: "Northern Mariana Islands", value: "MP", disabled: false },
+    { name: "Norway", value: "NO", disabled: false },
+    { name: "Oman", value: "OM", disabled: false },
+    { name: "Pakistan", value: "PK", disabled: false },
+    { name: "Palau", value: "PW", disabled: false },
+    { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
+    { name: "Panama", value: "PA", disabled: false },
+    { name: "Papua New Guinea", value: "PG", disabled: false },
+    { name: "Paraguay", value: "PY", disabled: false },
+    { name: "Peru", value: "PE", disabled: false },
+    { name: "Philippines", value: "PH", disabled: false },
+    { name: "Pitcairn", value: "PN", disabled: false },
+    { name: "Poland", value: "PL", disabled: false },
+    { name: "Portugal", value: "PT", disabled: false },
+    { name: "Puerto Rico", value: "PR", disabled: false },
+    { name: "Qatar", value: "QA", disabled: false },
+    { name: "Réunion", value: "RE", disabled: false },
+    { name: "Romania", value: "RO", disabled: false },
+    { name: "Russian Federation", value: "RU", disabled: false },
+    { name: "Rwanda", value: "RW", disabled: false },
+    { name: "Saint Barthélemy", value: "BL", disabled: false },
+    { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
+    { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
+    { name: "Saint Lucia", value: "LC", disabled: false },
+    { name: "Saint Martin (French part)", value: "MF", disabled: false },
+    { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
+    { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
+    { name: "Samoa", value: "WS", disabled: false },
+    { name: "San Marino", value: "SM", disabled: false },
+    { name: "Sao Tome and Principe", value: "ST", disabled: false },
+    { name: "Saudi Arabia", value: "SA", disabled: false },
+    { name: "Senegal", value: "SN", disabled: false },
+    { name: "Serbia", value: "RS", disabled: false },
+    { name: "Seychelles", value: "SC", disabled: false },
+    { name: "Sierra Leone", value: "SL", disabled: false },
+    { name: "Singapore", value: "SG", disabled: false },
+    { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
+    { name: "Slovakia", value: "SK", disabled: false },
+    { name: "Slovenia", value: "SI", disabled: false },
+    { name: "Solomon Islands", value: "SB", disabled: false },
+    { name: "Somalia", value: "SO", disabled: false },
+    { name: "South Africa", value: "ZA", disabled: false },
+    { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
+    { name: "South Sudan", value: "SS", disabled: false },
+    { name: "Spain", value: "ES", disabled: false },
+    { name: "Sri Lanka", value: "LK", disabled: false },
+    { name: "Sudan", value: "SD", disabled: false },
+    { name: "Suriname", value: "SR", disabled: false },
+    { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
+    { name: "Swaziland", value: "SZ", disabled: false },
+    { name: "Sweden", value: "SE", disabled: false },
+    { name: "Switzerland", value: "CH", disabled: false },
+    { name: "Syrian Arab Republic", value: "SY", disabled: false },
+    { name: "Taiwan", value: "TW", disabled: false },
+    { name: "Tajikistan", value: "TJ", disabled: false },
+    { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
+    { name: "Thailand", value: "TH", disabled: false },
+    { name: "Timor-Leste", value: "TL", disabled: false },
+    { name: "Togo", value: "TG", disabled: false },
+    { name: "Tokelau", value: "TK", disabled: false },
+    { name: "Tonga", value: "TO", disabled: false },
+    { name: "Trinidad and Tobago", value: "TT", disabled: false },
+    { name: "Tunisia", value: "TN", disabled: false },
+    { name: "Turkey", value: "TR", disabled: false },
+    { name: "Turkmenistan", value: "TM", disabled: false },
+    { name: "Turks and Caicos Islands", value: "TC", disabled: false },
+    { name: "Tuvalu", value: "TV", disabled: false },
+    { name: "Uganda", value: "UG", disabled: false },
+    { name: "Ukraine", value: "UA", disabled: false },
+    { name: "United Arab Emirates", value: "AE", disabled: false },
+    { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
+    { name: "Uruguay", value: "UY", disabled: false },
+    { name: "Uzbekistan", value: "UZ", disabled: false },
+    { name: "Vanuatu", value: "VU", disabled: false },
+    { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
+    { name: "Viet Nam", value: "VN", disabled: false },
+    { name: "Virgin Islands, British", value: "VG", disabled: false },
+    { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
+    { name: "Wallis and Futuna", value: "WF", disabled: false },
+    { name: "Western Sahara", value: "EH", disabled: false },
+    { name: "Yemen", value: "YE", disabled: false },
+    { name: "Zambia", value: "ZM", disabled: false },
+    { name: "Zimbabwe", value: "ZW", disabled: false },
+  ];
+
+  private taxSupportedCountryCodes: string[] = [
+    "CN",
+    "FR",
+    "DE",
+    "CA",
+    "GB",
+    "AU",
+    "IN",
+    "AD",
+    "AR",
+    "AT",
+    "BE",
+    "BO",
+    "BR",
+    "BG",
+    "CL",
+    "CO",
+    "CR",
+    "HR",
+    "CY",
+    "CZ",
+    "DK",
+    "DO",
+    "EC",
+    "EG",
+    "SV",
+    "EE",
+    "FI",
+    "GE",
+    "GR",
+    "HK",
+    "HU",
+    "IS",
+    "ID",
+    "IQ",
+    "IE",
+    "IL",
+    "IT",
+    "JP",
+    "KE",
+    "KR",
+    "LV",
+    "LI",
+    "LT",
+    "LU",
+    "MY",
+    "MT",
+    "MX",
+    "NL",
+    "NZ",
+    "NO",
+    "PE",
+    "PH",
+    "PL",
+    "PT",
+    "RO",
+    "RU",
+    "SA",
+    "RS",
+    "SG",
+    "SK",
+    "SI",
+    "ZA",
+    "ES",
+    "SE",
+    "CH",
+    "TW",
+    "TH",
+    "TR",
+    "UA",
+    "AE",
+    "UY",
+    "VE",
+    "VN",
+  ];
 }
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 4b876db247d..a43f1fa07a8 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -134,13 +134,11 @@ import {
 import { AccountBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/account/account-billing-api.service.abstraction";
 import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service";
 import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
 import { AccountBillingApiService } from "@bitwarden/common/billing/services/account/account-billing-api.service";
 import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service";
 import { BillingApiService } from "@bitwarden/common/billing/services/billing-api.service";
 import { OrganizationBillingApiService } from "@bitwarden/common/billing/services/organization/organization-billing-api.service";
 import { OrganizationBillingService } from "@bitwarden/common/billing/services/organization-billing.service";
-import { TaxService } from "@bitwarden/common/billing/services/tax.service";
 import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { BulkEncryptService } from "@bitwarden/common/platform/abstractions/bulk-encrypt.service";
@@ -1264,11 +1262,6 @@ const safeProviders: SafeProvider[] = [
     useClass: BillingApiService,
     deps: [ApiServiceAbstraction, LogService, ToastService],
   }),
-  safeProvider({
-    provide: TaxServiceAbstraction,
-    useClass: TaxService,
-    deps: [ApiServiceAbstraction],
-  }),
   safeProvider({
     provide: BillingAccountProfileStateService,
     useClass: DefaultBillingAccountProfileStateService,
diff --git a/libs/common/src/billing/abstractions/tax.service.abstraction.ts b/libs/common/src/billing/abstractions/tax.service.abstraction.ts
deleted file mode 100644
index fea4618bc02..00000000000
--- a/libs/common/src/billing/abstractions/tax.service.abstraction.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { CountryListItem } from "@bitwarden/common/billing/models/domain";
-import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
-import { PreviewInvoiceResponse } from "@bitwarden/common/billing/models/response/preview-invoice.response";
-
-export abstract class TaxServiceAbstraction {
-  getCountries: () => CountryListItem[];
-
-  isCountrySupported: (country: string) => Promise<boolean>;
-
-  previewIndividualInvoice: (
-    request: PreviewIndividualInvoiceRequest,
-  ) => Promise<PreviewInvoiceResponse>;
-
-  previewOrganizationInvoice: (
-    request: PreviewOrganizationInvoiceRequest,
-  ) => Promise<PreviewInvoiceResponse>;
-}
diff --git a/libs/common/src/billing/models/domain/country-list-item.ts b/libs/common/src/billing/models/domain/country-list-item.ts
deleted file mode 100644
index 79abb96871c..00000000000
--- a/libs/common/src/billing/models/domain/country-list-item.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type CountryListItem = {
-  name: string;
-  value: string;
-  disabled: boolean;
-};
diff --git a/libs/common/src/billing/models/domain/index.ts b/libs/common/src/billing/models/domain/index.ts
index 057f6dc4e84..0f53c3e116c 100644
--- a/libs/common/src/billing/models/domain/index.ts
+++ b/libs/common/src/billing/models/domain/index.ts
@@ -1,3 +1,2 @@
 export * from "./bank-account";
-export * from "./country-list-item";
 export * from "./tax-information";
diff --git a/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts b/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
index 0cedc5d8e67..f06795c0805 100644
--- a/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
+++ b/libs/common/src/billing/models/request/expanded-tax-info-update.request.ts
@@ -10,10 +10,6 @@ export class ExpandedTaxInfoUpdateRequest extends TaxInfoUpdateRequest {
   state: string;
 
   static From(taxInformation: TaxInformation): ExpandedTaxInfoUpdateRequest {
-    if (!taxInformation) {
-      return null;
-    }
-
     const request = new ExpandedTaxInfoUpdateRequest();
     request.country = taxInformation.country;
     request.postalCode = taxInformation.postalCode;
diff --git a/libs/common/src/billing/models/request/preview-individual-invoice.request.ts b/libs/common/src/billing/models/request/preview-individual-invoice.request.ts
deleted file mode 100644
index 67b7b2f3ee6..00000000000
--- a/libs/common/src/billing/models/request/preview-individual-invoice.request.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export class PreviewIndividualInvoiceRequest {
-  passwordManager: PasswordManager;
-  taxInformation: TaxInformation;
-}
-
-class PasswordManager {
-  additionalStorage: number;
-}
-
-class TaxInformation {
-  postalCode: string;
-  country: string;
-  taxId: string;
-}
diff --git a/libs/common/src/billing/models/request/preview-organization-invoice.request.ts b/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
deleted file mode 100644
index 2fe2526fdce..00000000000
--- a/libs/common/src/billing/models/request/preview-organization-invoice.request.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { PlanType } from "@bitwarden/common/billing/enums";
-
-export class PreviewOrganizationInvoiceRequest {
-  organizationId?: string;
-  passwordManager: PasswordManager;
-  secretsManager?: SecretsManager;
-  taxInformation: TaxInformation;
-}
-
-class PasswordManager {
-  plan: PlanType;
-  seats: number;
-  additionalStorage: number;
-}
-
-class SecretsManager {
-  seats: number;
-  additionalMachineAccounts: number;
-}
-
-class TaxInformation {
-  postalCode: string;
-  country: string;
-  taxId: string;
-}
diff --git a/libs/common/src/billing/models/response/preview-invoice.response.ts b/libs/common/src/billing/models/response/preview-invoice.response.ts
deleted file mode 100644
index c822a569bb3..00000000000
--- a/libs/common/src/billing/models/response/preview-invoice.response.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
-
-export class PreviewInvoiceResponse extends BaseResponse {
-  effectiveTaxRate: number;
-  taxableBaseAmount: number;
-  taxAmount: number;
-  totalAmount: number;
-
-  constructor(response: any) {
-    super(response);
-    this.effectiveTaxRate = this.getResponseProperty("EffectiveTaxRate");
-    this.taxableBaseAmount = this.getResponseProperty("TaxableBaseAmount");
-    this.taxAmount = this.getResponseProperty("TaxAmount");
-    this.totalAmount = this.getResponseProperty("TotalAmount");
-  }
-}
diff --git a/libs/common/src/billing/models/response/tax-id-types.response.ts b/libs/common/src/billing/models/response/tax-id-types.response.ts
deleted file mode 100644
index 0d5cce46c8c..00000000000
--- a/libs/common/src/billing/models/response/tax-id-types.response.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { BaseResponse } from "@bitwarden/common/models/response/base.response";
-
-export class TaxIdTypesResponse extends BaseResponse {
-  taxIdTypes: TaxIdTypeResponse[] = [];
-
-  constructor(response: any) {
-    super(response);
-    const taxIdTypes = this.getResponseProperty("TaxIdTypes");
-    if (taxIdTypes && taxIdTypes.length) {
-      this.taxIdTypes = taxIdTypes.map((t: any) => new TaxIdTypeResponse(t));
-    }
-  }
-}
-
-export class TaxIdTypeResponse extends BaseResponse {
-  code: string;
-  country: string;
-  description: string;
-  example: string;
-
-  constructor(response: any) {
-    super(response);
-    this.code = this.getResponseProperty("Code");
-    this.country = this.getResponseProperty("Country");
-    this.description = this.getResponseProperty("Description");
-    this.example = this.getResponseProperty("Example");
-  }
-}
diff --git a/libs/common/src/billing/services/tax.service.ts b/libs/common/src/billing/services/tax.service.ts
deleted file mode 100644
index 45e57267ec0..00000000000
--- a/libs/common/src/billing/services/tax.service.ts
+++ /dev/null
@@ -1,303 +0,0 @@
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { TaxServiceAbstraction } from "@bitwarden/common/billing/abstractions/tax.service.abstraction";
-import { CountryListItem } from "@bitwarden/common/billing/models/domain";
-import { PreviewIndividualInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-individual-invoice.request";
-import { PreviewOrganizationInvoiceRequest } from "@bitwarden/common/billing/models/request/preview-organization-invoice.request";
-import { PreviewInvoiceResponse } from "@bitwarden/common/billing/models/response/preview-invoice.response";
-
-export class TaxService implements TaxServiceAbstraction {
-  constructor(private apiService: ApiService) {}
-
-  getCountries(): CountryListItem[] {
-    return [
-      { name: "-- Select --", value: "", disabled: false },
-      { name: "United States", value: "US", disabled: false },
-      { name: "China", value: "CN", disabled: false },
-      { name: "France", value: "FR", disabled: false },
-      { name: "Germany", value: "DE", disabled: false },
-      { name: "Canada", value: "CA", disabled: false },
-      { name: "United Kingdom", value: "GB", disabled: false },
-      { name: "Australia", value: "AU", disabled: false },
-      { name: "India", value: "IN", disabled: false },
-      { name: "", value: "-", disabled: true },
-      { name: "Afghanistan", value: "AF", disabled: false },
-      { name: "Åland Islands", value: "AX", disabled: false },
-      { name: "Albania", value: "AL", disabled: false },
-      { name: "Algeria", value: "DZ", disabled: false },
-      { name: "American Samoa", value: "AS", disabled: false },
-      { name: "Andorra", value: "AD", disabled: false },
-      { name: "Angola", value: "AO", disabled: false },
-      { name: "Anguilla", value: "AI", disabled: false },
-      { name: "Antarctica", value: "AQ", disabled: false },
-      { name: "Antigua and Barbuda", value: "AG", disabled: false },
-      { name: "Argentina", value: "AR", disabled: false },
-      { name: "Armenia", value: "AM", disabled: false },
-      { name: "Aruba", value: "AW", disabled: false },
-      { name: "Austria", value: "AT", disabled: false },
-      { name: "Azerbaijan", value: "AZ", disabled: false },
-      { name: "Bahamas", value: "BS", disabled: false },
-      { name: "Bahrain", value: "BH", disabled: false },
-      { name: "Bangladesh", value: "BD", disabled: false },
-      { name: "Barbados", value: "BB", disabled: false },
-      { name: "Belarus", value: "BY", disabled: false },
-      { name: "Belgium", value: "BE", disabled: false },
-      { name: "Belize", value: "BZ", disabled: false },
-      { name: "Benin", value: "BJ", disabled: false },
-      { name: "Bermuda", value: "BM", disabled: false },
-      { name: "Bhutan", value: "BT", disabled: false },
-      { name: "Bolivia, Plurinational State of", value: "BO", disabled: false },
-      { name: "Bonaire, Sint Eustatius and Saba", value: "BQ", disabled: false },
-      { name: "Bosnia and Herzegovina", value: "BA", disabled: false },
-      { name: "Botswana", value: "BW", disabled: false },
-      { name: "Bouvet Island", value: "BV", disabled: false },
-      { name: "Brazil", value: "BR", disabled: false },
-      { name: "British Indian Ocean Territory", value: "IO", disabled: false },
-      { name: "Brunei Darussalam", value: "BN", disabled: false },
-      { name: "Bulgaria", value: "BG", disabled: false },
-      { name: "Burkina Faso", value: "BF", disabled: false },
-      { name: "Burundi", value: "BI", disabled: false },
-      { name: "Cambodia", value: "KH", disabled: false },
-      { name: "Cameroon", value: "CM", disabled: false },
-      { name: "Cape Verde", value: "CV", disabled: false },
-      { name: "Cayman Islands", value: "KY", disabled: false },
-      { name: "Central African Republic", value: "CF", disabled: false },
-      { name: "Chad", value: "TD", disabled: false },
-      { name: "Chile", value: "CL", disabled: false },
-      { name: "Christmas Island", value: "CX", disabled: false },
-      { name: "Cocos (Keeling) Islands", value: "CC", disabled: false },
-      { name: "Colombia", value: "CO", disabled: false },
-      { name: "Comoros", value: "KM", disabled: false },
-      { name: "Congo", value: "CG", disabled: false },
-      { name: "Congo, the Democratic Republic of the", value: "CD", disabled: false },
-      { name: "Cook Islands", value: "CK", disabled: false },
-      { name: "Costa Rica", value: "CR", disabled: false },
-      { name: "Côte d'Ivoire", value: "CI", disabled: false },
-      { name: "Croatia", value: "HR", disabled: false },
-      { name: "Cuba", value: "CU", disabled: false },
-      { name: "Curaçao", value: "CW", disabled: false },
-      { name: "Cyprus", value: "CY", disabled: false },
-      { name: "Czech Republic", value: "CZ", disabled: false },
-      { name: "Denmark", value: "DK", disabled: false },
-      { name: "Djibouti", value: "DJ", disabled: false },
-      { name: "Dominica", value: "DM", disabled: false },
-      { name: "Dominican Republic", value: "DO", disabled: false },
-      { name: "Ecuador", value: "EC", disabled: false },
-      { name: "Egypt", value: "EG", disabled: false },
-      { name: "El Salvador", value: "SV", disabled: false },
-      { name: "Equatorial Guinea", value: "GQ", disabled: false },
-      { name: "Eritrea", value: "ER", disabled: false },
-      { name: "Estonia", value: "EE", disabled: false },
-      { name: "Ethiopia", value: "ET", disabled: false },
-      { name: "Falkland Islands (Malvinas)", value: "FK", disabled: false },
-      { name: "Faroe Islands", value: "FO", disabled: false },
-      { name: "Fiji", value: "FJ", disabled: false },
-      { name: "Finland", value: "FI", disabled: false },
-      { name: "French Guiana", value: "GF", disabled: false },
-      { name: "French Polynesia", value: "PF", disabled: false },
-      { name: "French Southern Territories", value: "TF", disabled: false },
-      { name: "Gabon", value: "GA", disabled: false },
-      { name: "Gambia", value: "GM", disabled: false },
-      { name: "Georgia", value: "GE", disabled: false },
-      { name: "Ghana", value: "GH", disabled: false },
-      { name: "Gibraltar", value: "GI", disabled: false },
-      { name: "Greece", value: "GR", disabled: false },
-      { name: "Greenland", value: "GL", disabled: false },
-      { name: "Grenada", value: "GD", disabled: false },
-      { name: "Guadeloupe", value: "GP", disabled: false },
-      { name: "Guam", value: "GU", disabled: false },
-      { name: "Guatemala", value: "GT", disabled: false },
-      { name: "Guernsey", value: "GG", disabled: false },
-      { name: "Guinea", value: "GN", disabled: false },
-      { name: "Guinea-Bissau", value: "GW", disabled: false },
-      { name: "Guyana", value: "GY", disabled: false },
-      { name: "Haiti", value: "HT", disabled: false },
-      { name: "Heard Island and McDonald Islands", value: "HM", disabled: false },
-      { name: "Holy See (Vatican City State)", value: "VA", disabled: false },
-      { name: "Honduras", value: "HN", disabled: false },
-      { name: "Hong Kong", value: "HK", disabled: false },
-      { name: "Hungary", value: "HU", disabled: false },
-      { name: "Iceland", value: "IS", disabled: false },
-      { name: "Indonesia", value: "ID", disabled: false },
-      { name: "Iran, Islamic Republic of", value: "IR", disabled: false },
-      { name: "Iraq", value: "IQ", disabled: false },
-      { name: "Ireland", value: "IE", disabled: false },
-      { name: "Isle of Man", value: "IM", disabled: false },
-      { name: "Israel", value: "IL", disabled: false },
-      { name: "Italy", value: "IT", disabled: false },
-      { name: "Jamaica", value: "JM", disabled: false },
-      { name: "Japan", value: "JP", disabled: false },
-      { name: "Jersey", value: "JE", disabled: false },
-      { name: "Jordan", value: "JO", disabled: false },
-      { name: "Kazakhstan", value: "KZ", disabled: false },
-      { name: "Kenya", value: "KE", disabled: false },
-      { name: "Kiribati", value: "KI", disabled: false },
-      { name: "Korea, Democratic People's Republic of", value: "KP", disabled: false },
-      { name: "Korea, Republic of", value: "KR", disabled: false },
-      { name: "Kuwait", value: "KW", disabled: false },
-      { name: "Kyrgyzstan", value: "KG", disabled: false },
-      { name: "Lao People's Democratic Republic", value: "LA", disabled: false },
-      { name: "Latvia", value: "LV", disabled: false },
-      { name: "Lebanon", value: "LB", disabled: false },
-      { name: "Lesotho", value: "LS", disabled: false },
-      { name: "Liberia", value: "LR", disabled: false },
-      { name: "Libya", value: "LY", disabled: false },
-      { name: "Liechtenstein", value: "LI", disabled: false },
-      { name: "Lithuania", value: "LT", disabled: false },
-      { name: "Luxembourg", value: "LU", disabled: false },
-      { name: "Macao", value: "MO", disabled: false },
-      { name: "Macedonia, the former Yugoslav Republic of", value: "MK", disabled: false },
-      { name: "Madagascar", value: "MG", disabled: false },
-      { name: "Malawi", value: "MW", disabled: false },
-      { name: "Malaysia", value: "MY", disabled: false },
-      { name: "Maldives", value: "MV", disabled: false },
-      { name: "Mali", value: "ML", disabled: false },
-      { name: "Malta", value: "MT", disabled: false },
-      { name: "Marshall Islands", value: "MH", disabled: false },
-      { name: "Martinique", value: "MQ", disabled: false },
-      { name: "Mauritania", value: "MR", disabled: false },
-      { name: "Mauritius", value: "MU", disabled: false },
-      { name: "Mayotte", value: "YT", disabled: false },
-      { name: "Mexico", value: "MX", disabled: false },
-      { name: "Micronesia, Federated States of", value: "FM", disabled: false },
-      { name: "Moldova, Republic of", value: "MD", disabled: false },
-      { name: "Monaco", value: "MC", disabled: false },
-      { name: "Mongolia", value: "MN", disabled: false },
-      { name: "Montenegro", value: "ME", disabled: false },
-      { name: "Montserrat", value: "MS", disabled: false },
-      { name: "Morocco", value: "MA", disabled: false },
-      { name: "Mozambique", value: "MZ", disabled: false },
-      { name: "Myanmar", value: "MM", disabled: false },
-      { name: "Namibia", value: "NA", disabled: false },
-      { name: "Nauru", value: "NR", disabled: false },
-      { name: "Nepal", value: "NP", disabled: false },
-      { name: "Netherlands", value: "NL", disabled: false },
-      { name: "New Caledonia", value: "NC", disabled: false },
-      { name: "New Zealand", value: "NZ", disabled: false },
-      { name: "Nicaragua", value: "NI", disabled: false },
-      { name: "Niger", value: "NE", disabled: false },
-      { name: "Nigeria", value: "NG", disabled: false },
-      { name: "Niue", value: "NU", disabled: false },
-      { name: "Norfolk Island", value: "NF", disabled: false },
-      { name: "Northern Mariana Islands", value: "MP", disabled: false },
-      { name: "Norway", value: "NO", disabled: false },
-      { name: "Oman", value: "OM", disabled: false },
-      { name: "Pakistan", value: "PK", disabled: false },
-      { name: "Palau", value: "PW", disabled: false },
-      { name: "Palestinian Territory, Occupied", value: "PS", disabled: false },
-      { name: "Panama", value: "PA", disabled: false },
-      { name: "Papua New Guinea", value: "PG", disabled: false },
-      { name: "Paraguay", value: "PY", disabled: false },
-      { name: "Peru", value: "PE", disabled: false },
-      { name: "Philippines", value: "PH", disabled: false },
-      { name: "Pitcairn", value: "PN", disabled: false },
-      { name: "Poland", value: "PL", disabled: false },
-      { name: "Portugal", value: "PT", disabled: false },
-      { name: "Puerto Rico", value: "PR", disabled: false },
-      { name: "Qatar", value: "QA", disabled: false },
-      { name: "Réunion", value: "RE", disabled: false },
-      { name: "Romania", value: "RO", disabled: false },
-      { name: "Russian Federation", value: "RU", disabled: false },
-      { name: "Rwanda", value: "RW", disabled: false },
-      { name: "Saint Barthélemy", value: "BL", disabled: false },
-      { name: "Saint Helena, Ascension and Tristan da Cunha", value: "SH", disabled: false },
-      { name: "Saint Kitts and Nevis", value: "KN", disabled: false },
-      { name: "Saint Lucia", value: "LC", disabled: false },
-      { name: "Saint Martin (French part)", value: "MF", disabled: false },
-      { name: "Saint Pierre and Miquelon", value: "PM", disabled: false },
-      { name: "Saint Vincent and the Grenadines", value: "VC", disabled: false },
-      { name: "Samoa", value: "WS", disabled: false },
-      { name: "San Marino", value: "SM", disabled: false },
-      { name: "Sao Tome and Principe", value: "ST", disabled: false },
-      { name: "Saudi Arabia", value: "SA", disabled: false },
-      { name: "Senegal", value: "SN", disabled: false },
-      { name: "Serbia", value: "RS", disabled: false },
-      { name: "Seychelles", value: "SC", disabled: false },
-      { name: "Sierra Leone", value: "SL", disabled: false },
-      { name: "Singapore", value: "SG", disabled: false },
-      { name: "Sint Maarten (Dutch part)", value: "SX", disabled: false },
-      { name: "Slovakia", value: "SK", disabled: false },
-      { name: "Slovenia", value: "SI", disabled: false },
-      { name: "Solomon Islands", value: "SB", disabled: false },
-      { name: "Somalia", value: "SO", disabled: false },
-      { name: "South Africa", value: "ZA", disabled: false },
-      { name: "South Georgia and the South Sandwich Islands", value: "GS", disabled: false },
-      { name: "South Sudan", value: "SS", disabled: false },
-      { name: "Spain", value: "ES", disabled: false },
-      { name: "Sri Lanka", value: "LK", disabled: false },
-      { name: "Sudan", value: "SD", disabled: false },
-      { name: "Suriname", value: "SR", disabled: false },
-      { name: "Svalbard and Jan Mayen", value: "SJ", disabled: false },
-      { name: "Swaziland", value: "SZ", disabled: false },
-      { name: "Sweden", value: "SE", disabled: false },
-      { name: "Switzerland", value: "CH", disabled: false },
-      { name: "Syrian Arab Republic", value: "SY", disabled: false },
-      { name: "Taiwan", value: "TW", disabled: false },
-      { name: "Tajikistan", value: "TJ", disabled: false },
-      { name: "Tanzania, United Republic of", value: "TZ", disabled: false },
-      { name: "Thailand", value: "TH", disabled: false },
-      { name: "Timor-Leste", value: "TL", disabled: false },
-      { name: "Togo", value: "TG", disabled: false },
-      { name: "Tokelau", value: "TK", disabled: false },
-      { name: "Tonga", value: "TO", disabled: false },
-      { name: "Trinidad and Tobago", value: "TT", disabled: false },
-      { name: "Tunisia", value: "TN", disabled: false },
-      { name: "Turkey", value: "TR", disabled: false },
-      { name: "Turkmenistan", value: "TM", disabled: false },
-      { name: "Turks and Caicos Islands", value: "TC", disabled: false },
-      { name: "Tuvalu", value: "TV", disabled: false },
-      { name: "Uganda", value: "UG", disabled: false },
-      { name: "Ukraine", value: "UA", disabled: false },
-      { name: "United Arab Emirates", value: "AE", disabled: false },
-      { name: "United States Minor Outlying Islands", value: "UM", disabled: false },
-      { name: "Uruguay", value: "UY", disabled: false },
-      { name: "Uzbekistan", value: "UZ", disabled: false },
-      { name: "Vanuatu", value: "VU", disabled: false },
-      { name: "Venezuela, Bolivarian Republic of", value: "VE", disabled: false },
-      { name: "Viet Nam", value: "VN", disabled: false },
-      { name: "Virgin Islands, British", value: "VG", disabled: false },
-      { name: "Virgin Islands, U.S.", value: "VI", disabled: false },
-      { name: "Wallis and Futuna", value: "WF", disabled: false },
-      { name: "Western Sahara", value: "EH", disabled: false },
-      { name: "Yemen", value: "YE", disabled: false },
-      { name: "Zambia", value: "ZM", disabled: false },
-      { name: "Zimbabwe", value: "ZW", disabled: false },
-    ];
-  }
-
-  async isCountrySupported(country: string): Promise<boolean> {
-    const response = await this.apiService.send(
-      "GET",
-      "/tax/is-country-supported?country=" + country,
-      null,
-      true,
-      true,
-    );
-    return response;
-  }
-
-  async previewIndividualInvoice(
-    request: PreviewIndividualInvoiceRequest,
-  ): Promise<PreviewInvoiceResponse> {
-    const response = await this.apiService.send(
-      "POST",
-      "/accounts/billing/preview-invoice",
-      request,
-      true,
-      true,
-    );
-    return new PreviewInvoiceResponse(response);
-  }
-
-  async previewOrganizationInvoice(
-    request: PreviewOrganizationInvoiceRequest,
-  ): Promise<PreviewInvoiceResponse> {
-    const response = await this.apiService.send(
-      "POST",
-      `/invoices/preview-organization`,
-      request,
-      true,
-      true,
-    );
-    return new PreviewInvoiceResponse(response);
-  }
-}

From 98702d9f5073a594b74ab27d5998d497cc6c8294 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:59:06 +0100
Subject: [PATCH 21/46] Fix the new send dropdown showing premium when it
 should not (#12242)

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 .../src/new-send-dropdown/new-send-dropdown.component.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
index 9a65f7d98c5..344348f6a90 100644
--- a/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
+++ b/libs/tools/send/send-ui/src/new-send-dropdown/new-send-dropdown.component.html
@@ -5,7 +5,7 @@
 <bit-menu #itemOptions>
   <a
     bitMenuItem
-    [routerLink]="buildRouterLink(sendType.File)"
+    [routerLink]="buildRouterLink(sendType.Text)"
     [queryParams]="buildQueryParams(sendType.Text)"
   >
     <i class="bwi bwi-file-text" slot="start" aria-hidden="true"></i>

From 80a898bd8c7ca14cd7e9d61723342ff1b92d4be9 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 4 Dec 2024 17:03:34 +0100
Subject: [PATCH 22/46] [PM-14252] Switch to oo7 and drop libsecret (#11900)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Switch to oo7 and drop libsecret

* Fix tests

* Fix windows

* Fix windows

* Fix windows

* Fix windows

* Add migration

* Update apps/desktop/desktop_native/core/src/password/unix.rs

Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>

* Remove libsecret in ci

* Move allow async to trait level

* Fix comment

* Pin oo7 dependency

---------

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
Co-authored-by: Daniel García <dani-garcia@users.noreply.github.com>
---
 .github/workflows/build-desktop.yml           |   2 +-
 .github/workflows/release-desktop-beta.yml    |   2 +-
 apps/desktop/desktop_native/Cargo.lock        | 312 +++++++-----------
 apps/desktop/desktop_native/core/Cargo.toml   |  20 +-
 .../core/src/biometric/macos.rs               |   4 +-
 .../desktop_native/core/src/biometric/mod.rs  |   7 +-
 .../desktop_native/core/src/biometric/unix.rs |   8 +-
 .../core/src/biometric/windows.rs             |  42 ++-
 .../desktop_native/core/src/password/macos.rs |  31 +-
 .../desktop_native/core/src/password/unix.rs  | 154 ++++-----
 .../core/src/password/windows.rs              |  69 +---
 apps/desktop/desktop_native/napi/index.d.ts   |   2 -
 apps/desktop/desktop_native/napi/src/lib.rs   |  17 +-
 apps/desktop/electron-builder.json            |   2 +-
 14 files changed, 278 insertions(+), 394 deletions(-)

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index dc15f841c2b..bc9bdec396a 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -170,7 +170,7 @@ jobs:
       - name: Set up environment
         run: |
           sudo apt-get update
-          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm musl-dev musl-tools flatpak flatpak-builder
+          sudo apt-get -y install pkg-config libxss-dev rpm musl-dev musl-tools flatpak flatpak-builder
 
       - name: Set up Snap
         run: sudo snap install snapcraft --classic
diff --git a/.github/workflows/release-desktop-beta.yml b/.github/workflows/release-desktop-beta.yml
index c1646997201..a940ce289ff 100644
--- a/.github/workflows/release-desktop-beta.yml
+++ b/.github/workflows/release-desktop-beta.yml
@@ -138,7 +138,7 @@ jobs:
       - name: Set up environment
         run: |
           sudo apt-get update
-          sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm
+          sudo apt-get -y install pkg-config libxss-dev rpm
 
       - name: Set up Snap
         run: sudo snap install snapcraft --classic
diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index 5e6a697c6cb..82dbebb12df 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -36,6 +36,7 @@ dependencies = [
  "cfg-if",
  "cipher",
  "cpufeatures",
+ "zeroize",
 ]
 
 [[package]]
@@ -174,6 +175,17 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "async-net"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7"
+dependencies = [
+ "async-io",
+ "blocking",
+ "futures-lite",
+]
+
 [[package]]
 name = "async-process"
 version = "2.3.0"
@@ -422,16 +434,6 @@ dependencies = [
  "shlex",
 ]
 
-[[package]]
-name = "cfg-expr"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
-dependencies = [
- "smallvec",
- "target-lexicon",
-]
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -469,6 +471,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
  "crypto-common",
  "inout",
+ "zeroize",
 ]
 
 [[package]]
@@ -552,6 +555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
+ "rand_core",
  "typenum",
 ]
 
@@ -692,13 +696,12 @@ dependencies = [
  "dirs",
  "ed25519",
  "futures",
- "gio",
  "homedir",
  "interprocess",
  "keytar",
  "libc",
- "libsecret",
  "log",
+ "oo7",
  "pin-project",
  "pkcs8",
  "rand",
@@ -1079,105 +1082,12 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
-[[package]]
-name = "gio"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-util",
- "gio-sys",
- "glib",
- "libc",
- "pin-project-lite",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "gio-sys"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef"
-dependencies = [
- "glib-sys",
- "gobject-sys",
- "libc",
- "system-deps",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "glib"
-version = "0.19.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "futures-util",
- "gio-sys",
- "glib-macros",
- "glib-sys",
- "gobject-sys",
- "libc",
- "memchr",
- "smallvec",
- "thiserror",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.19.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7"
-dependencies = [
- "heck",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "glib-sys"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5"
-dependencies = [
- "libc",
- "system-deps",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.19.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e"
-dependencies = [
- "glib-sys",
- "libc",
- "system-deps",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -1196,6 +1106,15 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hkdf"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
+dependencies = [
+ "hmac",
+]
+
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -1306,9 +1225,9 @@ dependencies = [
 
 [[package]]
 name = "libm"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libredox"
@@ -1320,32 +1239,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "libsecret"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50c6ccddc706a38eca477b4d7857acd6c76c7d6fba5d47b4b2e7d800e5a17194"
-dependencies = [
- "gio",
- "glib",
- "libc",
- "libsecret-sys",
-]
-
-[[package]]
-name = "libsecret-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a1af48e61f1c8e77e9705296f346e45b637754a92348a79b4c62df84d0654c2"
-dependencies = [
- "gio-sys",
- "glib-sys",
- "gobject-sys",
- "libc",
- "pkg-config",
- "system-deps",
-]
-
 [[package]]
 name = "link-cplusplus"
 version = "1.0.9"
@@ -1377,6 +1270,16 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -1512,6 +1415,30 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint-dig"
 version = "0.8.4"
@@ -1525,10 +1452,20 @@ dependencies = [
  "num-iter",
  "num-traits",
  "rand",
+ "serde",
  "smallvec",
  "zeroize",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-conv"
 version = "0.1.0"
@@ -1555,6 +1492,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -1688,6 +1636,39 @@ version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
+[[package]]
+name = "oo7"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc6ce4692fbfd044ce22ca07dcab1a30fa12432ca2aa5b1294eca50d3332a24"
+dependencies = [
+ "aes",
+ "async-fs",
+ "async-io",
+ "async-lock",
+ "async-net",
+ "blocking",
+ "cbc",
+ "cipher",
+ "digest",
+ "endi",
+ "futures-lite",
+ "futures-util",
+ "hkdf",
+ "hmac",
+ "md-5",
+ "num",
+ "num-bigint-dig",
+ "pbkdf2",
+ "rand",
+ "serde",
+ "sha2",
+ "subtle",
+ "zbus",
+ "zeroize",
+ "zvariant",
+]
+
 [[package]]
 name = "opaque-debug"
 version = "0.3.1"
@@ -2216,15 +2197,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -2394,25 +2366,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "system-deps"
-version = "6.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
-dependencies = [
- "cfg-expr",
- "heck",
- "pkg-config",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "target-lexicon"
-version = "0.12.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
-
 [[package]]
 name = "tempfile"
 version = "3.13.0"
@@ -2539,26 +2492,11 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "toml_edit"
@@ -2567,8 +2505,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
  "indexmap",
- "serde",
- "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
@@ -2662,12 +2598,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "version-compare"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
-
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -3232,6 +3162,20 @@ name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "zvariant"
diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml
index f9b58b7a27d..6e17cde2fa7 100644
--- a/apps/desktop/desktop_native/core/Cargo.toml
+++ b/apps/desktop/desktop_native/core/Cargo.toml
@@ -10,15 +10,13 @@ default = ["sys"]
 manual_test = []
 
 sys = [
-    "dep:widestring",
-    "dep:windows",
-    "dep:core-foundation",
-    "dep:security-framework",
-    "dep:security-framework-sys",
-    "dep:gio",
-    "dep:libsecret",
-    "dep:zbus",
-    "dep:zbus_polkit",
+  "dep:widestring",
+  "dep:windows",
+  "dep:core-foundation",
+  "dep:security-framework",
+  "dep:security-framework-sys",
+  "dep:zbus",
+  "dep:zbus_polkit",
 ]
 
 [dependencies]
@@ -85,7 +83,7 @@ security-framework = { version = "=3.0.0", optional = true }
 security-framework-sys = { version = "=2.12.0", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
-gio = { version = "=0.19.5", optional = true }
-libsecret = { version = "=0.5.0", optional = true }
+oo7 = "=0.3.3"
+
 zbus = { version = "=4.4.0", optional = true }
 zbus_polkit = { version = "=4.0.0", optional = true }
diff --git a/apps/desktop/desktop_native/core/src/biometric/macos.rs b/apps/desktop/desktop_native/core/src/biometric/macos.rs
index 01ee4519ce6..ec09d566e1f 100644
--- a/apps/desktop/desktop_native/core/src/biometric/macos.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/macos.rs
@@ -18,7 +18,7 @@ impl super::BiometricTrait for Biometric {
         bail!("platform not supported");
     }
 
-    fn get_biometric_secret(
+    async fn get_biometric_secret(
         _service: &str,
         _account: &str,
         _key_material: Option<KeyMaterial>,
@@ -26,7 +26,7 @@ impl super::BiometricTrait for Biometric {
         bail!("platform not supported");
     }
 
-    fn set_biometric_secret(
+    async fn set_biometric_secret(
         _service: &str,
         _account: &str,
         _secret: &str,
diff --git a/apps/desktop/desktop_native/core/src/biometric/mod.rs b/apps/desktop/desktop_native/core/src/biometric/mod.rs
index 72352cf2288..dd480f817b6 100644
--- a/apps/desktop/desktop_native/core/src/biometric/mod.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/mod.rs
@@ -22,20 +22,19 @@ pub struct OsDerivedKey {
     pub iv_b64: String,
 }
 
+#[allow(async_fn_in_trait)]
 pub trait BiometricTrait {
-    #[allow(async_fn_in_trait)]
     async fn prompt(hwnd: Vec<u8>, message: String) -> Result<bool>;
-    #[allow(async_fn_in_trait)]
     async fn available() -> Result<bool>;
     fn derive_key_material(secret: Option<&str>) -> Result<OsDerivedKey>;
-    fn set_biometric_secret(
+    async fn set_biometric_secret(
         service: &str,
         account: &str,
         secret: &str,
         key_material: Option<KeyMaterial>,
         iv_b64: &str,
     ) -> Result<String>;
-    fn get_biometric_secret(
+    async fn get_biometric_secret(
         service: &str,
         account: &str,
         key_material: Option<KeyMaterial>,
diff --git a/apps/desktop/desktop_native/core/src/biometric/unix.rs b/apps/desktop/desktop_native/core/src/biometric/unix.rs
index 563bd1dfe52..5153fc5ed87 100644
--- a/apps/desktop/desktop_native/core/src/biometric/unix.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/unix.rs
@@ -73,7 +73,7 @@ impl super::BiometricTrait for Biometric {
         Ok(OsDerivedKey { key_b64, iv_b64 })
     }
 
-    fn set_biometric_secret(
+    async fn set_biometric_secret(
         service: &str,
         account: &str,
         secret: &str,
@@ -85,11 +85,11 @@ impl super::BiometricTrait for Biometric {
         ))?;
 
         let encrypted_secret = encrypt(secret, &key_material, iv_b64)?;
-        crate::password::set_password(service, account, &encrypted_secret)?;
+        crate::password::set_password(service, account, &encrypted_secret).await?;
         Ok(encrypted_secret)
     }
 
-    fn get_biometric_secret(
+    async fn get_biometric_secret(
         service: &str,
         account: &str,
         key_material: Option<KeyMaterial>,
@@ -98,7 +98,7 @@ impl super::BiometricTrait for Biometric {
             "Key material is required for polkit protected keys"
         ))?;
 
-        let encrypted_secret = crate::password::get_password(service, account)?;
+        let encrypted_secret = crate::password::get_password(service, account).await?;
         let secret = CipherString::from_str(&encrypted_secret)?;
         return Ok(decrypt(&secret, &key_material)?);
     }
diff --git a/apps/desktop/desktop_native/core/src/biometric/windows.rs b/apps/desktop/desktop_native/core/src/biometric/windows.rs
index c951e42e260..fcc5b95cc4a 100644
--- a/apps/desktop/desktop_native/core/src/biometric/windows.rs
+++ b/apps/desktop/desktop_native/core/src/biometric/windows.rs
@@ -121,7 +121,7 @@ impl super::BiometricTrait for Biometric {
         Ok(OsDerivedKey { key_b64, iv_b64 })
     }
 
-    fn set_biometric_secret(
+    async fn set_biometric_secret(
         service: &str,
         account: &str,
         secret: &str,
@@ -133,11 +133,11 @@ impl super::BiometricTrait for Biometric {
         ))?;
 
         let encrypted_secret = encrypt(secret, &key_material, iv_b64)?;
-        crate::password::set_password(service, account, &encrypted_secret)?;
+        crate::password::set_password(service, account, &encrypted_secret).await?;
         Ok(encrypted_secret)
     }
 
-    fn get_biometric_secret(
+    async fn get_biometric_secret(
         service: &str,
         account: &str,
         key_material: Option<KeyMaterial>,
@@ -146,7 +146,7 @@ impl super::BiometricTrait for Biometric {
             "Key material is required for Windows Hello protected keys"
         ))?;
 
-        let encrypted_secret = crate::password::get_password(service, account)?;
+        let encrypted_secret = crate::password::get_password(service, account).await?;
         match CipherString::from_str(&encrypted_secret) {
             Ok(secret) => {
                 // If the secret is a CipherString, it is encrypted and we need to decrypt it.
@@ -292,9 +292,9 @@ mod tests {
         assert_eq!(decrypt(&secret, &key_material).unwrap(), "secret")
     }
 
-    #[test]
-    fn get_biometric_secret_requires_key() {
-        let result = <Biometric as BiometricTrait>::get_biometric_secret("", "", None);
+    #[tokio::test]
+    async fn get_biometric_secret_requires_key() {
+        let result = <Biometric as BiometricTrait>::get_biometric_secret("", "", None).await;
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
@@ -302,29 +302,25 @@ mod tests {
         );
     }
 
-    #[test]
-    fn get_biometric_secret_handles_unencrypted_secret() {
-        scopeguard::defer! {
-            crate::password::delete_password("test", "test").unwrap();
-        }
+    #[tokio::test]
+    async fn get_biometric_secret_handles_unencrypted_secret() {
         let test = "test";
         let secret = "password";
         let key_material = KeyMaterial {
             os_key_part_b64: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned(),
             client_key_part_b64: Some("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned()),
         };
-        crate::password::set_password(test, test, secret).unwrap();
+        crate::password::set_password(test, test, secret).await.unwrap();
         let result =
             <Biometric as BiometricTrait>::get_biometric_secret(test, test, Some(key_material))
+                .await
                 .unwrap();
+        crate::password::delete_password("test", "test").await.unwrap();
         assert_eq!(result, secret);
     }
 
-    #[test]
-    fn get_biometric_secret_handles_encrypted_secret() {
-        scopeguard::defer! {
-            crate::password::delete_password("test", "test").unwrap();
-        }
+    #[tokio::test]
+    async fn get_biometric_secret_handles_encrypted_secret() {
         let test = "test";
         let secret =
             CipherString::from_str("0.l9fhDUP/wDJcKwmEzcb/3w==|uP4LcqoCCj5FxBDP77NV6Q==").unwrap(); // output from test_encrypt
@@ -332,17 +328,19 @@ mod tests {
             os_key_part_b64: "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned(),
             client_key_part_b64: Some("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=".to_owned()),
         };
-        crate::password::set_password(test, test, &secret.to_string()).unwrap();
+        crate::password::set_password(test, test, &secret.to_string()).await.unwrap();
 
         let result =
             <Biometric as BiometricTrait>::get_biometric_secret(test, test, Some(key_material))
+                .await
                 .unwrap();
+        crate::password::delete_password("test", "test").await.unwrap();
         assert_eq!(result, "secret");
     }
 
-    #[test]
-    fn set_biometric_secret_requires_key() {
-        let result = <Biometric as BiometricTrait>::set_biometric_secret("", "", "", None, "");
+    #[tokio::test]
+    async fn set_biometric_secret_requires_key() {
+        let result = <Biometric as BiometricTrait>::set_biometric_secret("", "", "", None, "").await;
         assert!(result.is_err());
         assert_eq!(
             result.unwrap_err().to_string(),
diff --git a/apps/desktop/desktop_native/core/src/password/macos.rs b/apps/desktop/desktop_native/core/src/password/macos.rs
index 408706423e2..c911a0d2430 100644
--- a/apps/desktop/desktop_native/core/src/password/macos.rs
+++ b/apps/desktop/desktop_native/core/src/password/macos.rs
@@ -3,26 +3,22 @@ use security_framework::passwords::{
     delete_generic_password, get_generic_password, set_generic_password,
 };
 
-pub fn get_password(service: &str, account: &str) -> Result<String> {
+pub async fn get_password(service: &str, account: &str) -> Result<String> {
     let result = String::from_utf8(get_generic_password(&service, &account)?)?;
     Ok(result)
 }
 
-pub fn get_password_keytar(service: &str, account: &str) -> Result<String> {
-    get_password(service, account)
-}
-
-pub fn set_password(service: &str, account: &str, password: &str) -> Result<()> {
+pub async fn set_password(service: &str, account: &str, password: &str) -> Result<()> {
     let result = set_generic_password(&service, &account, password.as_bytes())?;
     Ok(result)
 }
 
-pub fn delete_password(service: &str, account: &str) -> Result<()> {
+pub async fn delete_password(service: &str, account: &str) -> Result<()> {
     let result = delete_generic_password(&service, &account)?;
     Ok(result)
 }
 
-pub fn is_available() -> Result<bool> {
+pub async fn is_available() -> Result<bool> {
     Ok(true)
 }
 
@@ -30,18 +26,17 @@ pub fn is_available() -> Result<bool> {
 mod tests {
     use super::*;
 
-    #[test]
-    fn test() {
-        scopeguard::defer!(delete_password("BitwardenTest", "BitwardenTest").unwrap_or({}););
-        set_password("BitwardenTest", "BitwardenTest", "Random").unwrap();
+    #[tokio::test]
+    async fn test() {
+        set_password("BitwardenTest", "BitwardenTest", "Random").await.unwrap();
         assert_eq!(
             "Random",
-            get_password("BitwardenTest", "BitwardenTest").unwrap()
+            get_password("BitwardenTest", "BitwardenTest").await.unwrap()
         );
-        delete_password("BitwardenTest", "BitwardenTest").unwrap();
+        delete_password("BitwardenTest", "BitwardenTest").await.unwrap();
 
         // Ensure password is deleted
-        match get_password("BitwardenTest", "BitwardenTest") {
+        match get_password("BitwardenTest", "BitwardenTest").await {
             Ok(_) => panic!("Got a result"),
             Err(e) => assert_eq!(
                 "The specified item could not be found in the keychain.",
@@ -50,9 +45,9 @@ mod tests {
         }
     }
 
-    #[test]
-    fn test_error_no_password() {
-        match get_password("Unknown", "Unknown") {
+    #[tokio::test]
+    async fn test_error_no_password() {
+        match get_password("Unknown", "Unknown").await {
             Ok(_) => panic!("Got a result"),
             Err(e) => assert_eq!(
                 "The specified item could not be found in the keychain.",
diff --git a/apps/desktop/desktop_native/core/src/password/unix.rs b/apps/desktop/desktop_native/core/src/password/unix.rs
index 1817a4d62ee..20a79625efb 100644
--- a/apps/desktop/desktop_native/core/src/password/unix.rs
+++ b/apps/desktop/desktop_native/core/src/password/unix.rs
@@ -1,106 +1,106 @@
 use anyhow::{anyhow, Result};
-use libsecret::{password_clear_sync, password_lookup_sync, password_store_sync, Schema};
+use oo7::dbus::{self};
 use std::collections::HashMap;
 
-pub fn get_password(service: &str, account: &str) -> Result<String> {
-    let res = password_lookup_sync(
-        Some(&get_schema()),
-        build_attributes(service, account),
-        gio::Cancellable::NONE,
-    )?;
-
-    match res {
-        Some(s) => Ok(String::from(s)),
-        None => Err(anyhow!("No password found")),
-    }
-}
-
-pub fn get_password_keytar(service: &str, account: &str) -> Result<String> {
-    get_password(service, account)
-}
-
-pub fn set_password(service: &str, account: &str, password: &str) -> Result<()> {
-    let result = password_store_sync(
-        Some(&get_schema()),
-        build_attributes(service, account),
-        Some(&libsecret::COLLECTION_DEFAULT),
-        &format!("{}/{}", service, account),
-        password,
-        gio::Cancellable::NONE,
-    )?;
-    Ok(result)
-}
-
-pub fn delete_password(service: &str, account: &str) -> Result<()> {
-    let result = password_clear_sync(
-        Some(&get_schema()),
-        build_attributes(service, account),
-        gio::Cancellable::NONE,
-    )?;
-    Ok(result)
-}
-
-pub fn is_available() -> Result<bool> {
-    let result = password_clear_sync(
-        Some(&get_schema()),
-        build_attributes("bitwardenSecretsAvailabilityTest", "test"),
-        gio::Cancellable::NONE,
-    );
-    match result {
-        Ok(_) => Ok(true),
+pub async fn get_password(service: &str, account: &str) -> Result<String> {
+    match get_password_new(service, account).await {
+        Ok(res) => Ok(res),
         Err(_) => {
-            println!("secret-service unavailable: {:?}", result);
-            Ok(false)
+            get_password_legacy(service, account).await
         }
     }
 }
 
-fn get_schema() -> Schema {
-    let mut attributes = std::collections::HashMap::new();
-    attributes.insert("service", libsecret::SchemaAttributeType::String);
-    attributes.insert("account", libsecret::SchemaAttributeType::String);
-
-    libsecret::Schema::new(
-        "org.freedesktop.Secret.Generic",
-        libsecret::SchemaFlags::NONE,
-        attributes,
-    )
+async fn get_password_new(service: &str, account: &str) -> Result<String> {
+    let keyring = oo7::Keyring::new().await?;
+    let attributes = HashMap::from([("service", service), ("account", account)]);
+    let results = keyring.search_items(&attributes).await?;
+    let res = results.get(0);
+    match res {
+        Some(res) => {
+            let secret = res.secret().await?;
+            Ok(String::from_utf8(secret.to_vec())?)
+        },
+        None => Err(anyhow!("no result"))
+    }
 }
 
-fn build_attributes<'a>(service: &'a str, account: &'a str) -> HashMap<&'a str, &'a str> {
-    let mut attributes = HashMap::new();
-    attributes.insert("service", service);
-    attributes.insert("account", account);
+// forces to read via secret service; remvove after 2025.03
+async fn get_password_legacy(service: &str, account: &str) -> Result<String> {
+    println!("falling back to get legacy {} {}", service, account);
+    let svc = dbus::Service::new().await?;
+    let collection = svc.default_collection().await?;
+    let keyring = oo7::Keyring::DBus(collection);
+    let attributes = HashMap::from([("service", service), ("account", account)]);
+    let results = keyring.search_items(&attributes).await?;
+    let res = results.get(0);
+    match res {
+        Some(res) => {
+            let secret = res.secret().await?;
+            println!("deleting legacy secret service entry {} {}", service, account);
+            keyring.delete(&attributes).await?;
+            let secret_string = String::from_utf8(secret.to_vec())?;
+            set_password(service, account, &secret_string).await?;
+            Ok(secret_string)
+        },
+        None => Err(anyhow!("no result"))
+    }
+}
 
-    attributes
+pub async fn set_password(service: &str, account: &str, password: &str) -> Result<()> {
+    let keyring = oo7::Keyring::new().await?;
+    let attributes = HashMap::from([("service", service), ("account", account)]);
+    keyring.create_item("org.freedesktop.Secret.Generic", &attributes, password, true).await?;
+    Ok(())
+}
+
+pub async fn delete_password(service: &str, account: &str) -> Result<()> {
+    let keyring = oo7::Keyring::new().await?;
+    let attributes = HashMap::from([("service", service), ("account", account)]);
+    keyring.delete(&attributes).await?;
+    Ok(())
+}
+
+pub async fn is_available() -> Result<bool> {
+    match oo7::Keyring::new().await {
+        Ok(_) => Ok(true),
+        _ => Ok(false),
+    }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
 
-    #[test]
-    fn test() {
-        scopeguard::defer!(delete_password("BitwardenTest", "BitwardenTest").unwrap_or({}););
-        set_password("BitwardenTest", "BitwardenTest", "Random").unwrap();
+    #[tokio::test]
+    async fn test() {
+        set_password("BitwardenTest", "BitwardenTest", "Random").await.unwrap();
         assert_eq!(
             "Random",
-            get_password("BitwardenTest", "BitwardenTest").unwrap()
+            get_password("BitwardenTest", "BitwardenTest").await.unwrap()
         );
-        delete_password("BitwardenTest", "BitwardenTest").unwrap();
+        delete_password("BitwardenTest", "BitwardenTest").await.unwrap();
 
         // Ensure password is deleted
-        match get_password("BitwardenTest", "BitwardenTest") {
-            Ok(_) => panic!("Got a result"),
-            Err(e) => assert_eq!("No password found", e.to_string()),
+        match get_password("BitwardenTest", "BitwardenTest").await {
+            Ok(_) => {
+                panic!("Got a result")
+            }
+            Err(e) => assert_eq!(
+                "no result",
+                e.to_string()
+            ),
         }
     }
 
-    #[test]
-    fn test_error_no_password() {
-        match get_password("BitwardenTest", "BitwardenTest") {
+    #[tokio::test]
+    async fn test_error_no_password() {
+        match get_password("Unknown", "Unknown").await {
             Ok(_) => panic!("Got a result"),
-            Err(e) => assert_eq!("No password found", e.to_string()),
+            Err(e) => assert_eq!(
+                "no result",
+                e.to_string()
+            ),
         }
     }
 }
diff --git a/apps/desktop/desktop_native/core/src/password/windows.rs b/apps/desktop/desktop_native/core/src/password/windows.rs
index d932aabae95..873e717ac8b 100644
--- a/apps/desktop/desktop_native/core/src/password/windows.rs
+++ b/apps/desktop/desktop_native/core/src/password/windows.rs
@@ -13,7 +13,7 @@ use windows::{
 
 const CRED_FLAGS_NONE: u32 = 0;
 
-pub fn get_password<'a>(service: &str, account: &str) -> Result<String> {
+pub async fn get_password<'a>(service: &str, account: &str) -> Result<String> {
     let target_name = U16CString::from_str(target_name(service, account))?;
 
     let mut credential: *mut CREDENTIALW = std::ptr::null_mut();
@@ -45,39 +45,7 @@ pub fn get_password<'a>(service: &str, account: &str) -> Result<String> {
     Ok(String::from(password))
 }
 
-// Remove this after sufficient releases
-pub fn get_password_keytar<'a>(service: &str, account: &str) -> Result<String> {
-    let target_name = U16CString::from_str(target_name(service, account))?;
-
-    let mut credential: *mut CREDENTIALW = std::ptr::null_mut();
-    let credential_ptr = &mut credential;
-
-    let result = unsafe {
-        CredReadW(
-            PCWSTR(target_name.as_ptr()),
-            CRED_TYPE_GENERIC,
-            CRED_FLAGS_NONE,
-            credential_ptr,
-        )
-    };
-
-    scopeguard::defer!({
-        unsafe { CredFree(credential as *mut _) };
-    });
-
-    result?;
-
-    let password = unsafe {
-        std::str::from_utf8_unchecked(std::slice::from_raw_parts(
-            (*credential).CredentialBlob,
-            (*credential).CredentialBlobSize as usize,
-        ))
-    };
-
-    Ok(String::from(password))
-}
-
-pub fn set_password(service: &str, account: &str, password: &str) -> Result<()> {
+pub async fn set_password(service: &str, account: &str, password: &str) -> Result<()> {
     let mut target_name = U16CString::from_str(target_name(service, account))?;
     let mut user_name = U16CString::from_str(account)?;
     let last_written = FILETIME {
@@ -108,7 +76,7 @@ pub fn set_password(service: &str, account: &str, password: &str) -> Result<()>
     Ok(())
 }
 
-pub fn delete_password(service: &str, account: &str) -> Result<()> {
+pub async fn delete_password(service: &str, account: &str) -> Result<()> {
     let target_name = U16CString::from_str(target_name(service, account))?;
 
     unsafe {
@@ -122,7 +90,7 @@ pub fn delete_password(service: &str, account: &str) -> Result<()> {
     Ok(())
 }
 
-pub fn is_available() -> Result<bool> {
+pub async fn is_available() -> Result<bool> {
     Ok(true)
 }
 
@@ -142,36 +110,25 @@ fn convert_error(e: windows::core::Error) -> String {
 mod tests {
     use super::*;
 
-    #[test]
-    fn test() {
-        scopeguard::defer!(delete_password("BitwardenTest", "BitwardenTest").unwrap_or({}););
-        set_password("BitwardenTest", "BitwardenTest", "Random").unwrap();
+    #[tokio::test]
+    async fn test() {
+        set_password("BitwardenTest", "BitwardenTest", "Random").await.unwrap();
         assert_eq!(
             "Random",
-            get_password("BitwardenTest", "BitwardenTest").unwrap()
+            get_password("BitwardenTest", "BitwardenTest").await.unwrap()
         );
-        delete_password("BitwardenTest", "BitwardenTest").unwrap();
+        delete_password("BitwardenTest", "BitwardenTest").await.unwrap();
 
         // Ensure password is deleted
-        match get_password("BitwardenTest", "BitwardenTest") {
+        match get_password("BitwardenTest", "BitwardenTest").await {
             Ok(_) => panic!("Got a result"),
             Err(e) => assert_eq!("Password not found.", e.to_string()),
         }
     }
 
-    #[test]
-    fn test_get_password_keytar() {
-        scopeguard::defer!(delete_password("BitwardenTest", "BitwardenTest").unwrap_or({}););
-        keytar::set_password("BitwardenTest", "BitwardenTest", "HelloFromKeytar").unwrap();
-        assert_eq!(
-            "HelloFromKeytar",
-            get_password_keytar("BitwardenTest", "BitwardenTest").unwrap()
-        );
-    }
-
-    #[test]
-    fn test_error_no_password() {
-        match get_password("BitwardenTest", "BitwardenTest") {
+    #[tokio::test]
+    async fn test_error_no_password() {
+        match get_password("BitwardenTest", "BitwardenTest").await {
             Ok(_) => panic!("Got a result"),
             Err(e) => assert_eq!("Password not found.", e.to_string()),
         }
diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts
index 009f29333a5..9ceb30c4ff5 100644
--- a/apps/desktop/desktop_native/napi/index.d.ts
+++ b/apps/desktop/desktop_native/napi/index.d.ts
@@ -6,8 +6,6 @@
 export declare namespace passwords {
   /** Fetch the stored password from the keychain. */
   export function getPassword(service: string, account: string): Promise<string>
-  /** Fetch the stored password from the keychain that was stored with Keytar. */
-  export function getPasswordKeytar(service: string, account: string): Promise<string>
   /** Save the password to the keychain. Adds an entry if none exists otherwise updates the existing entry. */
   export function setPassword(service: string, account: string, password: string): Promise<void>
   /** Delete the stored password from the keychain. */
diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs
index c5ca655bce6..f160b19ad53 100644
--- a/apps/desktop/desktop_native/napi/src/lib.rs
+++ b/apps/desktop/desktop_native/napi/src/lib.rs
@@ -8,14 +8,7 @@ pub mod passwords {
     /// Fetch the stored password from the keychain.
     #[napi]
     pub async fn get_password(service: String, account: String) -> napi::Result<String> {
-        desktop_core::password::get_password(&service, &account)
-            .map_err(|e| napi::Error::from_reason(e.to_string()))
-    }
-
-    /// Fetch the stored password from the keychain that was stored with Keytar.
-    #[napi]
-    pub async fn get_password_keytar(service: String, account: String) -> napi::Result<String> {
-        desktop_core::password::get_password_keytar(&service, &account)
+        desktop_core::password::get_password(&service, &account).await
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
@@ -26,21 +19,21 @@ pub mod passwords {
         account: String,
         password: String,
     ) -> napi::Result<()> {
-        desktop_core::password::set_password(&service, &account, &password)
+        desktop_core::password::set_password(&service, &account, &password).await
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
     /// Delete the stored password from the keychain.
     #[napi]
     pub async fn delete_password(service: String, account: String) -> napi::Result<()> {
-        desktop_core::password::delete_password(&service, &account)
+        desktop_core::password::delete_password(&service, &account).await
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
     // Checks if the os secure storage is available
     #[napi]
     pub async fn is_available() -> napi::Result<bool> {
-        desktop_core::password::is_available().map_err(|e| napi::Error::from_reason(e.to_string()))
+        desktop_core::password::is_available().await.map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 }
 
@@ -81,6 +74,7 @@ pub mod biometrics {
             key_material.map(|m| m.into()),
             &iv_b64,
         )
+        .await
         .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
@@ -92,6 +86,7 @@ pub mod biometrics {
     ) -> napi::Result<String> {
         let result =
             Biometric::get_biometric_secret(&service, &account, key_material.map(|m| m.into()))
+                .await
                 .map_err(|e| napi::Error::from_reason(e.to_string()));
         result
     }
diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json
index e4649a083a3..9b894b0bfc7 100644
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -224,7 +224,7 @@
   },
   "deb": {
     "artifactName": "${productName}-${version}-${arch}.${ext}",
-    "depends": ["libnotify4", "libxtst6", "libnss3", "libsecret-1-0", "libxss1"]
+    "depends": ["libnotify4", "libxtst6", "libnss3", "libxss1"]
   },
   "appImage": {
     "artifactName": "${productName}-${version}-${arch}.${ext}"

From 811b97cef5cef45fea777f0d74a3bc392958683f Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 4 Dec 2024 17:04:08 +0100
Subject: [PATCH 23/46] [PM-15541] Hide ssh key filter behind feature flag
 (#12239)

* Hide ssh key filter behind feature flag

* Hide ssh keys in web client by featureflag

* Fix build
---
 .../components/vault/vault-filter.component.html |  1 +
 .../components/vault/vault-filter.component.ts   |  7 +++++++
 .../filters/type-filter.component.html           |  1 +
 .../filters/type-filter.component.ts             | 16 ++++++++++++++--
 .../components/vault-filter.component.ts         | 12 +++++++++---
 .../vault-filter/vault-filter.component.ts       |  3 +++
 6 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.html b/apps/browser/src/vault/popup/components/vault/vault-filter.component.html
index f5c28b2bebd..bf557f74608 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-filter.component.html
+++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.html
@@ -118,6 +118,7 @@
           type="button"
           class="box-content-row"
           appStopClick
+          *ngIf="isSshKeysEnabled"
           (click)="selectType(cipherType.SshKey)"
         >
           <div class="row-main">
diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
index 448f85a8cbd..d12b2fd801d 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts
@@ -7,7 +7,9 @@ import { first, switchMap, takeUntil } from "rxjs/operators";
 import { CollectionView } from "@bitwarden/admin-console/common";
 import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model";
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
@@ -62,6 +64,8 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   selectedOrganization: string = null;
   showCollections = true;
 
+  isSshKeysEnabled = false;
+
   private loadedTimeout: number;
   private selectedTimeout: number;
   private preventSelected = false;
@@ -95,6 +99,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     private location: Location,
     private vaultFilterService: VaultFilterService,
     private vaultBrowserStateService: VaultBrowserStateService,
+    private configService: ConfigService,
   ) {
     this.noFolderListSize = 100;
   }
@@ -166,6 +171,8 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
       .subscribe((isSearchable) => {
         this.isSearchable = isSearchable;
       });
+
+    this.isSshKeysEnabled = await this.configService.getFeatureFlag(FeatureFlag.SSHKeyVaultItem);
   }
 
   ngOnDestroy() {
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
index c3dcd191dfc..55e10980ad1 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
@@ -82,6 +82,7 @@
   <li
     class="filter-option"
     [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.SshKey }"
+    *ngIf="isSshKeysEnabled"
   >
     <span class="filter-buttons">
       <button
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
index beb3e8d9bb1..e4a46ddbf77 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.ts
@@ -1,9 +1,21 @@
-import { Component } from "@angular/core";
+import { Component, OnInit } from "@angular/core";
 
 import { TypeFilterComponent as BaseTypeFilterComponent } from "@bitwarden/angular/vault/vault-filter/components/type-filter.component";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
 @Component({
   selector: "app-type-filter",
   templateUrl: "type-filter.component.html",
 })
-export class TypeFilterComponent extends BaseTypeFilterComponent {}
+export class TypeFilterComponent extends BaseTypeFilterComponent implements OnInit {
+  isSshKeysEnabled = false;
+
+  constructor(private configService: ConfigService) {
+    super();
+  }
+
+  async ngOnInit(): Promise<void> {
+    this.isSshKeysEnabled = await this.configService.getFeatureFlag(FeatureFlag.SSHKeyVaultItem);
+  }
+}
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
index 2f8a429e42e..3dff5f2e5a8 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/vault-filter.component.ts
@@ -6,6 +6,8 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
@@ -94,6 +96,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     protected platformUtilsService: PlatformUtilsService,
     protected billingApiService: BillingApiServiceAbstraction,
     protected dialogService: DialogService,
+    protected configService: ConfigService,
   ) {}
 
   async ngOnInit(): Promise<void> {
@@ -258,13 +261,16 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
         type: CipherType.SecureNote,
         icon: "bwi-sticky-note",
       },
-      {
+    ];
+
+    if (await this.configService.getFeatureFlag(FeatureFlag.SSHKeyVaultItem)) {
+      allTypeFilters.push({
         id: "sshKey",
         name: this.i18nService.t("typeSshKey"),
         type: CipherType.SshKey,
         icon: "bwi-key",
-      },
-    ];
+      });
+    }
 
     const typeFilterSection: VaultFilterSection = {
       data$: this.vaultFilterService.buildTypeTree(
diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
index 211d2346230..797fb0e74b8 100644
--- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.component.ts
@@ -4,6 +4,7 @@ import { firstValueFrom, Subject } from "rxjs";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { TreeNode } from "@bitwarden/common/vault/models/domain/tree-node";
@@ -42,6 +43,7 @@ export class VaultFilterComponent
     protected platformUtilsService: PlatformUtilsService,
     protected billingApiService: BillingApiServiceAbstraction,
     protected dialogService: DialogService,
+    protected configService: ConfigService,
   ) {
     super(
       vaultFilterService,
@@ -50,6 +52,7 @@ export class VaultFilterComponent
       platformUtilsService,
       billingApiService,
       dialogService,
+      configService,
     );
   }
 

From 7e934bc6d354d851f97d4ec88113deab66e039a2 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Wed, 4 Dec 2024 17:04:14 +0100
Subject: [PATCH 24/46] Fix biometrics not being enabled in browser (#12237)

---
 .../src/auth/popup/settings/account-security.component.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/browser/src/auth/popup/settings/account-security.component.ts b/apps/browser/src/auth/popup/settings/account-security.component.ts
index 8493358aa8b..1939b3f5716 100644
--- a/apps/browser/src/auth/popup/settings/account-security.component.ts
+++ b/apps/browser/src/auth/popup/settings/account-security.component.ts
@@ -438,8 +438,8 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
 
       const successful = await this.trySetupBiometrics();
       this.form.controls.biometric.setValue(successful);
+      await this.biometricStateService.setBiometricUnlockEnabled(successful);
       if (!successful) {
-        await this.biometricStateService.setBiometricUnlockEnabled(false);
         await this.biometricStateService.setFingerprintValidated(false);
       }
     } else {

From 45db17627ee6c9e8e8382b07e8db41dd77585cd2 Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Wed, 4 Dec 2024 11:57:03 -0500
Subject: [PATCH 25/46] [PM-15535] User with Edit* permission can permanently
 delete item from more actions menu on extension (#12234)

* Added conditional to check if a cipher can be delete by user

* Added change detection on push

* Added directive to check if user can delete a cipher

* Added directive to check if user can delete a cipher

* Replaced check with directive

* removed takeUntilDestroyed
---
 .../trash-list-items-container.component.html |  2 +-
 .../trash-list-items-container.component.ts   |  6 ++-
 .../vault/popup/settings/trash.component.ts   |  3 +-
 .../components/can-delete-cipher.directive.ts | 42 +++++++++++++++++++
 libs/vault/src/index.ts                       |  1 +
 5 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 libs/vault/src/components/can-delete-cipher.directive.ts

diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
index 69322b08c8a..a79b6c74b03 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
@@ -30,7 +30,7 @@
             <button type="button" bitMenuItem (click)="restore(cipher)">
               {{ "restore" | i18n }}
             </button>
-            <button type="button" bitMenuItem (click)="delete(cipher)">
+            <button type="button" bitMenuItem *appCanDeleteCipher="cipher" (click)="delete(cipher)">
               {{ "deleteForever" | i18n }}
             </button>
           </bit-menu>
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
index de9d95aab00..6827823704e 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from "@angular/common";
-import { Component, Input } from "@angular/core";
+import { ChangeDetectionStrategy, Component, Input } from "@angular/core";
 import { Router } from "@angular/router";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
@@ -17,7 +17,7 @@ import {
   ToastService,
   TypographyModule,
 } from "@bitwarden/components";
-import { PasswordRepromptService } from "@bitwarden/vault";
+import { CanDeleteCipherDirective, PasswordRepromptService } from "@bitwarden/vault";
 
 @Component({
   selector: "app-trash-list-items-container",
@@ -29,10 +29,12 @@ import { PasswordRepromptService } from "@bitwarden/vault";
     JslibModule,
     SectionComponent,
     SectionHeaderComponent,
+    CanDeleteCipherDirective,
     MenuModule,
     IconButtonModule,
     TypographyModule,
   ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TrashListItemsContainerComponent {
   /**
diff --git a/apps/browser/src/vault/popup/settings/trash.component.ts b/apps/browser/src/vault/popup/settings/trash.component.ts
index b6f77ef6a52..8bac22df53f 100644
--- a/apps/browser/src/vault/popup/settings/trash.component.ts
+++ b/apps/browser/src/vault/popup/settings/trash.component.ts
@@ -1,5 +1,5 @@
 import { CommonModule } from "@angular/common";
-import { Component } from "@angular/core";
+import { ChangeDetectionStrategy, Component } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { CalloutModule, NoItemsModule } from "@bitwarden/components";
@@ -27,6 +27,7 @@ import { TrashListItemsContainerComponent } from "./trash-list-items-container/t
     CalloutModule,
     NoItemsModule,
   ],
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TrashComponent {
   protected deletedCiphers$ = this.vaultPopupItemsService.deletedCiphers$;
diff --git a/libs/vault/src/components/can-delete-cipher.directive.ts b/libs/vault/src/components/can-delete-cipher.directive.ts
new file mode 100644
index 00000000000..c1c7706a1fa
--- /dev/null
+++ b/libs/vault/src/components/can-delete-cipher.directive.ts
@@ -0,0 +1,42 @@
+import { Directive, Input, OnDestroy, TemplateRef, ViewContainerRef } from "@angular/core";
+import { Subject, takeUntil } from "rxjs";
+
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service";
+
+/**
+ * Only shows the element if the user can delete the cipher.
+ */
+@Directive({
+  selector: "[appCanDeleteCipher]",
+  standalone: true,
+})
+export class CanDeleteCipherDirective implements OnDestroy {
+  private destroy$ = new Subject<void>();
+
+  @Input("appCanDeleteCipher") set cipher(cipher: CipherView) {
+    this.viewContainer.clear();
+
+    this.cipherAuthorizationService
+      .canDeleteCipher$(cipher)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((canDelete: boolean) => {
+        if (canDelete) {
+          this.viewContainer.createEmbeddedView(this.templateRef);
+        } else {
+          this.viewContainer.clear();
+        }
+      });
+  }
+
+  constructor(
+    private templateRef: TemplateRef<any>,
+    private viewContainer: ViewContainerRef,
+    private cipherAuthorizationService: CipherAuthorizationService,
+  ) {}
+
+  ngOnDestroy() {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+}
diff --git a/libs/vault/src/index.ts b/libs/vault/src/index.ts
index f6a95281f81..dca9b2dee79 100644
--- a/libs/vault/src/index.ts
+++ b/libs/vault/src/index.ts
@@ -2,6 +2,7 @@ export { PasswordRepromptService } from "./services/password-reprompt.service";
 export { CopyCipherFieldService, CopyAction } from "./services/copy-cipher-field.service";
 export { CopyCipherFieldDirective } from "./components/copy-cipher-field.directive";
 export { OrgIconDirective } from "./components/org-icon.directive";
+export { CanDeleteCipherDirective } from "./components/can-delete-cipher.directive";
 
 export * from "./cipher-view";
 export * from "./cipher-form";

From 0bc63517bdda7187fd57a5fbcd0d31f5dfbb7a44 Mon Sep 17 00:00:00 2001
From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com>
Date: Wed, 4 Dec 2024 12:25:15 -0500
Subject: [PATCH 26/46] If user can't view subscription, don't show upgrade
 modal (#12248)

---
 .../admin-console/organizations/members/members.component.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index b33807c66c9..26e27e1249b 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -487,6 +487,11 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
         this.organization.productTierType === ProductTierType.TeamsStarter ||
         this.organization.productTierType === ProductTierType.Families)
     ) {
+      if (!this.organization.canEditSubscription) {
+        await this.showSeatLimitReachedDialog();
+        return;
+      }
+
       const reference = openChangePlanDialog(this.dialogService, {
         data: {
           organizationId: this.organization.id,

From cee13556af99bb98451fd87a67c6edb5d449eef6 Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:56:59 -0800
Subject: [PATCH 27/46] fix(ui): [PM-13147] Change logout `a` link to `button`
 so that it displays correctly (#12232)

On `/update-temp-password`, on the light theme the "Logout" link was not showing in the upper-left corner because the text color for an `a` link is our primary blue color, which blended in with the headers background color. This PR changes the logout `a` link to a `button` so that it inherits the header text color. It should be a button anyway since it's calling a function and not simply routing.
---
 apps/browser/src/auth/popup/update-temp-password.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/browser/src/auth/popup/update-temp-password.component.html b/apps/browser/src/auth/popup/update-temp-password.component.html
index 6e0cc0f4483..0ce82aa20cf 100644
--- a/apps/browser/src/auth/popup/update-temp-password.component.html
+++ b/apps/browser/src/auth/popup/update-temp-password.component.html
@@ -1,7 +1,7 @@
 <form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
   <header>
     <div class="left">
-      <a (click)="logOut()">{{ "logOut" | i18n }}</a>
+      <button type="button" (click)="logOut()">{{ "logOut" | i18n }}</button>
     </div>
     <h1 class="center">
       <span class="title">{{ "updateMasterPassword" | i18n }}</span>

From 773aba4fef5fb599a3a89e718e82af68e4bf23ff Mon Sep 17 00:00:00 2001
From: Shane Melton <smelton@bitwarden.com>
Date: Wed, 4 Dec 2024 15:30:15 -0800
Subject: [PATCH 28/46] [PM-15559] Fix hide passwords in AC for users that have
 view, except password (#12252)

* [PM-15559] Update admin dialog flows to first try the local state before using the API when not required

* [PM-15559] Clear initial values after creating a new cipher so that they do not override the newly created cipher for subsequent edits
---
 .../vault-item-dialog.component.ts            | 12 +++---
 ...console-cipher-form-config.service.spec.ts | 43 +++++++++++++------
 ...dmin-console-cipher-form-config.service.ts | 26 ++++++++---
 3 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
index 2742cd52ef1..2f5b014fcb3 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
@@ -281,17 +281,19 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
     // If the cipher was newly created (via add/clone), switch the form to edit for subsequent edits.
     if (this._originalFormMode === "add" || this._originalFormMode === "clone") {
       this.formConfig.mode = "edit";
+      this.formConfig.initialValues = null;
     }
 
-    let cipher: Cipher;
+    let cipher = await this.cipherService.get(cipherView.id);
 
-    // When the form config is used within the Admin Console, retrieve the cipher from the admin endpoint
-    if (this.formConfig.isAdminConsole) {
+    // When the form config is used within the Admin Console, retrieve the cipher from the admin endpoint (if not found in local state)
+    if (this.formConfig.isAdminConsole && (cipher == null || this.formConfig.admin)) {
       const cipherResponse = await this.apiService.getCipherAdmin(cipherView.id);
+      cipherResponse.edit = true;
+      cipherResponse.viewPassword = true;
+
       const cipherData = new CipherData(cipherResponse);
       cipher = new Cipher(cipherData);
-    } else {
-      cipher = await this.cipherService.get(cipherView.id);
     }
 
     // Store the updated cipher so any following edits use the most up to date cipher
diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
index 05c40fe2e79..25976c4fb82 100644
--- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
+++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts
@@ -8,6 +8,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { CipherId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 
 import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/services/routed-vault-filter.service";
 
@@ -52,12 +53,16 @@ describe("AdminConsoleCipherFormConfigService", () => {
   const organization$ = new BehaviorSubject<Organization>(testOrg as Organization);
   const organizations$ = new BehaviorSubject<Organization[]>([testOrg, testOrg2] as Organization[]);
   const getCipherAdmin = jest.fn().mockResolvedValue(null);
+  const getCipher = jest.fn().mockResolvedValue(null);
 
   beforeEach(async () => {
     getCipherAdmin.mockClear();
     getCipherAdmin.mockResolvedValue({ id: cipherId, name: "Test Cipher - (admin)" });
 
-    await TestBed.configureTestingModule({
+    getCipher.mockClear();
+    getCipher.mockResolvedValue({ id: cipherId, name: "Test Cipher" });
+
+    TestBed.configureTestingModule({
       providers: [
         AdminConsoleCipherFormConfigService,
         { provide: OrganizationService, useValue: { get$: () => organization$, organizations$ } },
@@ -74,14 +79,14 @@ describe("AdminConsoleCipherFormConfigService", () => {
           useValue: { filter$: new BehaviorSubject({ organizationId: testOrg.id }) },
         },
         { provide: ApiService, useValue: { getCipherAdmin } },
+        { provide: CipherService, useValue: { get: getCipher } },
       ],
     });
+    adminConsoleConfigService = TestBed.inject(AdminConsoleCipherFormConfigService);
   });
 
   describe("buildConfig", () => {
     it("sets individual attributes", async () => {
-      adminConsoleConfigService = TestBed.inject(AdminConsoleCipherFormConfigService);
-
       const { folders, hideIndividualVaultFields } = await adminConsoleConfigService.buildConfig(
         "add",
         cipherId,
@@ -92,8 +97,6 @@ describe("AdminConsoleCipherFormConfigService", () => {
     });
 
     it("sets mode based on passed mode", async () => {
-      adminConsoleConfigService = TestBed.inject(AdminConsoleCipherFormConfigService);
-
       const { mode } = await adminConsoleConfigService.buildConfig("edit", cipherId);
 
       expect(mode).toBe("edit");
@@ -122,8 +125,6 @@ describe("AdminConsoleCipherFormConfigService", () => {
     });
 
     it("sets `allowPersonalOwnership`", async () => {
-      adminConsoleConfigService = TestBed.inject(AdminConsoleCipherFormConfigService);
-
       policyAppliesToActiveUser$.next(true);
 
       let result = await adminConsoleConfigService.buildConfig("clone", cipherId);
@@ -138,8 +139,6 @@ describe("AdminConsoleCipherFormConfigService", () => {
     });
 
     it("disables personal ownership when not cloning", async () => {
-      adminConsoleConfigService = TestBed.inject(AdminConsoleCipherFormConfigService);
-
       policyAppliesToActiveUser$.next(false);
 
       let result = await adminConsoleConfigService.buildConfig("add", cipherId);
@@ -172,14 +171,32 @@ describe("AdminConsoleCipherFormConfigService", () => {
       expect(result.organizations).toEqual([testOrg, testOrg2]);
     });
 
-    it("retrieves the cipher from the admin service", async () => {
+    it("retrieves the cipher from the admin service when canEditAllCiphers is true", async () => {
       getCipherAdmin.mockResolvedValue({ id: cipherId, name: "Test Cipher - (admin)" });
+      testOrg.canEditAllCiphers = true;
 
-      adminConsoleConfigService = TestBed.inject(AdminConsoleCipherFormConfigService);
-
-      await adminConsoleConfigService.buildConfig("add", cipherId);
+      await adminConsoleConfigService.buildConfig("edit", cipherId);
 
       expect(getCipherAdmin).toHaveBeenCalledWith(cipherId);
     });
+
+    it("retrieves the cipher from the admin service when not found in local state", async () => {
+      getCipherAdmin.mockResolvedValue({ id: cipherId, name: "Test Cipher - (admin)" });
+      testOrg.canEditAllCiphers = false;
+      getCipher.mockResolvedValue(null);
+
+      await adminConsoleConfigService.buildConfig("edit", cipherId);
+
+      expect(getCipherAdmin).toHaveBeenCalledWith(cipherId);
+    });
+
+    it("retrieves the cipher from local state when admin is not required", async () => {
+      testOrg.canEditAllCiphers = false;
+
+      await adminConsoleConfigService.buildConfig("edit", cipherId);
+
+      expect(getCipherAdmin).not.toHaveBeenCalled();
+      expect(getCipher).toHaveBeenCalledWith(cipherId);
+    });
   });
 });
diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
index 457b4e83d03..50439a4d8dc 100644
--- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
+++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts
@@ -5,8 +5,10 @@ import { CollectionAdminService } from "@bitwarden/admin-console/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
-import { PolicyType, OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
+import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums";
+import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { CipherId } from "@bitwarden/common/types/guid";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { CipherType } from "@bitwarden/common/vault/enums";
 import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
@@ -25,6 +27,7 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
   private organizationService: OrganizationService = inject(OrganizationService);
   private routedVaultFilterService: RoutedVaultFilterService = inject(RoutedVaultFilterService);
   private collectionAdminService: CollectionAdminService = inject(CollectionAdminService);
+  private cipherService: CipherService = inject(CipherService);
   private apiService: ApiService = inject(ApiService);
 
   private allowPersonalOwnership$ = this.policyService
@@ -57,7 +60,6 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
     cipherId?: CipherId,
     cipherType?: CipherType,
   ): Promise<CipherFormConfig> {
-    const cipher = await this.getCipher(cipherId);
     const [organization, allowPersonalOwnership, allOrganizations, allCollections] =
       await firstValueFrom(
         combineLatest([
@@ -74,7 +76,7 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
     // Only allow the user to assign to their personal vault when cloning and
     // the policies are enabled for it.
     const allowPersonalOwnershipOnlyForClone = mode === "clone" ? allowPersonalOwnership : false;
-
+    const cipher = await this.getCipher(cipherId, organization);
     return {
       mode,
       cipherType: cipher?.type ?? cipherType ?? CipherType.Login,
@@ -89,14 +91,26 @@ export class AdminConsoleCipherFormConfigService implements CipherFormConfigServ
     };
   }
 
-  private async getCipher(id?: CipherId): Promise<Cipher | null> {
+  private async getCipher(id: CipherId | null, organization: Organization): Promise<Cipher | null> {
     if (id == null) {
-      return Promise.resolve(null);
+      return null;
     }
 
-    // Retrieve the cipher through the means of an admin
+    const localCipher = await this.cipherService.get(id);
+
+    // Fetch from the API because we don't need the permissions in local state OR the cipher was not found (e.g. unassigned)
+    if (organization.canEditAllCiphers || localCipher == null) {
+      return await this.getCipherFromAdminApi(id);
+    }
+
+    return localCipher;
+  }
+
+  private async getCipherFromAdminApi(id: CipherId): Promise<Cipher> {
     const cipherResponse = await this.apiService.getCipherAdmin(id);
+    // Ensure admin response includes permissions that allow editing
     cipherResponse.edit = true;
+    cipherResponse.viewPassword = true;
 
     const cipherData = new CipherData(cipherResponse);
     return new Cipher(cipherData);

From 816bf70dc0f1160ff1846a4b2f04b15289527b42 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Thu, 5 Dec 2024 11:53:30 +0100
Subject: [PATCH 29/46] Disable ssh agent for organization items (#12240)

---
 apps/desktop/src/platform/services/ssh-agent.service.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/src/platform/services/ssh-agent.service.ts b/apps/desktop/src/platform/services/ssh-agent.service.ts
index 969300fcc5f..a3e6fb09040 100644
--- a/apps/desktop/src/platform/services/ssh-agent.service.ts
+++ b/apps/desktop/src/platform/services/ssh-agent.service.ts
@@ -198,7 +198,10 @@ export class SshAgentService implements OnDestroy {
             }
 
             const sshCiphers = ciphers.filter(
-              (cipher) => cipher.type === CipherType.SshKey && !cipher.isDeleted,
+              (cipher) =>
+                cipher.type === CipherType.SshKey &&
+                !cipher.isDeleted &&
+                cipher.organizationId === null,
             );
             const keys = sshCiphers.map((cipher) => {
               return {

From f8ba01d3fa2515d29deb7a104a21f9521b085e82 Mon Sep 17 00:00:00 2001
From: Robyn MacCallum <robyntmaccallum@gmail.com>
Date: Thu, 5 Dec 2024 09:46:56 -0500
Subject: [PATCH 30/46] Remove SM team from CODEOWNERS (#12258)

---
 .github/CODEOWNERS | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cf656967da0..12a8c182335 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,10 +4,6 @@
 #
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-## Secrets Manager team files ##
-bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/team-secrets-manager-dev
-apps/web/src/app/secrets-manager/ @bitwarden/team-secrets-manager-dev
-
 ## Auth team files ##
 apps/browser/src/auth @bitwarden/team-auth-dev
 apps/cli/src/auth @bitwarden/team-auth-dev

From 6dc68b174b07a9d82bb862350353ab6fb0506b0f Mon Sep 17 00:00:00 2001
From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:48:03 +0100
Subject: [PATCH 31/46] Prompt user to popout the extension when creating a
 file send with Chrome on MacOS (#12257)

Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
---
 .../src/tools/popup/services/file-popout-utils.service.ts   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/browser/src/tools/popup/services/file-popout-utils.service.ts b/apps/browser/src/tools/popup/services/file-popout-utils.service.ts
index 65a311e47c3..fa72e411316 100644
--- a/apps/browser/src/tools/popup/services/file-popout-utils.service.ts
+++ b/apps/browser/src/tools/popup/services/file-popout-utils.service.ts
@@ -49,7 +49,7 @@ export class FilePopoutUtilsService {
   }
 
   /**
-   * Determines whether to show a file popout callout message for Chromium-based browsers in Linux and Mac OS X Big Sur
+   * Determines whether to show a file popout callout message for Chromium-based browsers in Linux and Mac OS X
    * @param win - The window context in which the check should be performed.
    * @returns True if the extension is not in a sidebar or popout; otherwise, false.
    */
@@ -66,8 +66,6 @@ export class FilePopoutUtilsService {
   }
 
   private isUnsupportedMac(win: Window): boolean {
-    return (
-      this.platformUtilsService.isChrome() && win?.navigator?.appVersion.includes("Mac OS X 11")
-    );
+    return this.platformUtilsService.isChrome() && win?.navigator?.appVersion.includes("Mac OS X");
   }
 }

From c11f429ddb6a48fb6018777041decc35b09ad32c Mon Sep 17 00:00:00 2001
From: Brandon Treston <btreston@bitwarden.com>
Date: Thu, 5 Dec 2024 10:09:40 -0500
Subject: [PATCH 32/46] [PM-12273] Admin Console Integration Page (#11883)

* Integration page initial implementation

* replace placeholder integrations

* fix linting and tests

* fix locales

* update locale

* Change logos, add link to SCIM page

* refactor to standalone components, add integration filtering pipe

* refactor modules and imports. Remove hyperlink text from integration card template

* refactor i18n usage to be more generic

* Add storybooks

* fix tests

* minify svgs, include spec files in TS config, fix stories

* Update apps/web/src/locales/en/messages.json

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>

* fix imports, add static dir for stories

* Add darkmode svgs for integrations

* hide nav link for non enterprise orgs

* add router guard

* change rxjs selector

* Remove tailwind class causing style issues

---------

Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
---
 .storybook/main.ts                            |   1 +
 .../guards/is-enterprise-org.guard.spec.ts    |  26 ++-
 .../guards/is-enterprise-org.guard.ts         |   4 +-
 .../integrations/integrations.component.html  |  66 ++++++
 .../integrations/integrations.component.ts    | 207 ++++++++++++++++++
 .../organization-layout.component.html        |   6 +
 .../layouts/organization-layout.component.ts  |  14 ++
 .../organization-routing.module.ts            |  15 ++
 apps/web/src/app/shared/components/index.ts   |   4 +
 .../integration-card.component.html           |  10 +-
 .../integration-card.component.spec.ts        |  23 +-
 .../integration-card.component.ts             |   7 +-
 .../integration-card.stories.ts               |  63 ++++++
 .../integration-grid.component.html           |  11 +-
 .../integration-grid.component.spec.ts        |  39 +++-
 .../integration-grid.component.ts             |  22 ++
 .../integration-grid.stories.ts               |  77 +++++++
 .../integrations/integrations.pipe.ts         |  15 ++
 .../shared/components/integrations/models.ts  |   1 -
 apps/web/src/app/shared/index.ts              |   1 +
 .../web/src/images/integrations/aws-color.svg |   1 +
 .../src/images/integrations/aws-darkmode.svg  |   1 +
 .../integrations/azure-active-directory.svg   |   1 +
 .../integrations/bitwarden-vertical-blue.svg  |   1 +
 .../integrations/jumpcloud-darkmode.svg       |   1 +
 .../integrations/logo-auth0-badge-color.svg   |   1 +
 .../images/integrations/logo-duo-color.svg    |   1 +
 .../integrations/logo-elastic-badge-color.svg |   1 +
 .../integrations/logo-google-badge-color.svg  |   1 +
 .../logo-jumpcloud-badge-color.svg            |   1 +
 .../integrations/logo-keycloak-icon.svg       |  23 ++
 .../logo-microsoft-entra-id-color.svg         |   1 +
 .../logo-microsoft-intune-color.svg           |   1 +
 .../logo-microsoft-sentinel-color.svg         |   1 +
 .../integrations/logo-okta-symbol-black.svg   |   1 +
 .../logo-onelogin-badge-color.svg             |   1 +
 .../integrations/logo-panther-round-color.svg |   1 +
 .../logo-ping-identity-badge-color.svg        |   1 +
 .../images/integrations/logo-rapid7-black.svg |   1 +
 .../images/integrations/logo-splunk-black.svg |   1 +
 .../src/images/integrations/okta-darkmode.svg |   1 +
 .../images/integrations/onelogin-darkmode.svg |   1 +
 .../images/integrations/rapid7-darkmode.svg   |   1 +
 .../images/integrations/splunk-darkmode.svg   |   1 +
 apps/web/src/locales/en/messages.json         | 115 +++++++---
 .../organizations/manage/scim.component.html  |   7 +-
 .../integration-grid.component.ts             |  15 --
 .../integrations/integrations.component.html  |  12 +-
 .../integrations.component.spec.ts            |  21 +-
 .../integrations/integrations.component.ts    |  19 +-
 .../integrations/integrations.module.ts       |  17 +-
 bitwarden_license/bit-web/tsconfig.json       |   3 +-
 libs/common/src/enums/feature-flag.enum.ts    |   2 +
 .../common/src/enums/integration-type.enum.ts |   5 +
 54 files changed, 764 insertions(+), 110 deletions(-)
 create mode 100644 apps/web/src/app/admin-console/organizations/integrations/integrations.component.html
 create mode 100644 apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts
 create mode 100644 apps/web/src/app/shared/components/index.ts
 rename {bitwarden_license/bit-web/src/app/secrets-manager => apps/web/src/app/shared/components}/integrations/integration-card/integration-card.component.html (64%)
 rename {bitwarden_license/bit-web/src/app/secrets-manager => apps/web/src/app/shared/components}/integrations/integration-card/integration-card.component.spec.ts (86%)
 rename {bitwarden_license/bit-web/src/app/secrets-manager => apps/web/src/app/shared/components}/integrations/integration-card/integration-card.component.ts (95%)
 create mode 100644 apps/web/src/app/shared/components/integrations/integration-card/integration-card.stories.ts
 rename {bitwarden_license/bit-web/src/app/secrets-manager => apps/web/src/app/shared/components}/integrations/integration-grid/integration-grid.component.html (66%)
 rename {bitwarden_license/bit-web/src/app/secrets-manager => apps/web/src/app/shared/components}/integrations/integration-grid/integration-grid.component.spec.ts (61%)
 create mode 100644 apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.ts
 create mode 100644 apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.stories.ts
 create mode 100644 apps/web/src/app/shared/components/integrations/integrations.pipe.ts
 rename bitwarden_license/bit-web/src/app/secrets-manager/integrations/models/integration.ts => apps/web/src/app/shared/components/integrations/models.ts (95%)
 create mode 100644 apps/web/src/images/integrations/aws-color.svg
 create mode 100644 apps/web/src/images/integrations/aws-darkmode.svg
 create mode 100644 apps/web/src/images/integrations/azure-active-directory.svg
 create mode 100644 apps/web/src/images/integrations/bitwarden-vertical-blue.svg
 create mode 100644 apps/web/src/images/integrations/jumpcloud-darkmode.svg
 create mode 100644 apps/web/src/images/integrations/logo-auth0-badge-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-duo-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-elastic-badge-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-google-badge-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-jumpcloud-badge-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-keycloak-icon.svg
 create mode 100644 apps/web/src/images/integrations/logo-microsoft-entra-id-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-microsoft-intune-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-microsoft-sentinel-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-okta-symbol-black.svg
 create mode 100644 apps/web/src/images/integrations/logo-onelogin-badge-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-panther-round-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-ping-identity-badge-color.svg
 create mode 100644 apps/web/src/images/integrations/logo-rapid7-black.svg
 create mode 100644 apps/web/src/images/integrations/logo-splunk-black.svg
 create mode 100644 apps/web/src/images/integrations/okta-darkmode.svg
 create mode 100644 apps/web/src/images/integrations/onelogin-darkmode.svg
 create mode 100644 apps/web/src/images/integrations/rapid7-darkmode.svg
 create mode 100644 apps/web/src/images/integrations/splunk-darkmode.svg
 delete mode 100644 bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.ts

diff --git a/.storybook/main.ts b/.storybook/main.ts
index 454da4377dc..b48a86ba2b2 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -57,6 +57,7 @@ const config: StorybookConfig = {
     return config;
   },
   docs: {},
+  staticDirs: ["../apps/web/src/images"],
 };
 
 export default config;
diff --git a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts
index 75e63d42428..5d138e8137d 100644
--- a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts
+++ b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts
@@ -59,8 +59,14 @@ describe("Is Enterprise Org Guard", () => {
           {
             path: "organizations/:organizationId/enterpriseOrgsOnly",
             component: IsEnterpriseOrganizationComponent,
-            canActivate: [isEnterpriseOrgGuard()],
+            canActivate: [isEnterpriseOrgGuard(true)],
           },
+          {
+            path: "organizations/:organizationId/enterpriseOrgsOnlyNoError",
+            component: IsEnterpriseOrganizationComponent,
+            canActivate: [isEnterpriseOrgGuard(false)],
+          },
+
           {
             path: "organizations/:organizationId/billing/subscription",
             component: OrganizationUpgradeScreenComponent,
@@ -115,6 +121,24 @@ describe("Is Enterprise Org Guard", () => {
     );
   });
 
+  it.each([
+    ProductTierType.Free,
+    ProductTierType.Families,
+    ProductTierType.Teams,
+    ProductTierType.TeamsStarter,
+  ])("does not proceed with the navigation for productTierType '%s'", async (productTierType) => {
+    const org = orgFactory({
+      type: OrganizationUserType.User,
+      productTierType: productTierType,
+    });
+    organizationService.get.calledWith(org.id).mockResolvedValue(org);
+    await routerHarness.navigateByUrl(`organizations/${org.id}/enterpriseOrgsOnlyNoError`);
+    expect(dialogService.openSimpleDialog).not.toHaveBeenCalled();
+    expect(
+      routerHarness.routeNativeElement?.querySelector("h1")?.textContent?.trim() ?? "",
+    ).not.toBe("This component can only be accessed by a enterprise organization!");
+  });
+
   it("proceeds with navigation if the organization in question is a enterprise organization", async () => {
     const org = orgFactory({ productTierType: ProductTierType.Enterprise });
     organizationService.get.calledWith(org.id).mockResolvedValue(org);
diff --git a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts
index 8a0d374997d..5eab89ae68a 100644
--- a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts
+++ b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts
@@ -17,7 +17,7 @@ import { DialogService } from "@bitwarden/components";
  * if they have access to upgrade the organization. If the organization is
  * enterprise routing proceeds."
  */
-export function isEnterpriseOrgGuard(): CanActivateFn {
+export function isEnterpriseOrgGuard(showError: boolean = true): CanActivateFn {
   return async (route: ActivatedRouteSnapshot, _state: RouterStateSnapshot) => {
     const router = inject(Router);
     const organizationService = inject(OrganizationService);
@@ -29,7 +29,7 @@ export function isEnterpriseOrgGuard(): CanActivateFn {
       return router.createUrlTree(["/"]);
     }
 
-    if (org.productTierType != ProductTierType.Enterprise) {
+    if (org.productTierType != ProductTierType.Enterprise && showError) {
       // Users without billing permission can't access billing
       if (!org.canEditSubscription) {
         await dialogService.openSimpleDialog({
diff --git a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.html b/apps/web/src/app/admin-console/organizations/integrations/integrations.component.html
new file mode 100644
index 00000000000..61e7996becd
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/integrations/integrations.component.html
@@ -0,0 +1,66 @@
+<app-header> </app-header>
+
+<bit-tab-group [(selectedIndex)]="tabIndex">
+  <bit-tab [label]="'singleSignOn' | i18n">
+    <section class="tw-mb-9">
+      <h2 bitTypography="h2">{{ "singleSignOn" | i18n }}</h2>
+      <p bitTypography="body1">
+        {{ "ssoDescStart" | i18n }}
+        <a bitLink routerLink="../settings/sso" class="tw-lowercase">{{ "singleSignOn" | i18n }}</a>
+        {{ "ssoDescEnd" | i18n }}
+      </p>
+      <app-integration-grid
+        [integrations]="integrationsList | filterIntegrations: IntegrationType.SSO"
+      ></app-integration-grid>
+    </section>
+  </bit-tab>
+
+  <bit-tab [label]="'userProvisioning' | i18n">
+    <section class="tw-mb-9">
+      <h2 bitTypography="h2">
+        {{ "scimIntegration" | i18n }}
+      </h2>
+      <p bitTypography="body1">
+        {{ "scimIntegrationDescStart" | i18n }}
+        <a bitLink routerLink="../settings/scim">{{ "scimIntegration" | i18n }}</a>
+        {{ "scimIntegrationDescEnd" | i18n }}
+      </p>
+      <app-integration-grid
+        [integrations]="integrationsList | filterIntegrations: IntegrationType.SCIM"
+      ></app-integration-grid>
+    </section>
+    <section class="tw-mb-9">
+      <h2 bitTypography="h2">
+        {{ "bwdc" | i18n }}
+      </h2>
+      <p bitTypography="body1">{{ "bwdcDesc" | i18n }}</p>
+      <app-integration-grid
+        [integrations]="integrationsList | filterIntegrations: IntegrationType.BWDC"
+      ></app-integration-grid>
+    </section>
+  </bit-tab>
+
+  <bit-tab [label]="'eventManagement' | i18n">
+    <section class="tw-mb-9">
+      <h2 bitTypography="h2">
+        {{ "eventManagement" | i18n }}
+      </h2>
+      <p bitTypography="body1">{{ "eventManagementDesc" | i18n }}</p>
+      <app-integration-grid
+        [integrations]="integrationsList | filterIntegrations: IntegrationType.EVENT"
+      ></app-integration-grid>
+    </section>
+  </bit-tab>
+
+  <bit-tab [label]="'deviceManagement' | i18n">
+    <section class="tw-mb-9">
+      <h2 bitTypography="h2">
+        {{ "deviceManagement" | i18n }}
+      </h2>
+      <p bitTypography="body1">{{ "deviceManagementDesc" | i18n }}</p>
+      <app-integration-grid
+        [integrations]="integrationsList | filterIntegrations: IntegrationType.DEVICE"
+      ></app-integration-grid>
+    </section>
+  </bit-tab>
+</bit-tab-group>
diff --git a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts b/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts
new file mode 100644
index 00000000000..4b8822da7ca
--- /dev/null
+++ b/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts
@@ -0,0 +1,207 @@
+import { Component } from "@angular/core";
+
+import { IntegrationType } from "@bitwarden/common/enums";
+
+import { HeaderModule } from "../../../layouts/header/header.module";
+import { FilterIntegrationsPipe, IntegrationGridComponent, Integration } from "../../../shared/";
+import { SharedModule } from "../../../shared/shared.module";
+import { SharedOrganizationModule } from "../shared";
+
+@Component({
+  selector: "ac-integrations",
+  templateUrl: "./integrations.component.html",
+  standalone: true,
+  imports: [
+    SharedModule,
+    SharedOrganizationModule,
+    IntegrationGridComponent,
+    HeaderModule,
+    FilterIntegrationsPipe,
+  ],
+})
+export class AdminConsoleIntegrationsComponent {
+  integrationsList: Integration[] = [];
+  tabIndex: number;
+
+  constructor() {
+    this.integrationsList = [
+      {
+        name: "AD FS",
+        linkURL: "https://bitwarden.com/help/saml-adfs/",
+        image: "../../../../../../../images/integrations/azure-active-directory.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "Auth0",
+        linkURL: "https://bitwarden.com/help/saml-auth0/",
+        image: "../../../../../../../images/integrations/logo-auth0-badge-color.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "AWS",
+        linkURL: "https://bitwarden.com/help/saml-aws/",
+        image: "../../../../../../../images/integrations/aws-color.svg",
+        imageDarkMode: "../../../../../../../images/integrations/aws-darkmode.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "Microsoft Entra ID",
+        linkURL: "https://bitwarden.com/help/saml-azure/",
+        image: "../../../../../../../images/integrations/logo-microsoft-entra-id-color.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "Duo",
+        linkURL: "https://bitwarden.com/help/saml-duo/",
+        image: "../../../../../../../images/integrations/logo-duo-color.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "Google",
+        linkURL: "https://bitwarden.com/help/saml-google/",
+        image: "../../../../../../../images/integrations/logo-google-badge-color.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "JumpCloud",
+        linkURL: "https://bitwarden.com/help/saml-jumpcloud/",
+        image: "../../../../../../../images/integrations/logo-jumpcloud-badge-color.svg",
+        imageDarkMode: "../../../../../../../images/integrations/jumpcloud-darkmode.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "KeyCloak",
+        linkURL: "https://bitwarden.com/help/saml-keycloak/",
+        image: "../../../../../../../images/integrations/logo-keycloak-icon.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "Okta",
+        linkURL: "https://bitwarden.com/help/saml-okta/",
+        image: "../../../../../../../images/integrations/logo-okta-symbol-black.svg",
+        imageDarkMode: "../../../../../../../images/integrations/okta-darkmode.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "OneLogin",
+        linkURL: "https://bitwarden.com/help/saml-onelogin/",
+        image: "../../../../../../../images/integrations/logo-onelogin-badge-color.svg",
+        imageDarkMode: "../../../../../../../images/integrations/onelogin-darkmode.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "PingFederate",
+        linkURL: "https://bitwarden.com/help/saml-pingfederate/",
+        image: "../../../../../../../images/integrations/logo-ping-identity-badge-color.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "Microsoft Entra ID",
+        linkURL: "https://bitwarden.com/help/microsoft-entra-id-scim-integration/",
+        image: "../../../../../../../images/integrations/logo-microsoft-entra-id-color.svg",
+        type: IntegrationType.SCIM,
+      },
+      {
+        name: "Okta",
+        linkURL: "https://bitwarden.com/help/okta-scim-integration/",
+        image: "../../../../../../../images/integrations/logo-okta-symbol-black.svg",
+        imageDarkMode: "../../../../../../../images/integrations/okta-darkmode.svg",
+        type: IntegrationType.SCIM,
+      },
+      {
+        name: "OneLogin",
+        linkURL: "https://bitwarden.com/help/onelogin-scim-integration/",
+        image: "../../../../../../../images/integrations/logo-onelogin-badge-color.svg",
+        imageDarkMode: "../../../../../../../images/integrations/onelogin-darkmode.svg",
+        type: IntegrationType.SCIM,
+      },
+      {
+        name: "JumpCloud",
+        linkURL: "https://bitwarden.com/help/jumpcloud-scim-integration/",
+        image: "../../../../../../../images/integrations/logo-jumpcloud-badge-color.svg",
+        imageDarkMode: "../../../../../../../images/integrations/jumpcloud-darkmode.svg",
+        type: IntegrationType.SCIM,
+      },
+      {
+        name: "Ping Identity",
+        linkURL: "https://bitwarden.com/help/ping-identity-scim-integration/",
+        image: "../../../../../../../images/integrations/logo-ping-identity-badge-color.svg",
+        type: IntegrationType.SCIM,
+      },
+      {
+        name: "Active Directory",
+        linkURL: "https://bitwarden.com/help/ldap-directory/",
+        image: "../../../../../../../images/integrations/azure-active-directory.svg",
+        type: IntegrationType.BWDC,
+      },
+      {
+        name: "Microsoft Entra ID",
+        linkURL: "https://bitwarden.com/help/microsoft-entra-id/",
+        image: "../../../../../../../images/integrations/logo-microsoft-entra-id-color.svg",
+        type: IntegrationType.BWDC,
+      },
+      {
+        name: "Google Workspace",
+        linkURL: "https://bitwarden.com/help/workspace-directory/",
+        image: "../../../../../../../images/integrations/logo-google-badge-color.svg",
+        type: IntegrationType.BWDC,
+      },
+      {
+        name: "Okta",
+        linkURL: "https://bitwarden.com/help/okta-directory/",
+        image: "../../../../../../../images/integrations/logo-okta-symbol-black.svg",
+        imageDarkMode: "../../../../../../../images/integrations/okta-darkmode.svg",
+        type: IntegrationType.BWDC,
+      },
+      {
+        name: "OneLogin",
+        linkURL: "https://bitwarden.com/help/onelogin-directory/",
+        image: "../../../../../../../images/integrations/logo-onelogin-badge-color.svg",
+        imageDarkMode: "../../../../../../../images/integrations/onelogin-darkmode.svg",
+        type: IntegrationType.BWDC,
+      },
+      {
+        name: "Splunk",
+        linkURL: "https://bitwarden.com/help/splunk-siem/",
+        image: "../../../../../../../images/integrations/logo-splunk-black.svg",
+        imageDarkMode: "../../../../../../../images/integrations/splunk-darkmode.svg",
+        type: IntegrationType.EVENT,
+      },
+      {
+        name: "Microsoft Sentinel",
+        linkURL: "https://bitwarden.com/help/microsoft-sentinel-siem/",
+        image: "../../../../../../../images/integrations/logo-microsoft-sentinel-color.svg",
+        type: IntegrationType.EVENT,
+      },
+      {
+        name: "Rapid7",
+        linkURL: "https://bitwarden.com/help/rapid7-siem/",
+        image: "../../../../../../../images/integrations/logo-rapid7-black.svg",
+        imageDarkMode: "../../../../../../../images/integrations/rapid7-darkmode.svg",
+        type: IntegrationType.EVENT,
+      },
+      {
+        name: "Elastic",
+        linkURL: "https://bitwarden.com/help/elastic-siem/",
+        image: "../../../../../../../images/integrations/logo-elastic-badge-color.svg",
+        type: IntegrationType.EVENT,
+      },
+      {
+        name: "Panther",
+        linkURL: "https://bitwarden.com/help/panther-siem/",
+        image: "../../../../../../../images/integrations/logo-panther-round-color.svg",
+        type: IntegrationType.EVENT,
+      },
+      {
+        name: "Microsoft Intune",
+        linkURL: "https://bitwarden.com/help/deploy-browser-extensions-with-intune/",
+        image: "../../../../../../../images/integrations/logo-microsoft-intune-color.svg",
+        type: IntegrationType.DEVICE,
+      },
+    ];
+  }
+
+  get IntegrationType(): typeof IntegrationType {
+    return IntegrationType;
+  }
+}
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
index 1e811b6c29d..ce832ef06e9 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -60,6 +60,12 @@
         <bit-nav-item [text]="'billingHistory' | i18n" route="billing/history"></bit-nav-item>
       </ng-container>
     </bit-nav-group>
+    <bit-nav-item
+      icon="bwi-providers"
+      [text]="'integrations' | i18n"
+      route="integrations"
+      *ngIf="integrationPageEnabled$ | async"
+    ></bit-nav-item>
     <bit-nav-group
       icon="bwi-cog"
       [text]="'settings' | i18n"
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
index a15882f42de..9f67a8859eb 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -18,6 +18,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli
 import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service";
 import { PolicyType, ProviderStatusType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
@@ -47,12 +48,15 @@ export class OrganizationLayoutComponent implements OnInit {
 
   protected orgFilter = (org: Organization) => canAccessOrgAdmin(org);
 
+  protected integrationPageEnabled$: Observable<boolean>;
+
   organization$: Observable<Organization>;
   canAccessExport$: Observable<boolean>;
   showPaymentAndHistory$: Observable<boolean>;
   hideNewOrgButton$: Observable<boolean>;
   organizationIsUnmanaged$: Observable<boolean>;
   isAccessIntelligenceFeatureEnabled = false;
+  enterpriseOrganization$: Observable<boolean>;
 
   constructor(
     private route: ActivatedRoute,
@@ -104,6 +108,16 @@ export class OrganizationLayoutComponent implements OnInit {
           provider.providerStatus !== ProviderStatusType.Billable,
       ),
     );
+
+    this.integrationPageEnabled$ = combineLatest(
+      this.organization$,
+      this.configService.getFeatureFlag$(FeatureFlag.PM14505AdminConsoleIntegrationPage),
+    ).pipe(
+      map(
+        ([org, featureFlagEnabled]) =>
+          org.productTierType === ProductTierType.Enterprise && featureFlagEnabled,
+      ),
+    );
   }
 
   canShowVaultTab(organization: Organization): boolean {
diff --git a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
index 538cc45ac63..31544968dd4 100644
--- a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
 import { authGuard } from "@bitwarden/angular/auth/guards";
+import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
 import {
   canAccessOrgAdmin,
   canAccessGroupsTab,
@@ -11,6 +12,7 @@ import {
   canAccessSettingsTab,
 } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
 import { organizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
 import { organizationRedirectGuard } from "../../admin-console/organizations/guards/org-redirect.guard";
@@ -18,6 +20,8 @@ import { OrganizationLayoutComponent } from "../../admin-console/organizations/l
 import { deepLinkGuard } from "../../auth/guards/deep-link.guard";
 import { VaultModule } from "../../vault/org-vault/vault.module";
 
+import { isEnterpriseOrgGuard } from "./guards/is-enterprise-org.guard";
+import { AdminConsoleIntegrationsComponent } from "./integrations/integrations.component";
 import { GroupsComponent } from "./manage/groups.component";
 
 const routes: Routes = [
@@ -36,6 +40,17 @@ const routes: Routes = [
         path: "vault",
         loadChildren: () => VaultModule,
       },
+      {
+        path: "integrations",
+        canActivate: [
+          canAccessFeature(FeatureFlag.PM14505AdminConsoleIntegrationPage),
+          isEnterpriseOrgGuard(false),
+        ],
+        component: AdminConsoleIntegrationsComponent,
+        data: {
+          titleId: "integrations",
+        },
+      },
       {
         path: "settings",
         loadChildren: () =>
diff --git a/apps/web/src/app/shared/components/index.ts b/apps/web/src/app/shared/components/index.ts
new file mode 100644
index 00000000000..5745a7827ff
--- /dev/null
+++ b/apps/web/src/app/shared/components/index.ts
@@ -0,0 +1,4 @@
+export * from "./integrations/integration-card/integration-card.component";
+export * from "./integrations/integration-grid/integration-grid.component";
+export * from "./integrations/integrations.pipe";
+export * from "./integrations/models";
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.html b/apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.html
similarity index 64%
rename from bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.html
rename to apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.html
index 5bb9ed425fc..4801c392976 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.html
+++ b/apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.html
@@ -1,8 +1,11 @@
 <div
-  class="tw-block tw-h-full tw-overflow-hidden tw-rounded tw-border tw-border-solid tw-border-secondary-600 tw-relative tw-transition-all xl:tw-w-64 hover:tw-scale-105 focus-within:tw-outline-none focus-within:tw-ring focus-within:tw-ring-primary-700 focus-within:tw-ring-offset-2"
+  class="tw-block tw-h-full tw-overflow-hidden tw-rounded tw-border tw-border-solid tw-border-secondary-600 tw-relative tw-transition-all hover:tw-scale-105 focus-within:tw-outline-none focus-within:tw-ring focus-within:tw-ring-primary-700 focus-within:tw-ring-offset-2"
 >
+  <div class="tw-flex tw-bg-secondary-100 tw-items-center tw-justify-end tw-pt-4 tw-pr-4">
+    <i class="bwi bwi-external-link"></i>
+  </div>
   <div
-    class="tw-flex tw-h-36 tw-bg-secondary-100 tw-items-center tw-justify-center tw-py-2 tw-px-6 lg:tw-py-4 lg:tw-px-12"
+    class="tw-flex tw-h-32 tw-bg-secondary-100 tw-items-center tw-justify-center tw-pb-2 tw-px-6 lg:tw-pb-4 lg:tw-px-12"
   >
     <div class="tw-flex tw-items-center tw-justify-center tw-h-28 tw-w-28 lg:tw-w-40">
       <img
@@ -14,14 +17,13 @@
     </div>
   </div>
   <div class="tw-p-5">
-    <h3 class="tw-mb-4 tw-text-lg tw-font-semibold">{{ name }}</h3>
+    <h3 class="tw-text-main tw-text-lg tw-font-semibold">{{ name }}</h3>
     <a
       class="tw-block tw-mb-0 tw-font-bold hover:tw-no-underline focus:tw-outline-none after:tw-content-[''] after:tw-block after:tw-absolute after:tw-w-full after:tw-h-full after:tw-left-0 after:tw-top-0"
       [href]="linkURL"
       rel="noopener noreferrer"
       target="_blank"
     >
-      {{ linkText }}
     </a>
     <span *ngIf="showNewBadge()" bitBadge class="tw-mt-3" variant="secondary">
       {{ "new" | i18n }}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.spec.ts b/apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.spec.ts
similarity index 86%
rename from bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.spec.ts
rename to apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.spec.ts
index 94cec5f627f..c8b6a290427 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.spec.ts
+++ b/apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.spec.ts
@@ -1,9 +1,13 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { mock } from "jest-mock-extended";
 import { BehaviorSubject } from "rxjs";
 
-import { SYSTEM_THEME_OBSERVABLE } from "../../../../../../../libs/angular/src/services/injection-tokens";
-import { ThemeType } from "../../../../../../../libs/common/src/platform/enums";
-import { ThemeStateService } from "../../../../../../../libs/common/src/platform/theming/theme-state.service";
+import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ThemeType } from "@bitwarden/common/platform/enums";
+import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
+import { SharedModule } from "@bitwarden/components/src/shared";
+import { I18nPipe } from "@bitwarden/components/src/shared/i18n.pipe";
 
 import { IntegrationCardComponent } from "./integration-card.component";
 
@@ -19,7 +23,7 @@ describe("IntegrationCardComponent", () => {
     systemTheme$.next(ThemeType.Light);
 
     await TestBed.configureTestingModule({
-      declarations: [IntegrationCardComponent],
+      imports: [IntegrationCardComponent, SharedModule],
       providers: [
         {
           provide: ThemeStateService,
@@ -29,6 +33,14 @@ describe("IntegrationCardComponent", () => {
           provide: SYSTEM_THEME_OBSERVABLE,
           useValue: systemTheme$,
         },
+        {
+          provide: I18nPipe,
+          useValue: mock<I18nPipe>(),
+        },
+        {
+          provide: I18nService,
+          useValue: mock<I18nService>(),
+        },
       ],
     }).compileComponents();
   });
@@ -39,7 +51,6 @@ describe("IntegrationCardComponent", () => {
 
     component.name = "Integration Name";
     component.image = "test-image.png";
-    component.linkText = "Get started with integration";
     component.linkURL = "https://example.com/";
 
     fixture.detectChanges();
@@ -53,10 +64,8 @@ describe("IntegrationCardComponent", () => {
 
   it("renders card body", () => {
     const name = fixture.nativeElement.querySelector("h3");
-    const link = fixture.nativeElement.querySelector("a");
 
     expect(name.textContent).toBe("Integration Name");
-    expect(link.textContent.trim()).toBe("Get started with integration");
   });
 
   it("assigns external rel attribute", () => {
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.ts b/apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.ts
similarity index 95%
rename from bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.ts
rename to apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.ts
index bf5f5bd3112..a33fbd28c96 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-card/integration-card.component.ts
+++ b/apps/web/src/app/shared/components/integrations/integration-card/integration-card.component.ts
@@ -13,9 +13,13 @@ import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-t
 import { ThemeType } from "@bitwarden/common/platform/enums";
 import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
 
+import { SharedModule } from "../../../shared.module";
+
 @Component({
-  selector: "sm-integration-card",
+  selector: "app-integration-card",
   templateUrl: "./integration-card.component.html",
+  standalone: true,
+  imports: [SharedModule],
 })
 export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
   private destroyed$: Subject<void> = new Subject();
@@ -24,7 +28,6 @@ export class IntegrationCardComponent implements AfterViewInit, OnDestroy {
   @Input() name: string;
   @Input() image: string;
   @Input() imageDarkMode?: string;
-  @Input() linkText: string;
   @Input() linkURL: string;
 
   /** Adds relevant `rel` attribute to external links */
diff --git a/apps/web/src/app/shared/components/integrations/integration-card/integration-card.stories.ts b/apps/web/src/app/shared/components/integrations/integration-card/integration-card.stories.ts
new file mode 100644
index 00000000000..1d1e229740f
--- /dev/null
+++ b/apps/web/src/app/shared/components/integrations/integration-card/integration-card.stories.ts
@@ -0,0 +1,63 @@
+import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+import { of } from "rxjs";
+
+import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ThemeTypes } from "@bitwarden/common/platform/enums";
+import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
+import { I18nMockService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared.module";
+
+import { IntegrationCardComponent } from "./integration-card.component";
+
+class MockThemeService implements Partial<ThemeStateService> {}
+
+export default {
+  title: "Web/Integration Layout/Integration Card",
+  component: IntegrationCardComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [SharedModule],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({});
+          },
+        },
+        {
+          provide: ThemeStateService,
+          useClass: MockThemeService,
+        },
+        {
+          provide: SYSTEM_THEME_OBSERVABLE,
+          useValue: of(ThemeTypes.Light),
+        },
+      ],
+    }),
+  ],
+  args: {
+    integrations: [],
+  },
+} as Meta;
+
+type Story = StoryObj<IntegrationCardComponent>;
+
+export const Default: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+    <app-integration-card
+      [name]="name"
+      [image]="image"
+      [linkURL]="linkURL"
+    ></app-integration-card>
+      `,
+  }),
+  args: {
+    name: "Bitwarden",
+    image: "/integrations/bitwarden-vertical-blue.svg",
+    linkURL: "https://bitwarden.com",
+  },
+};
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.html b/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.html
similarity index 66%
rename from bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.html
rename to apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.html
index a0c82d2f342..4b4b3ac972b 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.html
+++ b/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.html
@@ -1,15 +1,18 @@
 <ul
   class="tw-inline-grid tw-grid-cols-3 tw-gap-6 tw-m-0 tw-p-0 tw-w-full tw-auto-cols-auto tw-list-none lg:tw-grid-cols-4 lg:tw-gap-10 lg:tw-w-auto"
 >
-  <li *ngFor="let integration of integrations">
-    <sm-integration-card
+  <li
+    *ngFor="let integration of integrations"
+    [title]="tooltipI18nKey | i18n: integration.name"
+    [attr.aria-label]="ariaI18nKey | i18n: integration.name"
+  >
+    <app-integration-card
       [name]="integration.name"
-      [linkText]="integration.linkText"
       [linkURL]="integration.linkURL"
       [image]="integration.image"
       [imageDarkMode]="integration.imageDarkMode"
       [externalURL]="integration.type === IntegrationType.SDK"
       [newBadgeExpiration]="integration.newBadgeExpiration"
-    ></sm-integration-card>
+    ></app-integration-card>
   </li>
 </ul>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.spec.ts b/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.spec.ts
similarity index 61%
rename from bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.spec.ts
rename to apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.spec.ts
index e74e057e069..c77ec455e00 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.spec.ts
+++ b/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.spec.ts
@@ -3,12 +3,16 @@ import { By } from "@angular/platform-browser";
 import { mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
-import { SYSTEM_THEME_OBSERVABLE } from "../../../../../../../libs/angular/src/services/injection-tokens";
-import { IntegrationType } from "../../../../../../../libs/common/src/enums";
-import { ThemeType } from "../../../../../../../libs/common/src/platform/enums";
-import { ThemeStateService } from "../../../../../../../libs/common/src/platform/theming/theme-state.service";
+import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
+import { IntegrationType } from "@bitwarden/common/enums";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ThemeTypes } from "@bitwarden/common/platform/enums";
+import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
+import { SharedModule } from "@bitwarden/components/src/shared";
+import { I18nPipe } from "@bitwarden/components/src/shared/i18n.pipe";
+
 import { IntegrationCardComponent } from "../integration-card/integration-card.component";
-import { Integration } from "../models/integration";
+import { Integration } from "../models";
 
 import { IntegrationGridComponent } from "./integration-grid.component";
 
@@ -19,14 +23,12 @@ describe("IntegrationGridComponent", () => {
     {
       name: "Integration 1",
       image: "test-image1.png",
-      linkText: "Get started with integration 1",
       linkURL: "https://example.com/1",
       type: IntegrationType.Integration,
     },
     {
       name: "SDK 2",
       image: "test-image2.png",
-      linkText: "View SDK 2",
       linkURL: "https://example.com/2",
       type: IntegrationType.SDK,
     },
@@ -34,7 +36,7 @@ describe("IntegrationGridComponent", () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      declarations: [IntegrationGridComponent, IntegrationCardComponent],
+      imports: [IntegrationGridComponent, IntegrationCardComponent, SharedModule],
       providers: [
         {
           provide: ThemeStateService,
@@ -42,7 +44,15 @@ describe("IntegrationGridComponent", () => {
         },
         {
           provide: SYSTEM_THEME_OBSERVABLE,
-          useValue: of(ThemeType.Light),
+          useValue: of(ThemeTypes.Light),
+        },
+        {
+          provide: I18nPipe,
+          useValue: mock<I18nPipe>(),
+        },
+        {
+          provide: I18nService,
+          useValue: mock<I18nService>({ t: (key, p1) => key + " " + p1 }),
         },
       ],
     });
@@ -50,6 +60,8 @@ describe("IntegrationGridComponent", () => {
     fixture = TestBed.createComponent(IntegrationGridComponent);
     component = fixture.componentInstance;
     component.integrations = integrations;
+    component.ariaI18nKey = "integrationCardAriaLabel";
+    component.tooltipI18nKey = "integrationCardTooltip";
     fixture.detectChanges();
   });
 
@@ -68,7 +80,6 @@ describe("IntegrationGridComponent", () => {
 
     expect(card.componentInstance.name).toBe("SDK 2");
     expect(card.componentInstance.image).toBe("test-image2.png");
-    expect(card.componentInstance.linkText).toBe("View SDK 2");
     expect(card.componentInstance.linkURL).toBe("https://example.com/2");
   });
 
@@ -78,4 +89,12 @@ describe("IntegrationGridComponent", () => {
     expect(card[0].componentInstance.externalURL).toBe(false);
     expect(card[1].componentInstance.externalURL).toBe(true);
   });
+
+  it("has a tool tip and aria label attributes", () => {
+    const card: HTMLElement = fixture.debugElement.queryAll(By.css("li"))[0].nativeElement;
+    expect(card.title).toBe("integrationCardTooltip" + " " + integrations[0].name);
+    expect(card.getAttribute("aria-label")).toBe(
+      "integrationCardAriaLabel" + " " + integrations[0].name,
+    );
+  });
 });
diff --git a/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.ts b/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.ts
new file mode 100644
index 00000000000..7660162f879
--- /dev/null
+++ b/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.component.ts
@@ -0,0 +1,22 @@
+import { Component, Input } from "@angular/core";
+
+import { IntegrationType } from "@bitwarden/common/enums";
+
+import { SharedModule } from "../../../shared.module";
+import { IntegrationCardComponent } from "../integration-card/integration-card.component";
+import { Integration } from "../models";
+
+@Component({
+  selector: "app-integration-grid",
+  templateUrl: "./integration-grid.component.html",
+  standalone: true,
+  imports: [IntegrationCardComponent, SharedModule],
+})
+export class IntegrationGridComponent {
+  @Input() integrations: Integration[];
+
+  @Input() ariaI18nKey: string = "integrationCardAriaLabel";
+  @Input() tooltipI18nKey: string = "integrationCardTooltip";
+
+  protected IntegrationType = IntegrationType;
+}
diff --git a/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.stories.ts b/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.stories.ts
new file mode 100644
index 00000000000..2ec0bccec3d
--- /dev/null
+++ b/apps/web/src/app/shared/components/integrations/integration-grid/integration-grid.stories.ts
@@ -0,0 +1,77 @@
+import { Meta, StoryObj, moduleMetadata } from "@storybook/angular";
+import { of } from "rxjs";
+
+import { SYSTEM_THEME_OBSERVABLE } from "@bitwarden/angular/services/injection-tokens";
+import { IntegrationType } from "@bitwarden/common/enums";
+import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
+import { ThemeTypes } from "@bitwarden/common/platform/enums";
+import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service";
+import { I18nMockService } from "@bitwarden/components";
+
+import { SharedModule } from "../../../shared.module";
+import { IntegrationCardComponent } from "../integration-card/integration-card.component";
+import { IntegrationGridComponent } from "../integration-grid/integration-grid.component";
+
+class MockThemeService implements Partial<ThemeStateService> {}
+
+export default {
+  title: "Web/Integration Layout/Integration Grid",
+  component: IntegrationGridComponent,
+  decorators: [
+    moduleMetadata({
+      imports: [IntegrationCardComponent, SharedModule],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              integrationCardAriaLabel: "Go to integration",
+              integrationCardTooltip: "Go to integration",
+            });
+          },
+        },
+        {
+          provide: ThemeStateService,
+          useClass: MockThemeService,
+        },
+        {
+          provide: SYSTEM_THEME_OBSERVABLE,
+          useValue: of(ThemeTypes.Dark),
+        },
+      ],
+    }),
+  ],
+} as Meta;
+
+type Story = StoryObj<IntegrationGridComponent>;
+
+export const Default: Story = {
+  render: (args) => ({
+    props: args,
+    template: /*html*/ `
+      <app-integration-grid [integrations]="integrations"></app-integration-grid>
+      `,
+  }),
+  args: {
+    integrations: [
+      {
+        name: "Card 1",
+        linkURL: "https://bitwarden.com",
+        image: "/integrations/bitwarden-vertical-blue.svg",
+        type: IntegrationType.SSO,
+      },
+      {
+        name: "Card 2",
+        linkURL: "https://bitwarden.com",
+        image: "/integrations/bitwarden-vertical-blue.svg",
+        type: IntegrationType.SDK,
+      },
+      {
+        name: "Card 3",
+        linkURL: "https://bitwarden.com",
+        image: "/integrations/bitwarden-vertical-blue.svg",
+        type: IntegrationType.SCIM,
+      },
+    ],
+  },
+};
diff --git a/apps/web/src/app/shared/components/integrations/integrations.pipe.ts b/apps/web/src/app/shared/components/integrations/integrations.pipe.ts
new file mode 100644
index 00000000000..760d9913e9e
--- /dev/null
+++ b/apps/web/src/app/shared/components/integrations/integrations.pipe.ts
@@ -0,0 +1,15 @@
+import { Pipe, PipeTransform } from "@angular/core";
+
+import { IntegrationType } from "@bitwarden/common/enums";
+
+import { Integration } from "../../../shared/components/integrations/models";
+
+@Pipe({
+  name: "filterIntegrations",
+  standalone: true,
+})
+export class FilterIntegrationsPipe implements PipeTransform {
+  transform(integrations: Integration[], type: IntegrationType): Integration[] {
+    return integrations.filter((integration) => integration.type === type);
+  }
+}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/models/integration.ts b/apps/web/src/app/shared/components/integrations/models.ts
similarity index 95%
rename from bitwarden_license/bit-web/src/app/secrets-manager/integrations/models/integration.ts
rename to apps/web/src/app/shared/components/integrations/models.ts
index 51ca79b30f7..765b1d44a2e 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/models/integration.ts
+++ b/apps/web/src/app/shared/components/integrations/models.ts
@@ -9,7 +9,6 @@ export type Integration = {
    */
   imageDarkMode?: string;
   linkURL: string;
-  linkText: string;
   type: IntegrationType;
   /**
    * Shows the "New" badge until the defined date.
diff --git a/apps/web/src/app/shared/index.ts b/apps/web/src/app/shared/index.ts
index 7defcdedfda..f57648c0e40 100644
--- a/apps/web/src/app/shared/index.ts
+++ b/apps/web/src/app/shared/index.ts
@@ -1,2 +1,3 @@
 export * from "./shared.module";
 export * from "./loose-components.module";
+export * from "./components/index";
diff --git a/apps/web/src/images/integrations/aws-color.svg b/apps/web/src/images/integrations/aws-color.svg
new file mode 100644
index 00000000000..963b65027db
--- /dev/null
+++ b/apps/web/src/images/integrations/aws-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M169.086 251.309c0 7.383.798 13.37 2.195 17.76 1.596 4.39 3.592 9.179 6.386 14.368.997 1.596 1.397 3.193 1.397 4.589 0 1.996-1.198 3.992-3.792 5.987l-12.572 8.381c-1.796 1.198-3.592 1.796-5.188 1.796-1.996 0-3.991-.997-5.987-2.793a61.826 61.826 0 0 1-7.184-9.379c-1.995-3.393-3.991-7.184-6.186-11.774-15.565 18.359-35.121 27.538-58.669 27.538-16.762 0-30.132-4.789-39.91-14.368-9.779-9.578-14.767-22.35-14.767-38.314 0-16.962 5.986-30.731 18.159-41.108 12.173-10.377 28.337-15.565 48.89-15.565 6.785 0 13.77.598 21.153 1.596 7.384.998 14.967 2.594 22.949 4.39v-14.567c0-15.166-3.193-25.742-9.379-31.929-6.386-6.186-17.162-9.179-32.527-9.179-6.985 0-14.169.798-21.552 2.594-7.384 1.796-14.567 3.991-21.552 6.785-3.193 1.397-5.587 2.195-6.984 2.594-1.397.399-2.395.599-3.193.599-2.794 0-4.19-1.996-4.19-6.186v-9.778c0-3.193.398-5.588 1.396-6.985.998-1.397 2.794-2.794 5.588-4.19 6.984-3.592 15.365-6.586 25.143-8.98 9.779-2.595 20.155-3.792 31.13-3.792 23.748 0 41.109 5.388 52.284 16.164 10.975 10.776 16.563 27.139 16.563 49.09v64.656h.399Zm-81.019 30.332c6.585 0 13.37-1.198 20.554-3.592 7.184-2.395 13.57-6.785 18.958-12.772 3.193-3.791 5.587-7.982 6.785-12.771 1.197-4.789 1.995-10.576 1.995-17.361v-8.382c-5.787-1.396-11.973-2.594-18.359-3.392-6.386-.798-12.572-1.197-18.758-1.197-13.37 0-23.148 2.594-29.733 7.982-6.586 5.388-9.779 12.971-9.779 22.949 0 9.379 2.395 16.363 7.384 21.152 4.79 4.989 11.774 7.384 20.953 7.384Zm160.242 21.552c-3.592 0-5.987-.599-7.583-1.996-1.597-1.197-2.994-3.991-4.191-7.783L189.64 139.159c-1.197-3.991-1.796-6.585-1.796-7.982 0-3.193 1.596-4.989 4.789-4.989h19.556c3.792 0 6.386.599 7.783 1.996 1.597 1.197 2.794 3.991 3.991 7.783l33.525 132.104 31.131-132.104c.997-3.992 2.195-6.586 3.791-7.783 1.597-1.197 4.39-1.996 7.982-1.996h15.965c3.791 0 6.385.599 7.982 1.996 1.596 1.197 2.993 3.991 3.791 7.783l31.53 133.7 34.522-133.7c1.198-3.992 2.595-6.586 3.992-7.783 1.596-1.197 4.19-1.996 7.782-1.996h18.559c3.192 0 4.988 1.597 4.988 4.989 0 .998-.199 1.996-.399 3.193-.199 1.197-.598 2.794-1.397 4.989l-48.092 154.255c-1.197 3.991-2.594 6.585-4.191 7.783-1.596 1.197-4.19 1.995-7.583 1.995H350.68c-3.792 0-6.386-.599-7.982-1.995-1.597-1.397-2.994-3.992-3.792-7.983l-30.931-128.712-30.731 128.513c-.998 3.991-2.195 6.585-3.792 7.982-1.596 1.397-4.39 1.996-7.982 1.996h-17.161Zm256.426 5.387c-10.377 0-20.753-1.197-30.731-3.591-9.978-2.395-17.76-4.989-22.949-7.983-3.193-1.796-5.388-3.791-6.186-5.587a14.091 14.091 0 0 1-1.197-5.588v-10.177c0-4.191 1.596-6.186 4.59-6.186 1.197 0 2.394.2 3.591.599 1.198.399 2.994 1.197 4.989 1.995a108.617 108.617 0 0 0 21.951 6.985c7.982 1.596 15.765 2.394 23.747 2.394 12.572 0 22.35-2.195 29.135-6.585 6.785-4.39 10.377-10.776 10.377-18.958 0-5.587-1.796-10.177-5.388-13.968-3.592-3.792-10.377-7.184-20.155-10.377l-28.935-8.98c-14.568-4.59-25.344-11.375-31.929-20.355-6.585-8.78-9.978-18.558-9.978-28.935 0-8.381 1.796-15.765 5.388-22.15 3.592-6.386 8.381-11.974 14.368-16.364 5.987-4.59 12.772-7.982 20.754-10.377 7.982-2.394 16.363-3.392 25.143-3.392 4.391 0 8.98.2 13.371.798 4.589.599 8.78 1.397 12.971 2.195 3.991.998 7.782 1.996 11.374 3.193 3.592 1.197 6.386 2.395 8.381 3.592 2.794 1.597 4.79 3.193 5.987 4.989 1.197 1.596 1.796 3.791 1.796 6.585v9.379c0 4.191-1.596 6.386-4.59 6.386-1.596 0-4.19-.798-7.583-2.395-11.374-5.188-24.146-7.782-38.314-7.782-11.375 0-20.355 1.796-26.541 5.587-6.186 3.792-9.379 9.579-9.379 17.761 0 5.587 1.996 10.376 5.987 14.168 3.991 3.791 11.374 7.583 21.951 10.975l28.336 8.98c14.368 4.59 24.745 10.976 30.931 19.157 6.186 8.182 9.18 17.561 9.18 27.938 0 8.581-1.796 16.363-5.189 23.148-3.592 6.785-8.381 12.772-14.567 17.561-6.186 4.989-13.57 8.581-22.151 11.175-8.98 2.794-18.359 4.19-28.536 4.19Z" fill="#252F3E"/><path fill-rule="evenodd" clip-rule="evenodd" d="M542.451 405.564c-65.653 48.491-161.04 74.234-243.057 74.234-114.943 0-218.51-42.505-296.736-113.147-6.186-5.588-.599-13.171 6.785-8.781 84.61 49.09 188.977 78.824 296.936 78.824 72.837 0 152.858-15.166 226.493-46.296 10.976-4.989 20.355 7.183 9.579 15.166Z" fill="#F90"/><path fill-rule="evenodd" clip-rule="evenodd" d="M569.79 374.433c-8.382-10.776-55.476-5.188-76.828-2.594-6.386.798-7.384-4.789-1.597-8.98 37.516-26.341 99.178-18.758 106.362-9.978 7.184 8.98-1.995 70.642-37.117 100.176-5.388 4.59-10.576 2.195-8.181-3.791 7.982-19.756 25.742-64.257 17.361-74.833Z" fill="#F90"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/aws-darkmode.svg b/apps/web/src/images/integrations/aws-darkmode.svg
new file mode 100644
index 00000000000..64c9ba3cf94
--- /dev/null
+++ b/apps/web/src/images/integrations/aws-darkmode.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)" fill="#fff"><path d="M169.086 251.309c0 7.383.798 13.37 2.195 17.76 1.596 4.39 3.592 9.179 6.386 14.368.997 1.596 1.397 3.193 1.397 4.589 0 1.996-1.198 3.992-3.792 5.987l-12.572 8.381c-1.796 1.198-3.592 1.796-5.188 1.796-1.996 0-3.991-.997-5.987-2.793a61.826 61.826 0 0 1-7.184-9.379c-1.995-3.393-3.991-7.184-6.186-11.774-15.565 18.359-35.121 27.538-58.669 27.538-16.762 0-30.132-4.789-39.91-14.368-9.779-9.578-14.767-22.35-14.767-38.314 0-16.962 5.986-30.731 18.159-41.108 12.173-10.377 28.337-15.565 48.89-15.565 6.785 0 13.77.598 21.153 1.596 7.384.998 14.967 2.594 22.949 4.39v-14.567c0-15.166-3.193-25.742-9.379-31.929-6.386-6.186-17.162-9.179-32.527-9.179-6.985 0-14.169.798-21.552 2.594-7.384 1.796-14.567 3.991-21.552 6.785-3.193 1.397-5.587 2.195-6.984 2.594-1.397.399-2.395.599-3.193.599-2.794 0-4.19-1.996-4.19-6.186v-9.778c0-3.193.398-5.588 1.396-6.985.998-1.397 2.794-2.794 5.588-4.19 6.984-3.592 15.365-6.586 25.143-8.98 9.779-2.595 20.155-3.792 31.13-3.792 23.748 0 41.109 5.388 52.284 16.164 10.975 10.776 16.563 27.139 16.563 49.09v64.656h.399Zm-81.019 30.332c6.585 0 13.37-1.198 20.554-3.592 7.184-2.395 13.57-6.785 18.958-12.772 3.193-3.791 5.587-7.982 6.785-12.771 1.197-4.789 1.995-10.576 1.995-17.361v-8.382c-5.787-1.396-11.973-2.594-18.359-3.392-6.386-.798-12.572-1.197-18.758-1.197-13.37 0-23.148 2.594-29.733 7.982-6.586 5.388-9.779 12.971-9.779 22.949 0 9.379 2.395 16.363 7.384 21.152 4.79 4.989 11.774 7.384 20.953 7.384Zm160.242 21.552c-3.592 0-5.987-.599-7.583-1.996-1.597-1.197-2.994-3.991-4.191-7.783L189.64 139.159c-1.197-3.991-1.796-6.585-1.796-7.982 0-3.193 1.596-4.989 4.789-4.989h19.556c3.792 0 6.386.599 7.783 1.996 1.597 1.197 2.794 3.991 3.991 7.783l33.525 132.104 31.131-132.104c.997-3.992 2.195-6.586 3.791-7.783 1.597-1.197 4.39-1.996 7.982-1.996h15.965c3.791 0 6.385.599 7.982 1.996 1.596 1.197 2.993 3.991 3.791 7.783l31.53 133.7 34.522-133.7c1.198-3.992 2.595-6.586 3.992-7.783 1.596-1.197 4.19-1.996 7.782-1.996h18.559c3.192 0 4.988 1.597 4.988 4.989 0 .998-.199 1.996-.399 3.193-.199 1.197-.598 2.794-1.397 4.989l-48.092 154.255c-1.197 3.991-2.594 6.585-4.191 7.783-1.596 1.197-4.19 1.995-7.583 1.995H350.68c-3.792 0-6.386-.599-7.982-1.995-1.597-1.397-2.994-3.992-3.792-7.983l-30.931-128.712-30.731 128.513c-.998 3.991-2.195 6.585-3.792 7.982-1.596 1.397-4.39 1.996-7.982 1.996h-17.161Zm256.426 5.387c-10.377 0-20.753-1.197-30.731-3.591-9.978-2.395-17.76-4.989-22.949-7.983-3.193-1.796-5.388-3.791-6.186-5.587a14.091 14.091 0 0 1-1.197-5.588v-10.177c0-4.191 1.596-6.186 4.59-6.186 1.197 0 2.394.2 3.591.599 1.198.399 2.994 1.197 4.989 1.995a108.617 108.617 0 0 0 21.951 6.985c7.982 1.596 15.765 2.394 23.747 2.394 12.572 0 22.35-2.195 29.135-6.585 6.785-4.39 10.377-10.776 10.377-18.958 0-5.587-1.796-10.177-5.388-13.968-3.592-3.792-10.377-7.184-20.155-10.377l-28.935-8.98c-14.568-4.59-25.344-11.375-31.929-20.355-6.585-8.78-9.978-18.558-9.978-28.935 0-8.381 1.796-15.765 5.388-22.15 3.592-6.386 8.381-11.974 14.368-16.364 5.987-4.59 12.772-7.982 20.754-10.377 7.982-2.394 16.363-3.392 25.143-3.392 4.391 0 8.98.2 13.371.798 4.589.599 8.78 1.397 12.971 2.195 3.991.998 7.782 1.996 11.374 3.193 3.592 1.197 6.386 2.395 8.381 3.592 2.794 1.597 4.79 3.193 5.987 4.989 1.197 1.596 1.796 3.791 1.796 6.585v9.379c0 4.191-1.596 6.386-4.59 6.386-1.596 0-4.19-.798-7.583-2.395-11.374-5.188-24.146-7.782-38.314-7.782-11.375 0-20.355 1.796-26.541 5.587-6.186 3.792-9.379 9.579-9.379 17.761 0 5.587 1.996 10.376 5.987 14.168 3.991 3.791 11.374 7.583 21.951 10.975l28.336 8.98c14.368 4.59 24.745 10.976 30.931 19.157 6.186 8.182 9.18 17.561 9.18 27.938 0 8.581-1.796 16.363-5.189 23.148-3.592 6.785-8.381 12.772-14.567 17.561-6.186 4.989-13.57 8.581-22.151 11.175-8.98 2.794-18.359 4.19-28.536 4.19Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M542.451 405.564c-65.653 48.491-161.04 74.234-243.057 74.234-114.943 0-218.51-42.505-296.736-113.147-6.186-5.588-.599-13.171 6.785-8.781 84.61 49.09 188.977 78.824 296.936 78.824 72.837 0 152.858-15.166 226.493-46.296 10.976-4.989 20.355 7.183 9.579 15.166Z"/><path fill-rule="evenodd" clip-rule="evenodd" d="M569.79 374.433c-8.382-10.776-55.476-5.188-76.828-2.594-6.386.798-7.384-4.789-1.597-8.98 37.516-26.341 99.178-18.758 106.362-9.978 7.184 8.98-1.995 70.642-37.117 100.176-5.388 4.59-10.576 2.195-8.181-3.791 7.982-19.756 25.742-64.257 17.361-74.833Z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h600v600H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/azure-active-directory.svg b/apps/web/src/images/integrations/azure-active-directory.svg
new file mode 100644
index 00000000000..22ea64f1f03
--- /dev/null
+++ b/apps/web/src/images/integrations/azure-active-directory.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 374.5 377.3" width="2481" height="2500"><path d="M290 166.3c.4 0 .8.5 1.4 1.4.5.8 42.6 51.3 93.6 112.2 51 60.9 92.6 111 92.4 111.3-.1.3-40.7 33.6-90.2 73.9s-91.6 74.6-93.5 76.2c-3.3 2.7-3.5 2.8-4.7 1.6-.7-.7-42.9-35.2-93.8-76.7S102.8 390.5 103 390c.2-.5 42-50.4 93.1-111s92.9-110.7 93.1-111.5c.2-.8.5-1.2.8-1.2z" style="fill:#00bef2" transform="translate(-102.969 -166.294)"/><path d="M283.1 483.6c-5.8-2.1-12.8-8.1-15.7-13.7-3.6-6.9-3.3-17.7.7-26.3 3.1-6.4 3.1-6.6 1.1-8.1-1.1-.8-14.4-8.2-29.4-16.3-15-8.1-28.1-15.2-29-15.7-1.2-.7-3.2 0-6.8 2.3-11.7 7.4-23.9 6.6-33.5-2.3-6.9-6.4-8.9-10.9-8.9-20.1 0-8.9 1.8-13.5 7.5-19.2 7.7-7.7 18-10.3 27.9-7 5.4 1.8 5.5 1.8 8.9-.8 4-3 36.1-32.3 51.6-47l10.7-10.2-3.2-6.7c-6.5-13.5-3.2-28.5 8.2-37.5 6.2-4.9 10.8-6.4 19.7-6.4 20.8 0 35.3 21.8 27.5 41.3-2.1 5.4-2.1 5.5-.1 8.8 1.7 2.9 30.6 37.8 45.9 55.6 2.7 3.1 5.7 5.6 6.7 5.6s4.4-1 7.6-2.2c14.9-5.9 30.6.7 36.8 15.5 4 9.5.5 22.3-8 30-6 5.4-10.4 7.1-18.4 7.1-5.6 0-7.7-.6-13.6-3.8-4.4-2.4-7.8-3.6-9.2-3.2-2.4.6-39.3 25.9-47.5 32.5-5 4.1-5.4 5.6-2.8 11.7 2.5 6 2.2 15.4-.6 21.3-3.1 6.5-10.8 13-17.5 15-6.8 1.9-10.9 1.9-16.6-.2zm1.7-110.2v-57l-3.2-4.4c-1.8-2.4-3.5-4.4-3.8-4.4-1.3 0-65.9 58.7-65.9 59.9 0 .3 1 3.3 2.2 6.5 1.2 3.3 2.1 8 2 10.7-.1 2.7-.1 5.7-.1 6.7.1 2.3 21.7 16.1 54.1 34.8 8.9 5.2 12 6.5 13.1 5.6 1.3-1.1 1.6-12.2 1.6-58.4zm27.4 50.4c42.8-26.9 50.8-32.3 51.3-34.3.3-1.2.7-5.9.8-10.6l.3-8.4-21.8-25.9c-23.4-27.7-32-37.1-34-37.1-.7 0-4.2 2-7.8 4.4l-6.6 4.4.3 56.9c.3 51 .7 59.6 2.6 59.6.2.1 7-4 14.9-9z" style="fill:#fff;stroke:#fff;stroke-width:1.2357;stroke-linecap:round;stroke-linejoin:round" transform="translate(-102.969 -166.294)"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/bitwarden-vertical-blue.svg b/apps/web/src/images/integrations/bitwarden-vertical-blue.svg
new file mode 100644
index 00000000000..5d5200364d8
--- /dev/null
+++ b/apps/web/src/images/integrations/bitwarden-vertical-blue.svg
@@ -0,0 +1 @@
+<svg width="582" height="415" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M362.911 166.879V81.183c0-1.934-.705-3.608-2.116-5.021-1.411-1.414-3.082-2.12-5.014-2.12H227.443c-1.931 0-3.602.706-5.013 2.12-1.411 1.413-2.117 3.087-2.117 5.02v85.697c0 6.397 1.244 12.739 3.733 19.025 2.488 6.286 5.57 11.865 9.246 16.737 3.676 4.873 8.058 9.615 13.146 14.227 5.087 4.612 9.785 8.443 14.093 11.493a177.162 177.162 0 0 0 13.48 8.648c4.679 2.715 8.002 4.556 9.97 5.523 1.968.967 3.547 1.711 4.735 2.232a6.381 6.381 0 0 0 2.896.669c1.04 0 2.006-.223 2.897-.669 1.188-.521 2.767-1.265 4.735-2.232 1.968-.967 5.291-2.808 9.97-5.523a177.162 177.162 0 0 0 13.48-8.648c4.308-3.05 9.006-6.881 14.093-11.493 5.088-4.612 9.469-9.354 13.146-14.227 3.676-4.872 6.758-10.451 9.246-16.737 2.488-6.286 3.732-12.628 3.732-19.025Zm-21.389-71.413v71.413c0 13.092-8.727 26.482-26.18 40.17-6.982 5.504-14.891 10.6-23.73 15.287V95.466h49.91ZM118.126 293.197c-3.479-4.857-8.214-7.188-14.303-7.188-6.378 0-11.306 2.623-14.495 7.674h-.58c.387-4.663.58-8.062.58-10.199v-14.958c0-.972-.773-1.749-1.74-1.749H77.153c-.967 0-1.74.777-1.74 1.749v68.283c0 .971.773 1.748 1.74 1.748h7.73c.677 0 1.354-.389 1.643-1.068l1.837-4.566h.966c3.479 4.468 8.117 6.605 14.206 6.605 6.088 0 10.919-2.234 14.495-6.993 3.575-4.662 5.315-11.267 5.315-19.815 0-8.256-1.739-14.764-5.218-19.523Zm-26.382 7.382c1.643-2.137 4.252-3.205 7.634-3.205 2.899 0 5.315 1.262 7.055 3.788 1.642 2.525 2.512 6.313 2.512 11.364 0 4.954-.87 8.936-2.512 11.558-1.643 2.72-4.059 4.08-6.862 4.08-3.575 0-6.184-1.263-7.827-3.594-1.643-2.331-2.416-6.313-2.416-11.85v-1.554c0-4.856.87-8.45 2.416-10.587Z" fill="#175DDC"/><path d="M135.907 338.654h10.436c.967 0 1.836-.971 1.74-1.845v-47.983c0-.971-.773-1.748-1.74-1.748h-10.436c-.967 0-1.74.777-1.74 1.748v48.08c0 .971.773 1.748 1.74 1.748ZM191.859 327.096c-2.899.777-5.315 1.165-7.344 1.165-1.74 0-3.286-.486-4.252-1.554-1.063-.874-1.643-2.428-1.643-4.371v-24.671h13.142c.677 0 1.16-.486 1.16-1.166v-8.741c0-.292-.29-.583-.58-.583h-13.819v-9.81c0-.68-.483-1.166-1.159-1.166h-6.958c-.483 0-.87.291-1.063.777l-3.769 10.102-7.634 4.565a.334.334 0 0 1-.049.145.354.354 0 0 0-.048.146v4.565c0 .68.483 1.166 1.16 1.166h5.508v24.768c0 5.634 1.353 9.908 3.865 12.724 2.513 2.914 6.572 4.274 12.177 4.274 4.638 0 8.794-.68 12.079-2.04.387-.194.677-.582.677-1.068v-8.062c0-.777-.677-1.36-1.45-1.165ZM246.555 336.517c.58 1.263 1.643 2.137 2.996 2.137h.387c1.449 0 2.609-.874 2.995-2.234l12.176-45.166c.387-1.457-.676-2.817-2.126-2.817-.966 0-1.836.68-2.126 1.652l-7.247 27.099c-2.223 8.742-3.383 14.181-3.672 16.124h-.29c-.484-2.428-1.837-7.091-4.059-14.375l-9.084-28.557a2.818 2.818 0 0 0-2.706-1.943c-1.353 0-2.416.778-2.802 1.943l-9.76 28.751c-.87 2.428-2.223 7.188-3.963 14.375h-.289c-.58-3.497-1.837-8.742-3.673-15.929l-7.537-27.488c-.29-.972-1.16-1.652-2.126-1.652h-.29c-1.546 0-2.609 1.457-2.223 2.817l12.853 45.166c.386 1.36 1.546 2.234 2.899 2.234s2.512-.777 2.899-2.04l10.533-31.373 2.03-6.605.966-3.497h.29l.754 2.855c.795 3.016 1.431 5.429 1.952 7.15l10.243 31.373Z" fill="#175DDC"/><path fill-rule="evenodd" clip-rule="evenodd" d="M305.213 337.1c.097.874.87 1.554 1.74 1.554.966 0 1.836-.971 1.933-1.554v-31.567c0-5.925-1.353-10.491-4.059-13.307-2.803-2.914-6.861-4.371-12.37-4.371-4.831 0-9.567 1.068-14.398 3.011-1.063.388-1.547 1.651-1.063 2.719.483 1.069 1.739 1.554 2.802 1.069 4.252-2.04 8.311-3.011 12.37-3.011 4.252 0 7.247 1.165 9.277 3.594 2.029 2.428 2.995 5.925 2.995 10.781v3.303l-9.47.291c-7.828 0-13.626 1.651-17.781 4.371-4.059 2.817-6.185 7.673-5.798 12.724.193 3.788 1.546 6.799 3.962 9.033 2.706 2.526 6.474 3.788 11.403 3.788 3.575 0 6.764-.583 9.374-1.942 2.705-1.36 5.218-3.691 7.731-6.897h.483l.869 6.411Zm-5.701-6.313c-2.996 3.011-7.151 4.565-12.563 4.565-3.479 0-6.185-.875-8.311-2.331-1.836-1.749-2.802-4.274-2.802-7.382 0-3.886 1.546-6.897 4.542-8.742 3.092-1.846 8.021-3.011 15.075-3.303l8.697-.388v4.856c0 5.343-1.546 9.713-4.638 12.725Z" fill="#175DDC"/><path d="M348.7 287.758c-1.643-.195-3.093-.292-4.542-.292-3.286 0-6.088.777-8.311 2.331-2.319 1.457-4.542 4.08-6.571 7.771h-.29l-.387-7.188c0-1.068-.869-1.845-1.932-1.845a1.943 1.943 0 0 0-1.933 1.942v45.652c0 1.262.966 2.234 2.223 2.234 1.256 0 2.222-.972 2.222-2.234V310.68c0-5.439 1.353-10.101 4.059-13.695 2.706-3.594 6.185-5.439 10.437-5.439 1.449 0 2.899.194 4.348.388 1.16.194 2.32-.485 2.513-1.651a2.19 2.19 0 0 0-1.836-2.525Z" fill="#175DDC"/><path fill-rule="evenodd" clip-rule="evenodd" d="M387.548 289.409c-2.61-1.263-5.799-1.943-9.374-1.943-6.958 0-12.176 2.331-15.848 6.508-3.673 4.662-5.412 11.267-5.412 19.912 0 8.256 1.933 14.472 5.508 18.843 3.769 4.371 8.891 6.508 15.848 6.508 7.055 0 12.563-2.817 16.332-8.548h.387l.966 6.314c.097.874.773 1.457 1.546 1.457.87 0 1.546-.68 1.546-1.554v-67.895c0-1.262-.966-2.234-2.222-2.234-1.257 0-2.223.972-2.223 2.234v15.833c0 3.691.097 7.382.29 11.364h-.29c-2.029-3.205-4.349-5.537-7.054-6.799Zm-21.744 8.062c2.803-3.886 6.862-5.828 12.37-5.828 5.798 0 9.953 1.651 12.466 5.148 2.706 3.302 3.962 8.839 3.962 16.609v.777c0 7.576-1.256 13.016-3.962 16.318-2.609 3.303-6.668 4.954-12.37 4.954-11.016 0-16.524-7.091-16.524-21.272 0-7.382 1.353-12.918 4.058-16.706ZM419.051 332.729c4.155 4.565 9.76 6.799 17.008 6.799 2.899 0 5.508-.194 7.924-.874 2.03-.388 4.252-.971 6.571-1.942.774-.292 1.257-1.069 1.257-1.846 0-1.36-1.353-2.331-2.609-1.845-2.223.777-4.059 1.262-5.605 1.554-2.126.388-4.736.582-7.538.582-5.895 0-10.34-1.651-13.529-5.342s-4.735-8.936-4.832-15.832h35.949v-3.691c0-7.091-1.643-12.724-5.122-16.804-3.286-4.079-8.021-6.119-13.819-6.119-6.668 0-11.886 2.428-15.848 7.285-3.962 4.759-5.895 11.17-5.895 19.232s2.029 14.375 6.088 18.843Zm4.059-36.424c2.899-3.205 6.764-4.759 11.596-4.759 4.445 0 7.924 1.651 10.437 4.856 2.512 3.206 3.769 7.868 3.769 13.599h-30.924c.58-5.925 2.223-10.588 5.122-13.696Z" fill="#175DDC"/><path d="M502.448 336.42c0 1.263.966 2.234 2.223 2.234 1.159 0 2.222-1.068 2.319-2.428v-30.499c0-12.239-5.702-18.358-17.008-18.358-8.311 0-14.012 2.623-17.298 7.868h-.29l-.58-5.051c-.193-.971-.966-1.749-2.029-1.749-1.16 0-2.029.875-2.029 2.04v45.749c0 1.263.966 2.234 2.222 2.234 1.257 0 2.223-.971 2.223-2.234v-25.448c0-6.702 1.546-11.656 4.252-14.667 2.706-3.108 7.054-4.565 13.046-4.565 4.445 0 7.634 1.262 9.857 3.496 2.029 2.234 3.092 5.925 3.092 10.976v30.402ZM133.008 273.868c0-4.371 3.672-7.868 8.214-7.868 4.445 0 8.214 3.497 8.214 7.965v.68c0 4.274-3.769 7.867-8.214 7.867-4.446 0-8.214-3.593-8.214-7.867v-.777Z" fill="#175DDC"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/jumpcloud-darkmode.svg b/apps/web/src/images/integrations/jumpcloud-darkmode.svg
new file mode 100644
index 00000000000..6969fceeb84
--- /dev/null
+++ b/apps/web/src/images/integrations/jumpcloud-darkmode.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M81.081 446.322C36.122 445.244 0 408.378 0 363.092c0-45.969 37.215-83.231 83.108-83.231a82.864 82.864 0 0 1 30.168 5.654c13.049-27.358 40.921-46.254 73.21-46.254 2.012 0 3.991.071 5.955.214C201.8 190.778 244.589 154 295.946 154c39.955 0 74.715 22.259 92.594 55.064 9.533-4.084 20.033-6.344 31.055-6.344 43.66 0 79.054 35.446 79.054 79.171a83.331 83.331 0 0 1 18.243-2.03c45.893 0 83.108 37.262 83.108 83.231 0 45.286-36.122 82.152-81.081 83.23h-20.175c-9.803-29.491-36.978-53.573-72.546-65.317 12.21-12.458 19.748-29.531 19.748-48.364 0-38.118-30.849-69.02-68.919-69.02-38.07 0-68.919 30.902-68.919 69.02 0 18.833 7.538 35.906 19.748 48.364-11.83 3.901-22.757 9.159-32.417 15.534-6.619 4.369-12.653 9.262-17.974 14.607-8.425-7.034-18.116-12.862-28.695-17.184 9.169-10.388 14.744-24.035 14.744-38.991 0-32.511-26.32-58.87-58.784-58.87s-58.784 26.359-58.784 58.87c0 14.956 5.574 28.603 14.743 38.991-25.163 10.277-45.196 29.086-55.584 52.36H81.081Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-auth0-badge-color.svg b/apps/web/src/images/integrations/logo-auth0-badge-color.svg
new file mode 100644
index 00000000000..24887cc7510
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-auth0-badge-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M459.852 485.376 398.925 300l159.424-114.547H361.201L300.275 0h197.162l60.989 185.438c35.314 107.518-1.112 229.866-98.867 299.907l.293.031Zm-318.939 0L300.336 600l159.516-114.624-159.423-114.547-159.516 114.547Zm-98.558-300C5.079 298.811 48.349 418.95 140.867 485.422v-.046L201.794 300 42.37 185.376l197.117.062L300.275 0H103.004l-60.65 185.376Z" fill="#EB5424"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-duo-color.svg b/apps/web/src/images/integrations/logo-duo-color.svg
new file mode 100644
index 00000000000..0959a215708
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-duo-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path d="M96.958 396.5H.195v-91.924H193.6c-2.521 51.193-44.824 91.924-96.641 91.924Z" fill="#7BCD54"/><path d="M96.957 202.977H.195V294.9H193.6c-2.521-51.192-44.824-91.923-96.641-91.923ZM503.356 202.977c-51.817 0-94.121 40.731-96.641 91.923h193.282c-2.52-51.192-44.823-91.923-96.641-91.923Z" fill="#63C43F"/><path d="M503.356 396.5c-51.817 0-94.121-40.731-96.641-91.924h193.282c-2.52 51.193-44.823 91.924-96.641 91.924Z" fill="#7BCD54"/><path d="M203.395 202.977v96.762c0 51.817 40.731 94.12 91.924 96.641V202.977h-91.924Z" fill="#63C43F"/><path d="M396.922 396.501h-91.926V202.977h91.926v193.524Z" fill="#7BCD54"/></g><defs><clipPath id="a"><path fill="#fff" transform="translate(0 203)" d="M0 0h600v193.5H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-elastic-badge-color.svg b/apps/web/src/images/integrations/logo-elastic-badge-color.svg
new file mode 100644
index 00000000000..f6e00f3d40d
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-elastic-badge-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M600 313.996c0-50.02-31.192-93.978-78.107-110.903a169.795 169.795 0 0 0 3.044-32.084C524.937 77.789 448.859 2 355.538 2c-54.777 0-105.496 26.02-137.449 69.978-15.723-12.126-34.994-18.694-55.028-18.694-49.705 0-90.026 40.168-90.026 89.683 0 10.863 2.028 21.474 5.579 31.326C31.953 190.967 0 235.682 0 285.449c0 50.273 31.445 94.231 78.36 111.158-2.028 10.358-3.043 21.22-3.043 32.082 0 92.969 75.825 168.504 169.147 168.504 54.776 0 105.494-26.272 137.193-70.231 15.723 12.379 34.996 19.2 55.03 19.2 49.703 0 90.025-40.167 90.025-89.683 0-10.863-2.029-21.473-5.579-31.327C567.794 408.48 600 363.765 600 313.996Z" fill="#fff"/><path d="m237.006 258.654 130.334 59.815 131.342-116.08c2.012-9.632 2.767-19.009 2.767-29.148 0-81.61-65.922-148.014-146.941-148.014-48.56 0-93.599 24.078-121.025 64.376L211.594 203.91l25.412 54.745Z" fill="#FED10A"/><path d="M98.438 397.96c-2.026 9.685-2.786 19.623-2.786 29.817 0 82.32 66.605 149.093 148.403 149.093 49.13 0 94.968-24.467 122.573-65.244l21.778-114.43-29.123-56.07-131.689-60.401L98.438 397.96Z" fill="#24BBB1"/><path d="m100.032 171.886 91.466 21.737 20.096-104.288c-12.367-9.575-27.825-14.75-43.8-14.75-39.678 0-72.142 32.347-72.142 72.458 0 8.539 1.546 17.08 4.38 24.843Z" fill="#EF5098"/><path d="M88.903 193.623c-40.301 13.109-68.614 51.433-68.614 93.538 0 41.096 25.762 77.655 64.278 92.278l127.026-113.456-23.212-49.164-99.478-23.196Z" fill="#1BA9F5"/><path d="M391.297 509.966c12.337 9.341 27.191 14.643 42.549 14.643 38.772 0 70.494-31.559 70.494-70.69 0-8.584-1.51-16.917-4.28-24.49l-89.124-20.955-19.639 101.492Z" fill="#93C83E"/><path d="m408.86 385.531 99.395 22.943c40.524-13.111 68.557-51.434 68.557-93.791 0-40.844-25.74-77.655-64.224-92.026l-129.979 112.7 26.251 50.174Z" fill="#07C"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-google-badge-color.svg b/apps/web/src/images/integrations/logo-google-badge-color.svg
new file mode 100644
index 00000000000..c5a8fe50363
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-google-badge-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M593.251 306.75c0-19.75-1.75-38.5-4.75-56.75H306v112.75h161.75c-7.25 37-28.5 68.25-60 89.501v75h96.5c56.501-52.25 89.001-129.251 89.001-220.501Z" fill="#4285F4"/><path d="M306.001 600.001c81 0 148.75-27 198.25-72.751l-96.5-75c-27 18-61.25 29-101.75 29-78.251 0-144.501-52.75-168.251-124h-99.5v77.25c49.25 98 150.5 165.501 267.751 165.501Z" fill="#34A853"/><path d="M137.75 357.25c-6.25-18-9.5-37.25-9.5-57.25s3.5-39.25 9.5-57.25V165.5h-99.5C17.75 206 6 251.5 6 300s11.75 94 32.25 134.501l99.5-77.251Z" fill="#FBBC05"/><path d="M306.001 118.75c44.25 0 83.75 15.25 115 45l85.5-85.5C454.751 29.75 387.001 0 306.001 0 188.75 0 87.501 67.5 38.25 165.5l99.5 77.251c23.75-71.251 90-124.001 168.251-124.001Z" fill="#EA4335"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-jumpcloud-badge-color.svg b/apps/web/src/images/integrations/logo-jumpcloud-badge-color.svg
new file mode 100644
index 00000000000..9349186d8a1
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-jumpcloud-badge-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M81.081 446.322C36.122 445.244 0 408.378 0 363.092c0-45.969 37.215-83.231 83.108-83.231a82.864 82.864 0 0 1 30.168 5.654c13.049-27.358 40.921-46.254 73.21-46.254 2.012 0 3.991.071 5.955.214C201.8 190.778 244.589 154 295.946 154c39.955 0 74.715 22.259 92.594 55.064 9.533-4.084 20.033-6.344 31.055-6.344 43.66 0 79.054 35.446 79.054 79.171a83.331 83.331 0 0 1 18.243-2.03c45.893 0 83.108 37.262 83.108 83.231 0 45.286-36.122 82.152-81.081 83.23h-20.175c-9.803-29.491-36.978-53.573-72.546-65.317 12.21-12.458 19.748-29.531 19.748-48.364 0-38.118-30.849-69.02-68.919-69.02-38.07 0-68.919 30.902-68.919 69.02 0 18.833 7.538 35.906 19.748 48.364-11.83 3.901-22.757 9.159-32.417 15.534-6.619 4.369-12.653 9.262-17.974 14.607-8.425-7.034-18.116-12.862-28.695-17.184 9.169-10.388 14.744-24.035 14.744-38.991 0-32.511-26.32-58.87-58.784-58.87s-58.784 26.359-58.784 58.87c0 14.956 5.574 28.603 14.743 38.991-25.163 10.277-45.196 29.086-55.584 52.36H81.081Z" fill="#002B49"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-keycloak-icon.svg b/apps/web/src/images/integrations/logo-keycloak-icon.svg
new file mode 100644
index 00000000000..862ffcb6c2b
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-keycloak-icon.svg
@@ -0,0 +1,23 @@
+<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8150_20)">
+<path d="M78.6386 163.123L156.203 29.0543L468.552 29L545.709 164.427L545.804 435.309L468.579 570.628L156.312 570.737L77.8516 435.309L78.6386 163.123Z" fill="#4D4D4D"/>
+<path d="M77.8496 435.268H218.636L141.302 298.808L204.184 163.149L78.6367 163.122L0 299.909" fill="#EDEDED"/>
+<path d="M261.325 435.269H364.21L455.209 302.451L365.798 164.428H244.742L171.832 297.803L261.325 435.269Z" fill="#E0E0E0"/>
+<path d="M0 299.896L77.8632 435.309H218.636L142.157 300.358L0 299.896Z" fill="#ACACAC"/>
+<path d="M173.34 299.923L261.326 435.323H364.212L453.786 299.977L173.34 299.923Z" fill="#9E9E9E"/>
+<path d="M208.188 300.017L181.619 307.75L156.148 299.977L260.188 119.389L286.214 164.454" fill="#00B8E3"/>
+<path d="M286.119 435.282L260.214 480.564L191.104 405.994L156.094 300.031V299.977H208.174" fill="#33C6E9"/>
+<path d="M156.146 299.977H156.106V300.017L130.079 345.164L103.957 300.221L130.445 254.204L208.173 119.389H260.199" fill="#008AAA"/>
+<path d="M442.443 435.269H600.002L599.907 164.414H442.43L442.443 435.269Z" fill="#D4D4D4"/>
+<path d="M442.441 300.357V435.309H599.715V300.357H442.441Z" fill="#919191"/>
+<path d="M260.226 480.606H208.172L130.078 345.165L156.105 300.031L260.226 480.606Z" fill="#00B8E3"/>
+<path d="M468.4 299.977L364.334 480.578C354.767 466.499 338.375 435.309 338.375 435.309L416.442 299.963L468.4 299.977Z" fill="#008AAA"/>
+<path d="M416.322 480.578L364.336 480.565L468.416 299.977L494.429 254.898L520.496 300.289M468.416 299.977H416.457L338.363 164.441L364.214 119.402L427.422 199.884L468.416 299.977Z" fill="#00B8E3"/>
+<path d="M494.415 254.843V254.884L468.402 299.977L364.227 119.416L416.348 119.443L494.415 254.843Z" fill="#33C6E9"/>
+</g>
+<defs>
+<clipPath id="clip0_8150_20">
+<rect width="600" height="600" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/apps/web/src/images/integrations/logo-microsoft-entra-id-color.svg b/apps/web/src/images/integrations/logo-microsoft-entra-id-color.svg
new file mode 100644
index 00000000000..a6150c29c62
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-microsoft-entra-id-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M126.732 467.734c12.934 8.066 34.434 17.033 57.167 17.033 20.7 0 39.933-6 55.867-16.233 0 0 .033 0 .066-.034l60.167-37.6v135.767c-9.533 0-19.133-2.6-27.467-7.8l-145.8-91.133Z" fill="#225086"/><path d="m261.767 50.234-250 282c-19.3 21.8-14.267 54.733 10.766 70.367 0 0 92.534 57.833 104.2 65.133 12.934 8.067 34.434 17.033 57.167 17.033 20.7 0 39.933-6 55.867-16.233 0 0 .033 0 .066-.033l60.167-37.6-145.467-90.934 145.5-164.133v-142.5c-14.133 0-28.266 5.633-38.266 16.9Z" fill="#6DF"/><path d="m154.533 339.967 1.734 1.067L300 430.901h.033V175.867l-.033-.033-145.467 164.133Z" fill="#CBF8FF"/><path d="M577.468 402.6c25.034-15.633 30.067-48.567 10.767-70.367L424.202 147.2a103.399 103.399 0 0 0-43.767-9.7c-30.833 0-58.4 13.3-76.733 34.2l-3.634 4.1 145.467 164.133-145.5 90.934v135.766c9.567 0 19.1-2.6 27.433-7.8l250-156.266v.033Z" fill="#074793"/><path d="M300.033 33.334v142.5l3.634-4.1c18.333-20.9 45.9-34.2 76.733-34.2 15.733 0 30.533 3.567 43.767 9.7L338.2 50.267c-9.967-11.266-24.1-16.9-38.2-16.9l.033-.033Z" fill="#0294E4"/><path d="m445.502 339.967-145.467-164.1v255l145.467-90.9Z" fill="#96BCC2"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-microsoft-intune-color.svg b/apps/web/src/images/integrations/logo-microsoft-intune-color.svg
new file mode 100644
index 00000000000..2611cf4b3b8
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-microsoft-intune-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)" fill="#1976D2"><path d="M271.429 371.286V357h185.714v28.571l71.428-50-71.428-50v28.572H42.857V99.857H400V157h42.857V78.429c0-11.858-9.571-21.429-21.428-21.429h-400C9.57 57 0 66.571 0 78.429V335.57C0 347.429 9.571 357 21.429 357H200v14.286c0 23.714-19.143 42.857-42.857 42.857h-42.857V457h242.857v-42.857h-42.857c-23.715 0-42.857-19.143-42.857-42.857Z"/><path d="M578.572 185.571H280.715c-8-16.857-25.143-28.571-45-28.571-27.572 0-50 22.429-50 50s22.428 50 50 50c19.857 0 37-11.714 45-28.571h276.428v242.857H428.572v-85.715h-42.857v135.715c0 11.857 9.571 21.428 21.428 21.428h171.429c11.857 0 21.429-9.571 21.429-21.428V207c0-11.857-9.572-21.429-21.429-21.429ZM471.429 514.143v-14.286h42.857v14.286h-42.857Z"/></g><defs><clipPath id="a"><path fill="#fff" transform="translate(0 57)" d="M0 0h600v485.714H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-microsoft-sentinel-color.svg b/apps/web/src/images/integrations/logo-microsoft-sentinel-color.svg
new file mode 100644
index 00000000000..93135526c6f
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-microsoft-sentinel-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path d="M547.991 279.316c0 162.64-194.461 289.924-236.888 318.209-3.536 3.536-10.607 3.536-17.679 0C250.996 572.776 53 441.956 53 279.316V84.856c0-7.072 7.071-14.143 14.143-14.143C219.176 67.177 187.355 0 300.496 0c113.14 0 77.784 67.177 229.817 70.713 7.071 0 14.143 7.071 14.143 14.143l3.535 194.46Z" fill="#1B93EB"/><path d="M526.778 279.316c0 148.498-180.318 268.71-219.21 289.924-3.536 3.535-10.607 3.535-14.143 0-38.892-24.75-219.21-144.962-219.21-289.924V102.534c0-7.071 3.535-14.143 10.607-17.678C222.712 81.32 190.89 21.214 296.96 21.214c106.069 0 74.248 63.642 212.139 63.642 7.071 0 14.143 7.07 14.143 14.142l3.535 180.318Z" fill="url(#b)"/><path d="M300.495 212.139c49.499 0 91.927 38.892 98.998 88.391 0 7.071 10.607 14.143 17.679 14.143h49.499c10.607 0 17.678-7.072 17.678-17.679v-3.535c-10.607-102.534-102.534-176.783-205.068-166.176-88.391 10.607-155.569 77.784-166.176 166.176 0 10.607 7.072 17.678 14.143 17.678h53.035c7.071 0 14.142-7.071 17.678-14.143 10.607-49.499 53.035-84.855 102.534-84.855Z" fill="#C3F1FF"/><path d="M300.496 378.315c37.101 0 67.177-30.077 67.177-67.178s-30.076-67.177-67.177-67.177c-37.101 0-67.178 30.076-67.178 67.177 0 37.101 30.077 67.178 67.178 67.178Z" fill="#fff"/></g><defs><linearGradient id="b" x1="300.497" y1="552.622" x2="300.497" y2="2.121" gradientUnits="userSpaceOnUse"><stop stop-color="#1B93EB"/><stop offset=".21" stop-color="#2095EB"/><stop offset=".44" stop-color="#2E9CED"/><stop offset=".69" stop-color="#45A7EF"/><stop offset=".95" stop-color="#64B6F1"/><stop offset="1" stop-color="#6BB9F2"/></linearGradient><clipPath id="a"><path fill="#fff" transform="translate(53)" d="M0 0h494.991v600H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-okta-symbol-black.svg b/apps/web/src/images/integrations/logo-okta-symbol-black.svg
new file mode 100644
index 00000000000..876727ad56d
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-okta-symbol-black.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="m330.104 4.167-12.342 152c-5.837-.667-11.675-1-17.679-1-7.505 0-14.843.5-22.015 1.666l-7.004-73.666c-.167-2.334 1.668-4.334 4.002-4.334h12.509l-6.004-74.5C281.404 2 283.239 0 285.407 0h40.861c2.335 0 4.169 2 3.836 4.333v-.166Zm-103.07 7.5c-.667-2.167-3.002-3.5-5.17-2.667l-38.36 14c-2.168.833-3.169 3.333-2.168 5.333l31.188 68-11.841 4.334c-2.169.833-3.169 3.333-2.169 5.333l31.855 66.833a143.073 143.073 0 0 1 37.192-14.166l-40.36-147h-.167ZM132.97 54l88.227 124.333c-11.175 7.334-21.348 16-30.021 26l-52.869-52c-1.668-1.666-1.501-4.333.167-5.833l9.673-8-52.536-53.167c-1.668-1.666-1.5-4.333.334-5.833l31.188-26.167c1.834-1.5 4.336-1.166 5.67.667h.167Zm-74.05 72c-1.835-1.333-4.504-.667-5.67 1.333l-20.348 35.334c-1.168 2-.334 4.5 1.668 5.5l67.712 32L95.945 211c-1.168 2-.334 4.667 1.834 5.5l67.379 30.833c4.837-12.5 11.341-24.166 19.347-34.666L58.92 126ZM9.052 222c.334-2.333 2.669-3.667 4.837-3.167l147.6 38.5c-3.836 12.5-6.004 25.667-6.337 39.334l-73.884-6A3.85 3.85 0 0 1 77.766 286l2.168-12.333-74.55-7C3.047 266.5 1.546 264.333 1.88 262l7.005-40.167.166.167ZM3.55 321.667c-2.335.166-3.836 2.333-3.503 4.666L7.218 366.5c.333 2.333 2.668 3.667 4.836 3.167l72.383-18.834 2.168 12.334c.334 2.333 2.668 3.666 4.837 3.166l71.382-19.666c-4.17-12.334-6.838-25.5-7.506-39l-151.936 14h.167ZM27.23 427.333c-1.167-2-.333-4.5 1.668-5.5L166.66 356.5c5.171 12.333 12.175 23.833 20.514 34.167l-60.374 43c-1.835 1.333-4.503.833-5.67-1.167l-6.338-11L53.249 464c-1.835 1.333-4.503.667-5.67-1.333l-20.514-35.334h.166Zm166.947-28.666-107.24 108.5c-1.667 1.666-1.5 4.333.334 5.833l31.355 26.167c1.834 1.5 4.336 1.166 5.67-.667l43.363-61 9.673 8.167c1.835 1.5 4.503 1.166 5.838-.834l42.028-61c-11.341-7-21.848-15.5-30.854-25.166h-.167Zm-21.181 174.166c-2.168-.833-3.169-3.333-2.168-5.333l63.543-138.667c11.675 6 24.35 10.5 37.526 13l-18.68 71.667c-.5 2.167-3.002 3.5-5.17 2.667l-11.841-4.334L216.36 584c-.667 2.167-3.002 3.5-5.17 2.667l-38.36-14 .167.166Zm109.408-129.166-12.342 152c-.167 2.333 1.668 4.333 3.836 4.333h40.861c2.335 0 4.17-2 3.836-4.333l-6.004-74.5H325.1c2.335 0 4.17-2 4.003-4.334l-7.005-73.666c-7.171 1.166-14.509 1.666-22.015 1.666-6.004 0-11.841-.333-17.678-1.166Zm147.1-411.5c1-2.167 0-4.5-2.168-5.334l-38.36-14c-2.168-.833-4.503.5-5.17 2.667L363.96 87.667l-11.841-4.334c-2.168-.833-4.503.5-5.17 2.667l-18.68 71.667c13.343 2.666 25.851 7.166 37.526 13l63.71-138.5Zm83.723 60.5-107.239 108.5A145.541 145.541 0 0 0 375.134 176l42.029-61c1.334-1.833 4.003-2.333 5.837-.833l9.673 8.166 43.363-61c1.335-1.833 4.003-2.166 5.671-.666l31.354 26.166c1.835 1.5 1.835 4.167.334 5.834h-.167ZM571.268 178c2.168-1 2.835-3.5 1.667-5.5l-20.513-35.333c-1.168-2-3.836-2.5-5.671-1.334l-61.542 42.5-6.337-10.833c-1.168-2-3.836-2.667-5.671-1.167l-60.374 43c8.339 10.334 15.177 21.834 20.514 34.167l137.76-65.333.167-.167Zm21.681 55.333 7.005 40.167c.333 2.333-1.168 4.333-3.503 4.667l-151.936 14.166c-.667-13.666-3.336-26.666-7.505-39l71.382-19.666c2.168-.667 4.503.833 4.836 3.166l2.168 12.334 72.383-18.834c2.168-.5 4.503.834 4.836 3.167l.334-.167Zm-6.838 147.5c2.168.5 4.503-.833 4.837-3.166l7.004-40.167c.334-2.333-1.167-4.333-3.502-4.667l-74.551-7 2.169-12.333c.333-2.333-1.168-4.333-3.503-4.667l-73.883-6c-.334 13.667-2.502 26.834-6.338 39.334l147.6 38.5.167.166Zm-39.36 91.667c-1.167 2-3.836 2.5-5.671 1.333l-125.585-86.666c8.006-10.5 14.51-22.167 19.347-34.667l67.379 30.833c2.168 1 3.002 3.5 1.834 5.5l-6.337 10.834 67.712 32c2.002 1 2.836 3.5 1.668 5.5L546.751 472.5Zm-167.947-51.167 88.226 124.334c1.334 1.833 4.003 2.166 5.671.666l31.188-26.166c1.834-1.5 1.834-4.167.333-5.834l-52.536-53.166 9.674-8c1.834-1.5 1.834-4.167.166-5.834l-52.869-52c-8.839 10-18.846 18.834-30.02 26h.167Zm-.834 169.334c-2.168.833-4.503-.5-5.171-2.667l-40.36-147a143.04 143.04 0 0 0 37.192-14.167l31.855 66.834c1 2.166 0 4.666-2.168 5.333l-11.842 4.333 31.188 68c1.001 2.167 0 4.5-2.168 5.334l-38.36 14h-.166Z" fill="#191919"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h600v600H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-onelogin-badge-color.svg b/apps/web/src/images/integrations/logo-onelogin-badge-color.svg
new file mode 100644
index 00000000000..e2d9ccbc0c1
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-onelogin-badge-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><circle cx="300" cy="300" r="300" fill="#1C1F2A"/><path d="M229.85 204.478a8.955 8.955 0 0 0-8.955 8.955v53.731a8.955 8.955 0 0 0 8.955 8.955h43.283V405.97a8.955 8.955 0 0 0 8.956 8.955h53.731a8.955 8.955 0 0 0 8.955-8.955V213.433a8.955 8.955 0 0 0-8.955-8.955H229.85Z" fill="#fff"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h600v600H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-panther-round-color.svg b/apps/web/src/images/integrations/logo-panther-round-color.svg
new file mode 100644
index 00000000000..bed05507681
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-panther-round-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="600" height="600" rx="300" fill="#192FFF"/><path d="m445.835 230.057-23.98 44.93a4.887 4.887 0 0 0-.543 3.076l8.728 66.101c.415 3.108-.927 6.215-3.485 7.996l-49.686 35.154a5.108 5.108 0 0 0-1.726 2.137l-24.395 57.199c-1.376 3.205-4.285 5.471-7.706 5.989l-42.076 6.215a12.657 12.657 0 0 1-3.837 0l-42.076-6.215c-3.421-.518-6.331-2.784-7.706-5.989l-24.395-57.199c-.351-.874-.959-1.586-1.726-2.137l-49.686-35.122a8.427 8.427 0 0 1-3.485-7.996l8.729-66.101a5.357 5.357 0 0 0-.544-3.075l-24.043-44.963a10.537 10.537 0 0 1-1.183-5.406l1.151-19.682c.223-3.625 2.302-6.83 5.531-8.448l13.684-6.863a12.336 12.336 0 0 1 12.15.615l30.726 19.455a4.928 4.928 0 0 0 4.092.55l76.799-23.695a13.132 13.132 0 0 1 7.737 0l76.799 23.695a4.93 4.93 0 0 0 4.093-.55l30.725-19.455a12.336 12.336 0 0 1 12.15-.615l13.652 6.863a10.15 10.15 0 0 1 5.532 8.448l1.151 19.682c.095 1.877-.288 3.755-1.184 5.406h.033Z" fill="#F7F9FC"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-ping-identity-badge-color.svg b/apps/web/src/images/integrations/logo-ping-identity-badge-color.svg
new file mode 100644
index 00000000000..e34762c249c
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-ping-identity-badge-color.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path d="M550 50H50v500h500V50Z" fill="#BC1F27"/><path d="M189.729 254.224c-8.827-5.282-16.984-8.157-43.76-8.157h-41.461v166.795h31.767v-61.424h17.369c17.466 0 24.28-1.92 31.477-5.568 17.177-8.639 27.16-26.392 27.16-48.461.098-19.195-7.871-34.55-22.552-43.185Zm-15.832 61.223c-4.318 7.01-8.158 8.639-21.115 8.639h-16.507v-50.864h20.155c13.341 0 21.306 9.403 21.306 24.95 0 7.867-1.152 12.761-3.839 17.275Zm-69.385 113.149h7.296v67.656h-7.296v-67.656Zm82.913 17.274c-5.469 0-9.979 2.206-13.627 6.814-3.839 4.893-5.469 10.269-5.469 18.525 0 16.314 7.581 26.101 20.154 26.101 5.854 0 11.323-2.205 15.355-6.143l-2.782-4.894c-3.165 3.166-6.719 4.608-11.13 4.608-4.412 0-8.734-1.728-11.323-6.05-1.536-2.59-2.112-6.139-2.112-10.747v-1.152h28.311v-1.058c-.191-11.707-1.245-16.409-5.179-20.726-2.978-3.358-7.197-5.278-12.189-5.278h-.009Zm-10.841 21.307c.384-10.171 4.032-15.261 10.462-15.261 3.455 0 6.621 1.634 8.157 4.322 1.339 2.398 2.014 5.661 2.112 10.939h-20.731Zm70.443-13.913c.768 1.724 1.054 3.742 1.054 5.76v37.237h-7.198v-33.205c0-5.184-.384-6.528-1.629-8.158-.96-1.245-2.88-2.111-4.988-2.111-3.648 0-9.309 3.165-12.573 6.907v36.563h-6.911V458.35c0-7.006-1.724-10.368-1.724-10.368l6.907-2.112s1.63 3.648 1.63 7.68c4.701-5.085 9.501-7.581 14.301-7.581 4.893.098 9.309 2.973 11.131 7.295ZM221.689 256.14c0-11.038 8.639-19.865 19.002-19.865s18.329 8.926 18.329 19.865c0 10.939-8.448 19.962-18.807 19.962-10.358 0-18.524-8.925-18.524-19.962Zm3.456 35.991 30.325-5.09v125.722h-30.325V292.131Zm42.608 155.088h11.707l-2.206 5.849h-9.791v31.674c0 5.469 1.344 7.291 5.853 7.291 2.014 0 1.438 0 2.782-.67l.96 4.894c-2.304 1.25-3.166 1.634-6.336 1.634-2.398 0-4.219-.482-5.947-1.344-3.166-1.634-4.416-4.8-4.416-9.787v-33.688h-5.947v-5.849h5.952v-18.618h7.291v18.618h.098v-.004Zm-108.537-18.623h-7.104v16.314c0 3.555.094 7.582.094 7.582-2.688-3.938-7.197-6.238-12.283-6.238-3.264 0-5.853.862-8.733 3.072-6.237 4.608-9.403 12.288-9.403 22.744 0 15.645 6.715 24.856 18.52 24.856 5.278 0 8.734-1.629 11.993-5.759.098 2.594.96 4.987.96 4.987h7.291c-1.054-2.88-1.344-7.389-1.344-15.833v-51.73l.009.005Zm-7.202 55.181s-.866 2.117-2.781 3.554c-2.88 2.304-4.992 3.166-8.734 3.166-4.224 0-7.005-1.63-9.117-5.755-1.442-2.88-1.822-7.104-1.822-12.864 0-6.907.768-10.461 2.88-14.202 1.92-3.358 4.894-5.09 8.448-5.09 5.375 0 8.733 1.629 11.037 5.09v26.101h.098-.009Zm219.485-36.656-15.547 50.864c-3.072 9.885-6.715 16.412-14.685 18.426l-2.112-5.184c4.416-1.536 6.715-3.643 8.738-9.023a304.684 304.684 0 0 0-1.152-5.568c-.58-3.165-2.978-12.765-4.509-17.658l-9.89-30.71 7.01-2.59 9.309 31.862c1.344 4.608 2.688 12.189 2.688 12.189h.192s1.728-6.336 2.782-10.367l8.925-32.246h8.251v.005Zm6.139 40.21c0-1.728-.96-2.402-2.88-2.402h-2.88v8.162h1.443v-3.55h.861l2.018 3.456h1.438l-2.014-3.554c1.246-.098 2.014-.768 2.014-2.107v-.005Zm-4.224 1.054v-2.304h1.246c.768 0 1.536.192 1.536 1.152 0 1.054-.768 1.25-1.536 1.25h-1.246v-.098Zm1.157-6.523c-3.742 0-6.814 3.264-6.814 7.197 0 3.934 3.072 7.198 6.814 7.198 3.741 0 6.813-3.26 6.813-7.198-.098-4.032-3.072-7.197-6.813-7.197Zm0 12.957c-2.88 0-5.09-2.402-5.09-5.76 0-3.357 2.304-5.759 5.09-5.759s5.085 2.397 5.085 5.759c0 3.362-2.304 5.76-5.085 5.76Zm73.416-113.346-16.315-.192c-3.165 0-4.987-1.245-4.987-2.879 0-3.358 4.317-6.238 11.993-10.078 2.303.291 3.165.291 4.509.291 24.664 0 42.899-15.355 42.899-36.47 0-8.157-2.304-14.394-6.814-20.154 1.822.192 4.992.674 7.966.674 8.349 0 14.685-2.688 21.306-9.117l-12.667-20.44c-7.005 6.719-15.64 10.559-23.994 10.559-3.835 0-7.965-.96-14.301-2.688-8.349-2.112-14.297-3.072-20.824-3.072-29.652 0-48.944 16.315-48.944 41.559 0 18.235 8.157 29.464 24.954 34.067-19.096 5.282-21.307 12.766-21.307 20.637 0 8.443 3.358 13.917 8.827 16.029 5.47 2.398 14.302 3.55 27.928 3.84l12.957.286c11.998.192 21.307 3.647 21.307 14.685 0 5.085-2.978 9.599-7.488 12.479-4.795 3.166-11.323 4.032-18.998 4.032-14.015 0-21.784-5.282-21.784-15.163 0-3.358.192-4.987 1.344-7.872h-28.12c-1.152 2.398-2.688 5.76-2.688 12.475 0 8.35 3.166 15.547 9.502 21.785 10.461 10.367 27.445 13.242 43.956 13.242 18.137 0 35.603-4.317 45.774-15.837 6.331-7.197 9.31-15.069 9.31-25.427 0-11.042-3.166-19.48-9.979-26.2-8.35-7.97-17.659-10.845-35.318-11.042l-.004-.009Zm-29.656-51.913c0-11.515 6.622-18.234 18.136-18.234 11.515 0 18.329 6.719 18.329 18.234s-6.523 17.467-18.619 17.467c-10.653.098-17.85-4.894-17.85-17.467h.004Zm-86.663-14.591c-6.144 0-14.016 4.318-21.115 11.037v86.851h-30.419v-89.061c0-10.559-1.344-20.637-4.032-28.79l26.968-8.157c2.688 5.086 4.318 10.269 4.318 15.355 4.509-3.362 8.349-6.238 13.336-9.117 6.144-3.358 14.016-5.278 20.829-5.278 12.957 0 24.28 7.197 27.928 17.757 1.634 4.509 2.304 9.787 2.304 17.467v89.73h-29.942v-79.939c0-13.725-2.205-17.851-10.175-17.851v-.004Zm-15.547 138.005v31.665c0 5.47 1.344 7.296 5.853 7.296 2.014 0 1.438 0 2.782-.675l.96 4.894c-2.304 1.246-3.166 1.634-6.331 1.634-2.402 0-4.228-.482-5.952-1.344-3.17-1.629-4.416-4.8-4.416-9.791V452.97h-5.951v-5.858h5.951v-18.619h7.296v18.619h11.421l-2.21 5.858h-9.403v.004Zm-28.982-5.666 7.39-1.246v50.19h-7.39v-48.944Z" fill="#fff"/></g><defs><clipPath id="a"><path fill="#fff" transform="translate(50 50)" d="M0 0h500v500H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-rapid7-black.svg b/apps/web/src/images/integrations/logo-rapid7-black.svg
new file mode 100644
index 00000000000..e2bb7a6f4a8
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-rapid7-black.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M554.306 249h-80.082c1.214 1.237 2.429 2.518 3.533 3.865 8.967 10.866 13.693 24.515 13.693 39.533 0 23.19-9.761 44.105-25.442 58.196h49.03l23.3-57.909h-29.153l4.859-22.461h57.909l-30.412 80.37h11.926c27.761.177 46.534-22.881 46.534-50.885 0-28.005-17.889-50.709-45.717-50.709" fill="#E85E26"/><path fill-rule="evenodd" clip-rule="evenodd" d="M67.887 249c22.397 0 35.208 12.19 35.208 28.798 0 18.112-11.906 33.262-30.79 36.221l15.753 36.575H62.72l-14.77-34.897H33.085l-7.687 34.897H0L22.31 249h45.577Zm-30.169 45.431h24.674c9.714 0 15.417-6.471 15.417-14.248 0-2.334-.69-4.378-1.993-5.996-1.993-2.467-5.4-3.943-9.939-3.943h-22.81l-5.349 24.187ZM99.385 350.594 158.395 249h29.997l22.241 101.594h-25.338l-3.71-16.853h-46.992l-9.878 16.853h-25.33Zm69.303-75.488-21.776 37.455h30.014l-8.238-37.455ZM245.375 249h42.954c21.646.022 35.001 12.035 35.001 29.177 0 19.234-14.658 37.477-38.866 37.477H256.15l-7.73 34.94h-25.355L245.375 249Zm15.46 45.431h22.525c9.007 0 14.865-6.471 14.865-14.248 0-6.25-4.754-9.939-12.484-9.939h-19.609l-5.297 24.187Z" fill="#000"/><path d="M372.41 249h-25.398l-22.353 101.594h25.398L372.41 249Z" fill="#000"/><path fill-rule="evenodd" clip-rule="evenodd" d="M423.759 249c16.961 0 31.334 5.961 40.039 16.564 5.849 7.001 9.214 16.099 9.214 26.835 0 17.224-6.738 37.503-25.735 49.028-9.343 5.634-21.577 9.167-37.477 9.167h-40.97L391.2 249h32.559Zm-24.872 80.393h14.028c21.861 0 34.94-16.302 34.94-34.63 0-13.627-8.153-24.519-22.681-24.519h-13.251l-13.036 59.149Z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/logo-splunk-black.svg b/apps/web/src/images/integrations/logo-splunk-black.svg
new file mode 100644
index 00000000000..d25247bfca8
--- /dev/null
+++ b/apps/web/src/images/integrations/logo-splunk-black.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M64.03 318.824c0 3.985-.84 7.658-2.54 11.038-1.68 3.38-4.043 6.232-7.051 8.596s-6.602 4.201-10.763 5.529c-4.16 1.329-8.712 1.973-13.654 1.973-5.918 0-11.212-.801-15.92-2.422-4.707-1.622-9.395-4.298-14.102-8.03l7.774-12.64c3.731 3.126 7.09 5.412 10.118 6.857 3.009 1.446 6.075 2.169 9.22 2.169 3.868 0 6.954-.977 9.317-2.989 2.364-2.013 3.516-4.689 3.516-8.069 0-1.446-.215-2.813-.644-4.083-.43-1.27-1.192-2.559-2.344-3.908-1.133-1.328-2.696-2.774-4.708-4.337-1.973-1.563-4.532-3.497-7.676-5.802-2.403-1.7-4.766-3.439-7.032-5.236a50.634 50.634 0 0 1-6.231-5.802 26.532 26.532 0 0 1-4.512-6.877c-1.133-2.54-1.72-5.432-1.72-8.675 0-3.731.782-7.17 2.345-10.237a23.325 23.325 0 0 1 6.406-7.854c2.696-2.188 5.939-3.868 9.747-5.06 3.79-1.192 7.892-1.817 12.365-1.817 4.707 0 9.24.645 13.634 1.876 4.395 1.27 8.458 3.087 12.208 5.49l-7.051 11.37c-4.825-3.38-9.884-5.06-15.197-5.06-3.242 0-5.938.84-8.048 2.54-2.129 1.699-3.164 3.809-3.164 6.349s.918 4.591 2.793 6.526c1.856 1.934 5.06 4.649 9.63 8.146 4.59 3.38 8.419 6.35 11.447 8.89 3.027 2.539 5.41 4.923 7.168 7.17 1.758 2.246 2.97 4.493 3.633 6.798.665 2.306.997 4.826.997 7.6h.058l-.02-.019Zm105.264-22.233c0 7.111-1.074 13.656-3.282 19.634-2.187 5.979-5.196 11.175-9.083 15.649-3.887 4.474-8.457 7.932-13.79 10.394-5.313 2.462-11.056 3.692-17.248 3.692-2.774 0-5.371-.234-7.794-.722a25.875 25.875 0 0 1-6.895-2.443c-2.168-1.133-4.317-2.618-6.446-4.434-2.129-1.817-4.317-4.045-6.621-6.702V389H74.89V253.356h23.245l.117 13.207c4.238-5.295 8.829-9.202 13.751-11.664 4.962-2.481 10.704-3.692 17.228-3.692 5.919 0 11.33 1.113 16.193 3.341 4.903 2.227 9.122 5.333 12.677 9.319 3.555 3.985 6.31 8.733 8.243 14.301 1.934 5.548 2.891 11.702 2.891 18.442h.039l.02-.019Zm-25.276.938c0-9.906-1.992-17.72-6.016-23.464-4.005-5.744-9.454-8.596-16.389-8.596-7.285 0-13.067 3.047-17.306 9.143-4.239 6.095-6.387 14.34-6.387 24.714 0 10.374 2.109 18.111 6.27 23.913 4.16 5.802 9.942 8.694 17.228 8.694 4.356 0 7.989-1.114 10.841-3.341 2.852-2.247 5.157-5.079 6.915-8.518 1.758-3.438 3.008-7.189 3.731-11.214.722-4.044 1.093-7.815 1.093-11.331h-.019.039Zm35.609 46.243h23.85V211h-23.85v132.772Zm125.735.039v-90.572h-23.85v48.744c0 4.337-.176 7.697-.547 10.061a25.839 25.839 0 0 1-1.817 6.448c-3.379 7.482-9.551 11.233-18.537 11.233-7.012 0-11.934-2.54-14.728-7.619-1.093-1.915-1.855-4.103-2.285-6.525-.43-2.423-.645-5.92-.645-10.531v-51.811h-23.85v51.46c0 3.497.039 6.466.098 8.889.059 2.422.215 4.552.469 6.447.234 1.876.527 3.536.82 4.982a19.198 19.198 0 0 0 1.368 4.161c2.187 5.568 5.703 9.769 10.606 12.601 4.903 2.833 10.9 4.24 18.01 4.24 6.407 0 12.013-1.114 16.857-3.341 4.844-2.247 9.532-5.88 14.142-10.96l.058 12.113h23.85v-.039h-.019v.019Zm102.881-.039v-51.343c0-3.497-.039-6.486-.098-8.947-.058-2.482-.195-4.592-.468-6.428a41.409 41.409 0 0 0-.899-4.787 42.825 42.825 0 0 0-1.27-4.083c-2.187-5.411-5.703-9.592-10.606-12.562-4.903-2.969-10.9-4.435-18.049-4.435-6.407 0-12.013 1.114-16.857 3.361-4.844 2.246-9.532 5.9-14.142 10.96l-.039-12.113H321.75v90.377h24.065v-48.783c0-4.22.156-7.502.469-9.847.312-2.344.879-4.532 1.738-6.603 1.563-3.615 3.965-6.369 7.188-8.225 3.223-1.856 7.052-2.794 11.545-2.794 7.012 0 11.934 2.54 14.728 7.58 1.074 1.915 1.836 4.103 2.265 6.506.43 2.403.645 5.9.645 10.491v51.695h23.85v-.02Zm98.779-5.958-36.351-45.209 30.745-32.919-18.088-7.776-31.995 37.061h-2.539V211h-24.065v132.753h24.065v-48.1l35.98 49.917 22.248-7.776h.02l-.02.02ZM600 305.363v-14.809l-72.331-36.299v16.254l56.06 27.293-56.06 27.645v15.903L600 305.402v-.039Z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/okta-darkmode.svg b/apps/web/src/images/integrations/okta-darkmode.svg
new file mode 100644
index 00000000000..e16e0d3c700
--- /dev/null
+++ b/apps/web/src/images/integrations/okta-darkmode.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><mask id="b" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="600" height="600"><path d="M600 0H0v600h600V0Z" fill="#fff"/></mask><g mask="url(#b)"><path fill-rule="evenodd" clip-rule="evenodd" d="m330.104 4.167-12.342 152c-5.837-.667-11.675-1-17.679-1-7.505 0-14.843.5-22.015 1.666l-7.004-73.666c-.167-2.334 1.668-4.334 4.002-4.334h12.509l-6.004-74.5C281.404 2 283.239 0 285.407 0h40.861c2.335 0 4.169 2 3.836 4.333v-.166Zm-103.07 7.5c-.667-2.167-3.002-3.5-5.17-2.667l-38.36 14c-2.168.833-3.169 3.333-2.168 5.333l31.188 68-11.841 4.334c-2.169.833-3.169 3.333-2.169 5.333l31.855 66.833a143.073 143.073 0 0 1 37.192-14.166l-40.36-147h-.167ZM132.97 54l88.227 124.333c-11.175 7.334-21.348 16-30.021 26l-52.869-52c-1.668-1.666-1.501-4.333.167-5.833l9.673-8-52.536-53.167c-1.668-1.666-1.5-4.333.334-5.833l31.188-26.167c1.834-1.5 4.336-1.166 5.67.667h.167Zm-74.05 72c-1.835-1.333-4.504-.667-5.67 1.333l-20.348 35.334c-1.168 2-.334 4.5 1.668 5.5l67.712 32L95.945 211c-1.168 2-.334 4.667 1.834 5.5l67.379 30.833c4.837-12.5 11.341-24.166 19.347-34.666L58.92 126ZM9.052 222c.334-2.333 2.669-3.667 4.837-3.167l147.6 38.5c-3.836 12.5-6.004 25.667-6.337 39.334l-73.884-6A3.85 3.85 0 0 1 77.766 286l2.168-12.333-74.55-7C3.047 266.5 1.546 264.333 1.88 262l7.005-40.167.166.167ZM3.55 321.667c-2.335.166-3.836 2.333-3.503 4.666L7.218 366.5c.333 2.333 2.668 3.667 4.836 3.167l72.383-18.834 2.168 12.334c.334 2.333 2.668 3.666 4.837 3.166l71.382-19.666c-4.17-12.334-6.838-25.5-7.506-39l-151.936 14h.167ZM27.23 427.333c-1.167-2-.333-4.5 1.668-5.5L166.66 356.5c5.171 12.333 12.175 23.833 20.514 34.167l-60.374 43c-1.835 1.333-4.503.833-5.67-1.167l-6.338-11L53.249 464c-1.835 1.333-4.503.667-5.67-1.333l-20.514-35.334h.166Zm166.947-28.666-107.24 108.5c-1.667 1.666-1.5 4.333.334 5.833l31.355 26.167c1.834 1.5 4.336 1.166 5.67-.667l43.363-61 9.673 8.167c1.835 1.5 4.503 1.166 5.838-.834l42.028-61c-11.341-7-21.848-15.5-30.854-25.166h-.167Zm-21.181 174.166c-2.168-.833-3.169-3.333-2.168-5.333l63.543-138.667c11.675 6 24.35 10.5 37.526 13l-18.68 71.667c-.5 2.167-3.002 3.5-5.17 2.667l-11.841-4.334L216.36 584c-.667 2.167-3.002 3.5-5.17 2.667l-38.36-14 .167.166Zm109.408-129.166-12.342 152c-.167 2.333 1.668 4.333 3.836 4.333h40.861c2.335 0 4.17-2 3.836-4.333l-6.004-74.5H325.1c2.335 0 4.17-2 4.003-4.334l-7.005-73.666c-7.171 1.166-14.509 1.666-22.015 1.666-6.004 0-11.841-.333-17.678-1.166Zm147.1-411.5c1-2.167 0-4.5-2.168-5.334l-38.36-14c-2.168-.833-4.503.5-5.17 2.667L363.96 87.667l-11.841-4.334c-2.168-.833-4.503.5-5.17 2.667l-18.68 71.667c13.343 2.666 25.851 7.166 37.526 13l63.71-138.5Zm83.723 60.5-107.239 108.5A145.541 145.541 0 0 0 375.134 176l42.029-61c1.334-1.833 4.003-2.333 5.837-.833l9.673 8.166 43.363-61c1.335-1.833 4.003-2.166 5.671-.666l31.354 26.166c1.835 1.5 1.835 4.167.334 5.834h-.167ZM571.268 178c2.168-1 2.835-3.5 1.667-5.5l-20.513-35.333c-1.168-2-3.836-2.5-5.671-1.334l-61.542 42.5-6.337-10.833c-1.168-2-3.836-2.667-5.671-1.167l-60.374 43c8.339 10.334 15.177 21.834 20.514 34.167l137.76-65.333.167-.167Zm21.681 55.333 7.005 40.167c.333 2.333-1.168 4.333-3.503 4.667l-151.936 14.166c-.667-13.666-3.336-26.666-7.505-39l71.382-19.666c2.168-.667 4.503.833 4.836 3.166l2.168 12.334 72.383-18.834c2.168-.5 4.503.834 4.836 3.167l.334-.167Zm-6.838 147.5c2.168.5 4.503-.833 4.837-3.166l7.004-40.167c.334-2.333-1.167-4.333-3.502-4.667l-74.551-7 2.169-12.333c.333-2.333-1.168-4.333-3.503-4.667l-73.883-6c-.334 13.667-2.502 26.834-6.338 39.334l147.6 38.5.167.166Zm-39.36 91.667c-1.167 2-3.836 2.5-5.671 1.333l-125.585-86.666c8.006-10.5 14.51-22.167 19.347-34.667l67.379 30.833c2.168 1 3.002 3.5 1.834 5.5l-6.337 10.834 67.712 32c2.002 1 2.836 3.5 1.668 5.5L546.751 472.5Zm-167.947-51.167 88.226 124.334c1.334 1.833 4.003 2.166 5.671.666l31.188-26.166c1.834-1.5 1.834-4.167.333-5.834l-52.536-53.166 9.674-8c1.834-1.5 1.834-4.167.166-5.834l-52.869-52c-8.839 10-18.846 18.834-30.02 26h.167Zm-.834 169.334c-2.168.833-4.503-.5-5.171-2.667l-40.36-147a143.04 143.04 0 0 0 37.192-14.167l31.855 66.834c1 2.166 0 4.666-2.168 5.333l-11.842 4.333 31.188 68c1.001 2.167 0 4.5-2.168 5.334l-38.36 14h-.166Z" fill="#fff"/></g></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h600v600H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/onelogin-darkmode.svg b/apps/web/src/images/integrations/onelogin-darkmode.svg
new file mode 100644
index 00000000000..764b1684faa
--- /dev/null
+++ b/apps/web/src/images/integrations/onelogin-darkmode.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><mask id="b" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="600" height="600"><path d="M600 0H0v600h600V0Z" fill="#fff"/></mask><g mask="url(#b)"><path d="M300 600c165.685 0 300-134.315 300-300S465.685 0 300 0 0 134.315 0 300s134.315 300 300 300Z" fill="#fff"/><path d="M229.85 204.478a8.955 8.955 0 0 0-8.955 8.955v53.731a8.955 8.955 0 0 0 8.955 8.955h43.283V405.97a8.955 8.955 0 0 0 8.956 8.955h53.731a8.955 8.955 0 0 0 8.955-8.955V213.433a8.955 8.955 0 0 0-8.955-8.955H229.85Z" fill="#1C1F2A"/></g></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h600v600H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/rapid7-darkmode.svg b/apps/web/src/images/integrations/rapid7-darkmode.svg
new file mode 100644
index 00000000000..b5f25aae8bd
--- /dev/null
+++ b/apps/web/src/images/integrations/rapid7-darkmode.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#a)"><path d="M554.306 249h-80.082c1.214 1.237 2.429 2.518 3.533 3.865 8.967 10.866 13.693 24.515 13.693 39.533 0 23.19-9.761 44.105-25.442 58.196h49.03l23.3-57.909h-29.153l4.859-22.461h57.909l-30.412 80.37h11.926c27.761.177 46.534-22.881 46.534-50.885 0-28.005-17.889-50.709-45.717-50.709" fill="#E85E26"/><path fill-rule="evenodd" clip-rule="evenodd" d="M67.887 249c22.397 0 35.208 12.19 35.208 28.798 0 18.112-11.906 33.262-30.79 36.221l15.753 36.575H62.72l-14.77-34.897H33.085l-7.687 34.897H0L22.31 249h45.577Zm-30.169 45.431h24.674c9.714 0 15.417-6.471 15.417-14.248 0-2.334-.69-4.378-1.993-5.996-1.993-2.467-5.4-3.943-9.939-3.943h-22.81l-5.349 24.187ZM99.385 350.594 158.395 249h29.997l22.241 101.594h-25.338l-3.71-16.853h-46.992l-9.878 16.853h-25.33Zm69.303-75.488-21.776 37.455h30.014l-8.238-37.455ZM245.375 249h42.954c21.646.022 35.001 12.035 35.001 29.177 0 19.234-14.658 37.477-38.866 37.477H256.15l-7.73 34.94h-25.355L245.375 249Zm15.46 45.431h22.525c9.007 0 14.865-6.471 14.865-14.248 0-6.25-4.754-9.939-12.484-9.939h-19.609l-5.297 24.187Z" fill="#fff"/><path d="M372.41 249h-25.398l-22.353 101.594h25.398L372.41 249Z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M423.759 249c16.961 0 31.334 5.961 40.039 16.564 5.849 7.001 9.214 16.099 9.214 26.835 0 17.224-6.738 37.503-25.735 49.028-9.343 5.634-21.577 9.167-37.477 9.167h-40.97L391.2 249h32.559Zm-24.872 80.393h14.028c21.861 0 34.94-16.302 34.94-34.63 0-13.627-8.153-24.519-22.681-24.519h-13.251l-13.036 59.149Z" fill="#fff"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h600v600H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/web/src/images/integrations/splunk-darkmode.svg b/apps/web/src/images/integrations/splunk-darkmode.svg
new file mode 100644
index 00000000000..a4515c0a18c
--- /dev/null
+++ b/apps/web/src/images/integrations/splunk-darkmode.svg
@@ -0,0 +1 @@
+<svg width="600" height="600" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M64.03 318.824c0 3.985-.84 7.658-2.54 11.038-1.68 3.38-4.043 6.232-7.051 8.596s-6.602 4.201-10.763 5.529c-4.16 1.329-8.712 1.973-13.654 1.973-5.918 0-11.212-.801-15.92-2.422-4.707-1.622-9.395-4.298-14.102-8.03l7.774-12.64c3.731 3.126 7.09 5.412 10.118 6.857 3.009 1.446 6.075 2.169 9.22 2.169 3.868 0 6.954-.977 9.317-2.989 2.364-2.013 3.516-4.689 3.516-8.069 0-1.446-.215-2.813-.644-4.083-.43-1.27-1.192-2.559-2.344-3.908-1.133-1.328-2.696-2.774-4.708-4.337-1.973-1.563-4.532-3.497-7.676-5.802-2.403-1.7-4.766-3.439-7.032-5.236a50.634 50.634 0 0 1-6.231-5.802 26.532 26.532 0 0 1-4.512-6.877c-1.133-2.54-1.72-5.432-1.72-8.675 0-3.731.782-7.17 2.345-10.237a23.325 23.325 0 0 1 6.406-7.854c2.696-2.188 5.939-3.868 9.747-5.06 3.79-1.192 7.892-1.817 12.365-1.817 4.707 0 9.24.645 13.634 1.876 4.395 1.27 8.458 3.087 12.208 5.49l-7.051 11.37c-4.825-3.38-9.884-5.06-15.197-5.06-3.242 0-5.938.84-8.048 2.54-2.129 1.699-3.164 3.809-3.164 6.349s.918 4.591 2.793 6.526c1.856 1.934 5.06 4.649 9.63 8.146 4.59 3.38 8.419 6.35 11.447 8.89 3.027 2.539 5.41 4.923 7.168 7.17 1.758 2.246 2.97 4.493 3.633 6.798.665 2.306.997 4.826.997 7.6h.058l-.02-.019Zm105.264-22.233c0 7.111-1.074 13.656-3.282 19.634-2.187 5.979-5.196 11.175-9.083 15.649-3.887 4.474-8.457 7.932-13.79 10.394-5.313 2.462-11.056 3.692-17.248 3.692-2.774 0-5.371-.234-7.794-.722a25.875 25.875 0 0 1-6.895-2.443c-2.168-1.133-4.317-2.618-6.446-4.434-2.129-1.817-4.317-4.045-6.621-6.702V389H74.89V253.356h23.245l.117 13.207c4.238-5.295 8.829-9.202 13.751-11.664 4.962-2.481 10.704-3.692 17.228-3.692 5.919 0 11.33 1.113 16.193 3.341 4.903 2.227 9.122 5.333 12.677 9.319 3.555 3.985 6.31 8.733 8.243 14.301 1.934 5.548 2.891 11.702 2.891 18.442h.039l.02-.019Zm-25.276.938c0-9.906-1.992-17.72-6.016-23.464-4.005-5.744-9.454-8.596-16.389-8.596-7.285 0-13.067 3.047-17.306 9.143-4.239 6.095-6.387 14.34-6.387 24.714 0 10.374 2.109 18.111 6.27 23.913 4.16 5.802 9.942 8.694 17.228 8.694 4.356 0 7.989-1.114 10.841-3.341 2.852-2.247 5.157-5.079 6.915-8.518 1.758-3.438 3.008-7.189 3.731-11.214.722-4.044 1.093-7.815 1.093-11.331h-.019.039Zm35.609 46.243h23.85V211h-23.85v132.772Zm125.735.039v-90.572h-23.85v48.744c0 4.337-.176 7.697-.547 10.061a25.839 25.839 0 0 1-1.817 6.448c-3.379 7.482-9.551 11.233-18.537 11.233-7.012 0-11.934-2.54-14.728-7.619-1.093-1.915-1.855-4.103-2.285-6.525-.43-2.423-.645-5.92-.645-10.531v-51.811h-23.85v51.46c0 3.497.039 6.466.098 8.889.059 2.422.215 4.552.469 6.447.234 1.876.527 3.536.82 4.982a19.198 19.198 0 0 0 1.368 4.161c2.187 5.568 5.703 9.769 10.606 12.601 4.903 2.833 10.9 4.24 18.01 4.24 6.407 0 12.013-1.114 16.857-3.341 4.844-2.247 9.532-5.88 14.142-10.96l.058 12.113h23.85v-.039h-.019v.019Zm102.881-.039v-51.343c0-3.497-.039-6.486-.098-8.947-.058-2.482-.195-4.592-.468-6.428a41.409 41.409 0 0 0-.899-4.787 42.825 42.825 0 0 0-1.27-4.083c-2.187-5.411-5.703-9.592-10.606-12.562-4.903-2.969-10.9-4.435-18.049-4.435-6.407 0-12.013 1.114-16.857 3.361-4.844 2.246-9.532 5.9-14.142 10.96l-.039-12.113H321.75v90.377h24.065v-48.783c0-4.22.156-7.502.469-9.847.312-2.344.879-4.532 1.738-6.603 1.563-3.615 3.965-6.369 7.188-8.225 3.223-1.856 7.052-2.794 11.545-2.794 7.012 0 11.934 2.54 14.728 7.58 1.074 1.915 1.836 4.103 2.265 6.506.43 2.403.645 5.9.645 10.491v51.695h23.85v-.02Zm98.779-5.958-36.351-45.209 30.745-32.919-18.088-7.776-31.995 37.061h-2.539V211h-24.065v132.753h24.065v-48.1l35.98 49.917 22.248-7.776h.02l-.02.02ZM600 305.363v-14.809l-72.331-36.299v16.254l56.06 27.293-56.06 27.645v15.903L600 305.402v-.039Z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index cab0e703a7d..163c63a6d24 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -6831,6 +6831,10 @@
     "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
   },
+  "scimIntegrationDescription": {
+    "message": "Automatically provision users and groups with your preferred identity provider via SCIM provisioning. Find supported integrations",
+    "description": "the text, 'SCIM', is an acronym and should not be translated."
+  },
   "scimEnabledCheckboxDesc": {
     "message": "Enable SCIM",
     "description": "the text, 'SCIM', is an acronym and should not be translated."
@@ -9025,44 +9029,103 @@
   "sdksDesc": {
     "message": "Use Bitwarden Secrets Manager SDK in the following programming languages to build your own applications."
   },
-  "setUpGithubActions": {
-    "message": "Set up Github Actions"
+  "singleSignOn": {
+    "message": "Single sign-on"
   },
-  "setUpKubernetes": {
-    "message": "Set up Kubernetes"
+  "ssoDescStart": {
+    "message": "Configure",
+    "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
-  "setUpGitlabCICD": {
-    "message": "Set up GitLab CI/CD"
+  "ssoDescEnd": {
+    "message": "for Bitwarden using the implementation guide for your Identity Provider.",
+    "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure single sign-on for Bitwarden using the implementation guide for your Identity Provider."
   },
-  "setUpAnsible": {
-    "message": "Set up Ansible"
+  "userProvisioning":{
+    "message": "User provisioning"
   },
-  "rustSDKRepo": {
-    "message": "View Rust repository"
+  "scimIntegration": {
+    "message": "SCIM"
   },
-  "cSharpSDKRepo": {
-    "message": "View C# repository"
+  "scimIntegrationDescStart": {
+    "message": "Configure ",
+    "description": "This represents the beginning of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
-  "cPlusPlusSDKRepo": {
-    "message": "View C++ repository"
+  "scimIntegrationDescEnd": {
+    "message": "(System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider.",
+    "description": "This represents the end of a sentence, broken up to include links. The full sentence will be 'Configure SCIM (System for Cross-domain Identity Management) to automatically provision users and groups to Bitwarden using the implementation guide for your Identity Provider"
   },
-  "jsWebAssemblySDKRepo": {
-    "message": "View JS WebAssembly repository"
+  "bwdc":{
+    "message": "Bitwarden Directory Connector"
   },
-  "javaSDKRepo": {
-    "message": "View Java repository"
+  "bwdcDesc": {
+    "message": "Configure Bitwarden Directory Connector to automatically provision users and groups using the implementation guide for your Identity Provider."
   },
-  "pythonSDKRepo": {
-    "message": "View Python repository"
+  "eventManagement":{
+    "message": "Event management"
   },
-  "phpSDKRepo": {
-    "message": "View php repository"
+  "eventManagementDesc":{
+    "message": "Integrate Bitwarden event logs with your SIEM (system information and event management) system by using the implementation guide for your platform."
   },
-  "rubySDKRepo": {
-    "message": "View Ruby repository"
+  "deviceManagement":{
+    "message": "Device management"
   },
-  "goSDKRepo": {
-    "message": "View Go repository"
+  "deviceManagementDesc":{
+    "message": "Configure device management for Bitwarden using the implementation guide for your platform."
+
+  },
+  "integrationCardTooltip":{
+    "message": "Launch $INTEGRATION$ implementation guide.",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Google"
+      }
+    }
+  },
+  "smIntegrationTooltip":{
+    "message": "Set up $INTEGRATION$.",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "Google"
+      }
+    }
+  },
+  "smSdkTooltip":{
+    "message": "View $SDK$ repository",
+    "placeholders": {
+      "sdk": {
+        "content": "$1",
+        "example": "Rust"
+      }
+    }
+  },
+  "integrationCardAriaLabel":{
+    "message": "open $INTEGRATION$ implementation guide in a new tab.",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "google"
+      }
+    }
+  },
+  "smSdkAriaLabel":{
+    "message": "view $SDK$ repository in a new tab.",
+    "placeholders": {
+      "sdk": {
+        "content": "$1",
+        "example": "rust"
+      }
+    }
+  },
+  "smIntegrationCardAriaLabel":{
+    "message": "set up $INTEGRATION$ implementation guide in a new tab.",
+    "placeholders": {
+      "integration": {
+        "content": "$1",
+        "example": "google"
+      }
+    }
   },
   "createNewClientToManageAsProvider": {
     "message": "Create a new client organization to manage as a Provider. Additional seats will be reflected in the next billing cycle."
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html
index e30883515e0..7ade2e6c63d 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/scim.component.html
@@ -1,6 +1,11 @@
 <app-header></app-header>
 
-<p bitTypography="body1">{{ "scimDescription" | i18n }}</p>
+<p bitTypography="body1">
+  {{ "scimIntegrationDescription" | i18n }}
+  <a bitLink target="_blank" href="https://bitwarden.com/help/about-scim/"
+    ><i class="bwi bwi-question-circle"></i
+  ></a>
+</p>
 
 <div *ngIf="loading">
   <i
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.ts
deleted file mode 100644
index 058d59d702c..00000000000
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integration-grid/integration-grid.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, Input } from "@angular/core";
-
-import { IntegrationType } from "@bitwarden/common/enums";
-
-import { Integration } from "../models/integration";
-
-@Component({
-  selector: "sm-integration-grid",
-  templateUrl: "./integration-grid.component.html",
-})
-export class IntegrationGridComponent {
-  @Input() integrations: Integration[];
-
-  protected IntegrationType = IntegrationType;
-}
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.html
index a2f21888613..db3db75897d 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.html
@@ -4,7 +4,11 @@
 
 <section class="tw-mb-9">
   <p bitTypography="body1">{{ "integrationsDesc" | i18n }}</p>
-  <sm-integration-grid [integrations]="integrations"></sm-integration-grid>
+  <app-integration-grid
+    [integrations]="integrations"
+    [tooltipI18nKey]="'smIntegrationTooltip'"
+    [ariaI18nKey]="'smIntegrationCardAriaLabel'"
+  ></app-integration-grid>
 </section>
 
 <section class="tw-mb-9">
@@ -12,5 +16,9 @@
     {{ "sdks" | i18n }}
   </h2>
   <p bitTypography="body1">{{ "sdksDesc" | i18n }}</p>
-  <sm-integration-grid [integrations]="sdks"></sm-integration-grid>
+  <app-integration-grid
+    [integrations]="sdks"
+    [tooltipI18nKey]="'smSdkTooltip'"
+    [ariaI18nKey]="'smSdkAriaLabel'"
+  ></app-integration-grid>
 </section>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts
index 6c8ea28bc2f..e4a65f7ddd8 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.spec.ts
@@ -4,14 +4,17 @@ import { By } from "@angular/platform-browser";
 import { mock } from "jest-mock-extended";
 import { of } from "rxjs";
 
+import { SharedModule } from "@bitwarden/components/src/shared";
+import {
+  IntegrationCardComponent,
+  IntegrationGridComponent,
+} from "@bitwarden/web-vault/app/shared";
+
 import { SYSTEM_THEME_OBSERVABLE } from "../../../../../../libs/angular/src/services/injection-tokens";
 import { I18nService } from "../../../../../../libs/common/src/platform/abstractions/i18n.service";
 import { ThemeType } from "../../../../../../libs/common/src/platform/enums";
 import { ThemeStateService } from "../../../../../../libs/common/src/platform/theming/theme-state.service";
-import { I18nPipe } from "../../../../../../libs/components/src/shared/i18n.pipe";
 
-import { IntegrationCardComponent } from "./integration-card/integration-card.component";
-import { IntegrationGridComponent } from "./integration-grid/integration-grid.component";
 import { IntegrationsComponent } from "./integrations.component";
 
 @Component({
@@ -31,18 +34,12 @@ describe("IntegrationsComponent", () => {
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [
-        IntegrationsComponent,
-        IntegrationGridComponent,
-        IntegrationCardComponent,
-        MockHeaderComponent,
-        MockNewMenuComponent,
-        I18nPipe,
-      ],
+      declarations: [IntegrationsComponent, MockHeaderComponent, MockNewMenuComponent],
+      imports: [IntegrationGridComponent, IntegrationCardComponent, SharedModule],
       providers: [
         {
           provide: I18nService,
-          useValue: mock<I18nService>({ t: (key) => key }),
+          useValue: mock<I18nService>(),
         },
         {
           provide: ThemeStateService,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.ts
index 9e846d45034..b8f9386d715 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.component.ts
@@ -1,9 +1,7 @@
 import { Component } from "@angular/core";
 
 import { IntegrationType } from "@bitwarden/common/enums";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-
-import { Integration } from "./models/integration";
+import { Integration } from "@bitwarden/web-vault/app/shared";
 
 @Component({
   selector: "sm-integrations",
@@ -12,11 +10,10 @@ import { Integration } from "./models/integration";
 export class IntegrationsComponent {
   private integrationsAndSdks: Integration[] = [];
 
-  constructor(i18nService: I18nService) {
+  constructor() {
     this.integrationsAndSdks = [
       {
         name: "Rust",
-        linkText: i18nService.t("rustSDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk",
         image: "../../../../../../../images/secrets-manager/sdks/rust.svg",
         imageDarkMode: "../../../../../../../images/secrets-manager/sdks/rust-white.svg",
@@ -24,7 +21,6 @@ export class IntegrationsComponent {
       },
       {
         name: "GitHub Actions",
-        linkText: i18nService.t("setUpGithubActions"),
         linkURL: "https://bitwarden.com/help/github-actions-integration/",
         image: "../../../../../../../images/secrets-manager/integrations/github.svg",
         imageDarkMode: "../../../../../../../images/secrets-manager/integrations/github-white.svg",
@@ -32,7 +28,6 @@ export class IntegrationsComponent {
       },
       {
         name: "GitLab CI/CD",
-        linkText: i18nService.t("setUpGitlabCICD"),
         linkURL: "https://bitwarden.com/help/gitlab-integration/",
         image: "../../../../../../../images/secrets-manager/integrations/gitlab.svg",
         imageDarkMode: "../../../../../../../images/secrets-manager/integrations/gitlab-white.svg",
@@ -40,35 +35,30 @@ export class IntegrationsComponent {
       },
       {
         name: "Ansible",
-        linkText: i18nService.t("setUpAnsible"),
         linkURL: "https://bitwarden.com/help/ansible-integration/",
         image: "../../../../../../../images/secrets-manager/integrations/ansible.svg",
         type: IntegrationType.Integration,
       },
       {
         name: "C#",
-        linkText: i18nService.t("cSharpSDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk/tree/main/languages/csharp",
         image: "../../../../../../../images/secrets-manager/sdks/c-sharp.svg",
         type: IntegrationType.SDK,
       },
       {
         name: "C++",
-        linkText: i18nService.t("cPlusPlusSDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk/tree/main/languages/cpp",
         image: "../../../../../../../images/secrets-manager/sdks/c-plus-plus.png",
         type: IntegrationType.SDK,
       },
       {
         name: "Go",
-        linkText: i18nService.t("goSDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk/tree/main/languages/go",
         image: "../../../../../../../images/secrets-manager/sdks/go.svg",
         type: IntegrationType.SDK,
       },
       {
         name: "Java",
-        linkText: i18nService.t("javaSDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk/tree/main/languages/java",
         image: "../../../../../../../images/secrets-manager/sdks/java.svg",
         imageDarkMode: "../../../../../../../images/secrets-manager/sdks/java-white.svg",
@@ -76,35 +66,30 @@ export class IntegrationsComponent {
       },
       {
         name: "JS WebAssembly",
-        linkText: i18nService.t("jsWebAssemblySDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk/tree/main/languages/js",
         image: "../../../../../../../images/secrets-manager/sdks/wasm.svg",
         type: IntegrationType.SDK,
       },
       {
         name: "php",
-        linkText: i18nService.t("phpSDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk/tree/main/languages/php",
         image: "../../../../../../../images/secrets-manager/sdks/php.svg",
         type: IntegrationType.SDK,
       },
       {
         name: "Python",
-        linkText: i18nService.t("pythonSDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk/tree/main/languages/python",
         image: "../../../../../../../images/secrets-manager/sdks/python.svg",
         type: IntegrationType.SDK,
       },
       {
         name: "Ruby",
-        linkText: i18nService.t("rubySDKRepo"),
         linkURL: "https://github.com/bitwarden/sdk/tree/main/languages/ruby",
         image: "../../../../../../../images/secrets-manager/sdks/ruby.png",
         type: IntegrationType.SDK,
       },
       {
         name: "Kubernetes Operator",
-        linkText: i18nService.t("setUpKubernetes"),
         linkURL: "https://bitwarden.com/help/secrets-manager-kubernetes-operator/",
         image: "../../../../../../../images/secrets-manager/integrations/kubernetes.svg",
         type: IntegrationType.Integration,
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.module.ts b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.module.ts
index 0d26b626f16..b79892f5ed6 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.module.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/integrations/integrations.module.ts
@@ -1,15 +1,22 @@
 import { NgModule } from "@angular/core";
 
+import {
+  IntegrationCardComponent,
+  IntegrationGridComponent,
+} from "@bitwarden/web-vault/app/shared";
+
 import { SecretsManagerSharedModule } from "../shared/sm-shared.module";
 
-import { IntegrationCardComponent } from "./integration-card/integration-card.component";
-import { IntegrationGridComponent } from "./integration-grid/integration-grid.component";
 import { IntegrationsRoutingModule } from "./integrations-routing.module";
 import { IntegrationsComponent } from "./integrations.component";
 
 @NgModule({
-  imports: [SecretsManagerSharedModule, IntegrationsRoutingModule],
-  declarations: [IntegrationsComponent, IntegrationGridComponent, IntegrationCardComponent],
-  providers: [],
+  imports: [
+    SecretsManagerSharedModule,
+    IntegrationsRoutingModule,
+    IntegrationCardComponent,
+    IntegrationGridComponent,
+  ],
+  declarations: [IntegrationsComponent],
 })
 export class IntegrationsModule {}
diff --git a/bitwarden_license/bit-web/tsconfig.json b/bitwarden_license/bit-web/tsconfig.json
index 3ccdade273e..09de92d355d 100644
--- a/bitwarden_license/bit-web/tsconfig.json
+++ b/bitwarden_license/bit-web/tsconfig.json
@@ -46,6 +46,7 @@
     "../../apps/web/src/**/*.spec.ts",
     "../../libs/common/src/platform/services/**/*.worker.ts",
 
-    "src/**/*.stories.ts"
+    "src/**/*.stories.ts",
+    "src/**/*.spec.ts"
   ]
 }
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index f9630aba04f..96283b0000d 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -32,6 +32,7 @@ export enum FeatureFlag {
   VerifiedSsoDomainEndpoint = "pm-12337-refactor-sso-details-endpoint",
   PM11901_RefactorSelfHostingLicenseUploader = "PM-11901-refactor-self-hosting-license-uploader",
   AccessIntelligence = "pm-13227-access-intelligence",
+  PM14505AdminConsoleIntegrationPage = "pm-14505-admin-console-integration-page",
   CriticalApps = "pm-14466-risk-insights-critical-application",
   TrialPaymentOptional = "PM-8163-trial-payment",
   SecurityTasks = "security-tasks",
@@ -81,6 +82,7 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.VerifiedSsoDomainEndpoint]: FALSE,
   [FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader]: FALSE,
   [FeatureFlag.AccessIntelligence]: FALSE,
+  [FeatureFlag.PM14505AdminConsoleIntegrationPage]: FALSE,
   [FeatureFlag.CriticalApps]: FALSE,
   [FeatureFlag.TrialPaymentOptional]: FALSE,
   [FeatureFlag.SecurityTasks]: FALSE,
diff --git a/libs/common/src/enums/integration-type.enum.ts b/libs/common/src/enums/integration-type.enum.ts
index acb95106976..42c385fe715 100644
--- a/libs/common/src/enums/integration-type.enum.ts
+++ b/libs/common/src/enums/integration-type.enum.ts
@@ -1,4 +1,9 @@
 export enum IntegrationType {
   Integration = "integration",
   SDK = "sdk",
+  SSO = "sso",
+  SCIM = "scim",
+  BWDC = "bwdc",
+  EVENT = "event",
+  DEVICE = "device",
 }

From d6e1fe70cab98ab091322f0316fc6bbcb54c5c65 Mon Sep 17 00:00:00 2001
From: Vijay Oommen <voommen@livefront.com>
Date: Thu, 5 Dec 2024 11:24:51 -0600
Subject: [PATCH 33/46] PM-15091 Remove client side
 featureflag.AccessIntelligence and use DB feature flag (#12247)

* PM-15091 remove featureflag.AccessIntelligence

* removed unwanted lines of code

* fixed merge conflict
---
 .../organizations/layouts/organization-layout.component.html | 2 +-
 .../organizations/layouts/organization-layout.component.ts   | 4 ----
 .../access-intelligence-routing.module.ts                    | 5 ++---
 .../src/admin-console/models/data/organization.data.spec.ts  | 1 +
 .../src/admin-console/models/data/organization.data.ts       | 2 ++
 libs/common/src/admin-console/models/domain/organization.ts  | 2 ++
 .../admin-console/models/response/organization.response.ts   | 2 ++
 .../models/response/profile-organization.response.ts         | 2 ++
 libs/common/src/enums/feature-flag.enum.ts                   | 2 --
 9 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
index ce832ef06e9..fa4d027d0f6 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -4,7 +4,7 @@
     <org-switcher [filter]="orgFilter" [hideNewButton]="hideNewOrgButton$ | async"></org-switcher>
     <bit-nav-group
       icon="bwi-filter"
-      *ngIf="isAccessIntelligenceFeatureEnabled"
+      *ngIf="organization.useRiskInsights"
       [text]="'accessIntelligence' | i18n"
     >
       <bit-nav-item
diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
index 9f67a8859eb..04b8dafa4e7 100644
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -70,10 +70,6 @@ export class OrganizationLayoutComponent implements OnInit {
   async ngOnInit() {
     document.body.classList.remove("layout_frontend");
 
-    this.isAccessIntelligenceFeatureEnabled = await this.configService.getFeatureFlag(
-      FeatureFlag.AccessIntelligence,
-    );
-
     this.organization$ = this.route.params.pipe(
       map((p) => p.organizationId),
       switchMap((id) => this.organizationService.organizations$.pipe(getById(id))),
diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts
index c13cc0efae8..993d9c0a134 100644
--- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts
+++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/access-intelligence-routing.module.ts
@@ -1,15 +1,14 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { organizationPermissionsGuard } from "@bitwarden/web-vault/app/admin-console/organizations/guards/org-permissions.guard";
 
 import { RiskInsightsComponent } from "./risk-insights.component";
 
 const routes: Routes = [
   {
     path: "risk-insights",
-    canActivate: [canAccessFeature(FeatureFlag.AccessIntelligence)],
+    canActivate: [organizationPermissionsGuard((org) => org.useRiskInsights)],
     component: RiskInsightsComponent,
     data: {
       titleId: "RiskInsights",
diff --git a/libs/common/src/admin-console/models/data/organization.data.spec.ts b/libs/common/src/admin-console/models/data/organization.data.spec.ts
index 12c5339a245..da9a82e7c5c 100644
--- a/libs/common/src/admin-console/models/data/organization.data.spec.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.spec.ts
@@ -56,6 +56,7 @@ describe("ORGANIZATIONS state", () => {
         allowAdminAccessToAllCollectionItems: false,
         familySponsorshipLastSyncDate: new Date(),
         userIsManagedByOrganization: false,
+        useRiskInsights: false,
       },
     };
     const result = sut.deserializer(JSON.parse(JSON.stringify(expectedResult)));
diff --git a/libs/common/src/admin-console/models/data/organization.data.ts b/libs/common/src/admin-console/models/data/organization.data.ts
index d8032fd6fcf..23a0f360f9e 100644
--- a/libs/common/src/admin-console/models/data/organization.data.ts
+++ b/libs/common/src/admin-console/models/data/organization.data.ts
@@ -56,6 +56,7 @@ export class OrganizationData {
   limitCollectionDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
   userIsManagedByOrganization: boolean;
+  useRiskInsights: boolean;
 
   constructor(
     response?: ProfileOrganizationResponse,
@@ -116,6 +117,7 @@ export class OrganizationData {
     this.limitCollectionDeletion = response.limitCollectionDeletion;
     this.allowAdminAccessToAllCollectionItems = response.allowAdminAccessToAllCollectionItems;
     this.userIsManagedByOrganization = response.userIsManagedByOrganization;
+    this.useRiskInsights = response.useRiskInsights;
 
     this.isMember = options.isMember;
     this.isProviderUser = options.isProviderUser;
diff --git a/libs/common/src/admin-console/models/domain/organization.ts b/libs/common/src/admin-console/models/domain/organization.ts
index 497d3b0889b..3f3ec0f4457 100644
--- a/libs/common/src/admin-console/models/domain/organization.ts
+++ b/libs/common/src/admin-console/models/domain/organization.ts
@@ -81,6 +81,7 @@ export class Organization {
    * matches one of the verified domains of that organization, and the user is a member of it.
    */
   userIsManagedByOrganization: boolean;
+  useRiskInsights: boolean;
 
   constructor(obj?: OrganizationData) {
     if (obj == null) {
@@ -137,6 +138,7 @@ export class Organization {
     this.limitCollectionDeletion = obj.limitCollectionDeletion;
     this.allowAdminAccessToAllCollectionItems = obj.allowAdminAccessToAllCollectionItems;
     this.userIsManagedByOrganization = obj.userIsManagedByOrganization;
+    this.useRiskInsights = obj.useRiskInsights;
   }
 
   get canAccess() {
diff --git a/libs/common/src/admin-console/models/response/organization.response.ts b/libs/common/src/admin-console/models/response/organization.response.ts
index e033646797d..fd460896a31 100644
--- a/libs/common/src/admin-console/models/response/organization.response.ts
+++ b/libs/common/src/admin-console/models/response/organization.response.ts
@@ -35,6 +35,7 @@ export class OrganizationResponse extends BaseResponse {
   limitCollectionCreation: boolean;
   limitCollectionDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
+  useRiskInsights: boolean;
 
   constructor(response: any) {
     super(response);
@@ -75,5 +76,6 @@ export class OrganizationResponse extends BaseResponse {
     this.allowAdminAccessToAllCollectionItems = this.getResponseProperty(
       "AllowAdminAccessToAllCollectionItems",
     );
+    this.useRiskInsights = this.getResponseProperty("UseRiskInsights");
   }
 }
diff --git a/libs/common/src/admin-console/models/response/profile-organization.response.ts b/libs/common/src/admin-console/models/response/profile-organization.response.ts
index ed1f45d4917..9c4b8885ab8 100644
--- a/libs/common/src/admin-console/models/response/profile-organization.response.ts
+++ b/libs/common/src/admin-console/models/response/profile-organization.response.ts
@@ -53,6 +53,7 @@ export class ProfileOrganizationResponse extends BaseResponse {
   limitCollectionDeletion: boolean;
   allowAdminAccessToAllCollectionItems: boolean;
   userIsManagedByOrganization: boolean;
+  useRiskInsights: boolean;
 
   constructor(response: any) {
     super(response);
@@ -117,5 +118,6 @@ export class ProfileOrganizationResponse extends BaseResponse {
       "AllowAdminAccessToAllCollectionItems",
     );
     this.userIsManagedByOrganization = this.getResponseProperty("UserIsManagedByOrganization");
+    this.useRiskInsights = this.getResponseProperty("UseRiskInsights");
   }
 }
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 96283b0000d..66d6b155e90 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -31,7 +31,6 @@ export enum FeatureFlag {
   CipherKeyEncryption = "cipher-key-encryption",
   VerifiedSsoDomainEndpoint = "pm-12337-refactor-sso-details-endpoint",
   PM11901_RefactorSelfHostingLicenseUploader = "PM-11901-refactor-self-hosting-license-uploader",
-  AccessIntelligence = "pm-13227-access-intelligence",
   PM14505AdminConsoleIntegrationPage = "pm-14505-admin-console-integration-page",
   CriticalApps = "pm-14466-risk-insights-critical-application",
   TrialPaymentOptional = "PM-8163-trial-payment",
@@ -81,7 +80,6 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.CipherKeyEncryption]: FALSE,
   [FeatureFlag.VerifiedSsoDomainEndpoint]: FALSE,
   [FeatureFlag.PM11901_RefactorSelfHostingLicenseUploader]: FALSE,
-  [FeatureFlag.AccessIntelligence]: FALSE,
   [FeatureFlag.PM14505AdminConsoleIntegrationPage]: FALSE,
   [FeatureFlag.CriticalApps]: FALSE,
   [FeatureFlag.TrialPaymentOptional]: FALSE,

From 8d68a2dd58d7cc79c2c5440ce99b7d593d4e9393 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Thu, 5 Dec 2024 20:22:13 -0500
Subject: [PATCH 34/46] Auth/PM-13659 - 2FA Timeout - Attempted Fix (#12263)

fix(auth): attempt to resolve 2FA session timeout issue
---
 .../src/service-container/service-container.ts  |  7 +++++++
 libs/angular/src/services/injection-tokens.ts   |  6 +++++-
 .../src/services/jslib-services.module.ts       |  9 ++++++++-
 .../login-strategies/login-strategy.service.ts  | 17 +++++++++++------
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index 21e8f9f2082..ce944db78ff 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -17,6 +17,7 @@ import {
   PinService,
   PinServiceAbstraction,
   UserDecryptionOptionsService,
+  Executor,
 } from "@bitwarden/auth/common";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
@@ -614,6 +615,11 @@ export class ServiceContainer {
       this.configService,
     );
 
+    // Execute any authn session timeout logic without any wrapping logic.
+    // An executor is required to ensure the logic is executed in an Angular context when it
+    // it is available.
+    const authnSessionTimeoutExecutor: Executor = (fn) => fn();
+
     this.loginStrategyService = new LoginStrategyService(
       this.accountService,
       this.masterPasswordService,
@@ -640,6 +646,7 @@ export class ServiceContainer {
       this.vaultTimeoutSettingsService,
       this.kdfConfigService,
       this.taskSchedulerService,
+      authnSessionTimeoutExecutor,
     );
 
     // FIXME: CLI does not support autofill
diff --git a/libs/angular/src/services/injection-tokens.ts b/libs/angular/src/services/injection-tokens.ts
index 86c5642a0c4..69a1ed3f613 100644
--- a/libs/angular/src/services/injection-tokens.ts
+++ b/libs/angular/src/services/injection-tokens.ts
@@ -1,7 +1,7 @@
 import { InjectionToken } from "@angular/core";
 import { Observable, Subject } from "rxjs";
 
-import { LogoutReason } from "@bitwarden/auth/common";
+import { Executor, LogoutReason } from "@bitwarden/auth/common";
 import { ClientType } from "@bitwarden/common/enums";
 import { RegionConfig } from "@bitwarden/common/platform/abstractions/environment.service";
 import {
@@ -68,3 +68,7 @@ export const REFRESH_ACCESS_TOKEN_ERROR_CALLBACK = new SafeInjectionToken<() =>
 export const ENV_ADDITIONAL_REGIONS = new SafeInjectionToken<RegionConfig[]>(
   "ENV_ADDITIONAL_REGIONS",
 );
+
+export const AUTHN_SESSION_TIMEOUT_EXECUTOR = new SafeInjectionToken<Executor>(
+  "AuthnSessionTimeoutExecutor",
+);
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index a43f1fa07a8..8637e26a2b2 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -1,4 +1,4 @@
-import { ErrorHandler, LOCALE_ID, NgModule } from "@angular/core";
+import { ErrorHandler, LOCALE_ID, NgModule, NgZone } from "@angular/core";
 import { Subject } from "rxjs";
 
 import {
@@ -319,6 +319,7 @@ import {
   CLIENT_TYPE,
   REFRESH_ACCESS_TOKEN_ERROR_CALLBACK,
   ENV_ADDITIONAL_REGIONS,
+  AUTHN_SESSION_TIMEOUT_EXECUTOR,
 } from "./injection-tokens";
 import { ModalService } from "./modal.service";
 
@@ -411,6 +412,11 @@ const safeProviders: SafeProvider[] = [
       TokenServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: AUTHN_SESSION_TIMEOUT_EXECUTOR,
+    useFactory: (ngZone: NgZone) => (fn: () => void) => ngZone.run(fn),
+    deps: [NgZone],
+  }),
   safeProvider({
     provide: LoginStrategyServiceAbstraction,
     useClass: LoginStrategyService,
@@ -440,6 +446,7 @@ const safeProviders: SafeProvider[] = [
       VaultTimeoutSettingsServiceAbstraction,
       KdfConfigService,
       TaskSchedulerService,
+      AUTHN_SESSION_TIMEOUT_EXECUTOR,
     ],
   }),
   safeProvider({
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index 99e3c057e11..1d5001f1f06 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -71,6 +71,8 @@ import {
 
 const sessionTimeoutLength = 5 * 60 * 1000; // 5 minutes
 
+export type Executor = (fn: () => void) => void;
+
 export class LoginStrategyService implements LoginStrategyServiceAbstraction {
   private sessionTimeoutSubscription: Subscription;
   private currentAuthnTypeState: GlobalState<AuthenticationType | null>;
@@ -118,6 +120,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     protected vaultTimeoutSettingsService: VaultTimeoutSettingsService,
     protected kdfConfigService: KdfConfigService,
     protected taskSchedulerService: TaskSchedulerService,
+    private authnSessionTimeoutExecutor: Executor = (fn) => fn(), // Default to no-op
   ) {
     this.currentAuthnTypeState = this.stateProvider.get(CURRENT_LOGIN_STRATEGY_KEY);
     this.loginStrategyCacheState = this.stateProvider.get(CACHE_KEY);
@@ -128,12 +131,14 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     this.taskSchedulerService.registerTaskHandler(
       ScheduledTaskNames.loginStrategySessionTimeout,
       async () => {
-        this.twoFactorTimeoutSubject.next(true);
-        try {
-          await this.clearCache();
-        } catch (e) {
-          this.logService.error("Failed to clear cache during session timeout", e);
-        }
+        this.authnSessionTimeoutExecutor(async () => {
+          this.twoFactorTimeoutSubject.next(true);
+          try {
+            await this.clearCache();
+          } catch (e) {
+            this.logService.error("Failed to clear cache during session timeout", e);
+          }
+        });
       },
     );
 

From f95cc7b82cb0e8f1f5921740c4033e2ddbcbd536 Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Fri, 6 Dec 2024 15:17:48 +0100
Subject: [PATCH 35/46] Resolve the Unauthorized issue (#12262)

---
 apps/web/src/app/vault/individual-vault/vault.component.ts | 5 ++++-
 apps/web/src/app/vault/org-vault/vault.component.ts        | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts
index 5f66bb49af5..73a5de2ad5e 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault.component.ts
@@ -210,7 +210,10 @@ export class VaultComponent implements OnInit, OnDestroy {
 
   protected organizationsPaymentStatus$: Observable<FreeTrial[]> = combineLatest([
     this.organizationService.organizations$.pipe(
-      map((organizations) => organizations?.filter((org) => org.isOwner) ?? []),
+      map(
+        (organizations) =>
+          organizations?.filter((org) => org.isOwner && org.canViewBillingHistory) ?? [],
+      ),
     ),
     this.hasSubscription$,
   ]).pipe(
diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts
index 18cc6e49abc..eb7d586cf74 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault.component.ts
@@ -592,7 +592,9 @@ export class VaultComponent implements OnInit, OnDestroy {
       organization$,
       this.hasSubscription$.pipe(filter((hasSubscription) => hasSubscription !== null)),
     ]).pipe(
-      filter(([org, hasSubscription]) => org.isOwner && hasSubscription),
+      filter(
+        ([org, hasSubscription]) => org.isOwner && hasSubscription && org.canViewBillingHistory,
+      ),
       switchMap(([org]) =>
         combineLatest([
           of(org),

From f16bfa4cd2136d55d1cfd4d4f4e63b8d364bea2a Mon Sep 17 00:00:00 2001
From: Andreas Coroiu <acoroiu@bitwarden.com>
Date: Fri, 6 Dec 2024 16:31:30 +0100
Subject: [PATCH 36/46] [PM-9035] desktop build logic to provide credentials to
 os on sync (#10181)

* feat: scaffold desktop_objc

* feat: rename fido2 to autofill

* feat: scaffold electron autofill

* feat: auto call hello world on init

* feat: scaffold call to basic objc function

* feat: simple log that checks if autofill is enabled

* feat: adding some availability guards

* feat: scaffold services and allow calls from inspector

* feat: create custom type for returning strings across rust/objc boundary

* chore: clean up comments

* feat: enable ARC

* feat: add util function `c_string_to_nsstring`

* chore: refactor and rename to `run_command`

* feat: add try-catch around command execution

* feat: properly implement command calling

Add static typing. Add proper error handling.

* feat: add autoreleasepool to avoid memory leaks

* chore: change objc names to camelCase

* fix: error returning

* feat: extract some helper functions into utils class

* feat: scaffold status command

* feat: implement status command

* feat: implement password credential mapping

* wip: implement sync command

This crashes because we are not properly handling the fact that `saveCredentialIdentities` uses callbacks, resulting in a race condition where we try to access a variable (result) that has already gotten dealloc'd.

* feat: first version of callback

* feat: make run_command async

* feat: functioning callback returns

* chore: refactor to make objc code easier to read and use

* feat: refactor everything to use new callback return method

* feat: re-implement status command with callback

* fix: warning about CommandContext not being FFI-safe

* feat: implement sync command using callbacks

* feat: implement manual password credential sync

* feat: add auto syncing

* docs: add todo

* feat: add support for passkeys

* chore: move desktop autofill service to init service

* feat: auto-add all .m files to builder

* fix: native build on unix and windows

* fix: unused compiler warnings

* fix: napi type exports

* feat: add corresponding dist command

* feat: comment signing profile until we fix signing

* fix: build breaking on non-macOS platforms

* chore: cargo lock update

* chore: revert accidental version change

* feat: put sync behind feature flag

* chore: put files in autofill folder

* fix: obj-c code not recompiling on changes

* feat: add `namespace` to commands

* fix: linting complaining about flag

* feat: add autofill as owner of their objc code

* chore: make autofill owner of run_command in core crate

* fix: re-add napi annotation

* fix: remove dev bypass
---
 .github/CODEOWNERS                            |   2 +
 apps/desktop/desktop_native/Cargo.lock        | 245 ++++++++++++------
 apps/desktop/desktop_native/core/Cargo.toml   |  11 +-
 .../desktop_native/core/src/autofill/macos.rs |   5 +
 .../desktop_native/core/src/autofill/mod.rs   |   5 +
 .../desktop_native/core/src/autofill/unix.rs  |   5 +
 .../core/src/autofill/windows.rs              |   5 +
 apps/desktop/desktop_native/core/src/lib.rs   |   6 +-
 apps/desktop/desktop_native/napi/index.d.ts   |   3 +
 apps/desktop/desktop_native/napi/src/lib.rs   |  57 +++-
 apps/desktop/desktop_native/objc/Cargo.toml   |  21 ++
 apps/desktop/desktop_native/objc/build.rs     |  22 ++
 apps/desktop/desktop_native/objc/src/lib.rs   | 124 +++++++++
 .../desktop_native/objc/src/native/.clangd    |   2 +
 .../src/native/autofill/commands/status.h     |   8 +
 .../src/native/autofill/commands/status.m     |  57 ++++
 .../objc/src/native/autofill/commands/sync.h  |   8 +
 .../objc/src/native/autofill/commands/sync.m  |  59 +++++
 .../native/autofill/run_autofill_command.h    |   8 +
 .../native/autofill/run_autofill_command.m    |  20 ++
 .../desktop_native/objc/src/native/interop.h  |  47 ++++
 .../desktop_native/objc/src/native/interop.m  |  71 +++++
 .../objc/src/native/run_command.m             |  39 +++
 .../desktop_native/objc/src/native/utils.h    |  11 +
 .../desktop_native/objc/src/native/utils.m    |  28 ++
 .../CredentialProviderViewController.swift    |  21 +-
 apps/desktop/package.json                     |   1 +
 apps/desktop/scripts/build-macos-extension.js |   5 +-
 apps/desktop/src/app/services/init.service.ts |   4 +
 .../src/app/services/services.module.ts       |   6 +
 apps/desktop/src/autofill/preload.ts          |   9 +
 .../services/desktop-autofill.service.ts      | 121 +++++++++
 apps/desktop/src/main.ts                      |   5 +
 .../src/platform/main/autofill/command.ts     |  23 ++
 .../main/autofill/native-autofill.main.ts     |  53 ++++
 .../platform/main/autofill/status.command.ts  |  20 ++
 .../platform/main/autofill/sync.command.ts    |  37 +++
 apps/desktop/src/preload.ts                   |   2 +
 libs/common/src/enums/feature-flag.enum.ts    |   2 +
 .../services/fido2/fido2-autofill-utils.ts    |  26 ++
 .../view/fido2-credential-autofill.view.ts    |   7 +
 41 files changed, 1099 insertions(+), 112 deletions(-)
 create mode 100644 apps/desktop/desktop_native/core/src/autofill/macos.rs
 create mode 100644 apps/desktop/desktop_native/core/src/autofill/mod.rs
 create mode 100644 apps/desktop/desktop_native/core/src/autofill/unix.rs
 create mode 100644 apps/desktop/desktop_native/core/src/autofill/windows.rs
 create mode 100644 apps/desktop/desktop_native/objc/Cargo.toml
 create mode 100644 apps/desktop/desktop_native/objc/build.rs
 create mode 100644 apps/desktop/desktop_native/objc/src/lib.rs
 create mode 100644 apps/desktop/desktop_native/objc/src/native/.clangd
 create mode 100644 apps/desktop/desktop_native/objc/src/native/autofill/commands/status.h
 create mode 100644 apps/desktop/desktop_native/objc/src/native/autofill/commands/status.m
 create mode 100644 apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.h
 create mode 100644 apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
 create mode 100644 apps/desktop/desktop_native/objc/src/native/autofill/run_autofill_command.h
 create mode 100644 apps/desktop/desktop_native/objc/src/native/autofill/run_autofill_command.m
 create mode 100644 apps/desktop/desktop_native/objc/src/native/interop.h
 create mode 100644 apps/desktop/desktop_native/objc/src/native/interop.m
 create mode 100644 apps/desktop/desktop_native/objc/src/native/run_command.m
 create mode 100644 apps/desktop/desktop_native/objc/src/native/utils.h
 create mode 100644 apps/desktop/desktop_native/objc/src/native/utils.m
 create mode 100644 apps/desktop/src/autofill/preload.ts
 create mode 100644 apps/desktop/src/autofill/services/desktop-autofill.service.ts
 create mode 100644 apps/desktop/src/platform/main/autofill/command.ts
 create mode 100644 apps/desktop/src/platform/main/autofill/native-autofill.main.ts
 create mode 100644 apps/desktop/src/platform/main/autofill/status.command.ts
 create mode 100644 apps/desktop/src/platform/main/autofill/sync.command.ts
 create mode 100644 libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
 create mode 100644 libs/common/src/vault/models/view/fido2-credential-autofill.view.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 12a8c182335..959c176c5cf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -103,6 +103,8 @@ apps/web/src/app/layouts @bitwarden/team-design-system
 
 ## Desktop native module ##
 apps/desktop/desktop_native @bitwarden/team-platform-dev
+apps/desktop/desktop_native/objc/src/native/autofill @bitwarden/team-autofill-dev
+apps/desktop/desktop_native/core/src/autofill @bitwarden/team-autofill-dev
 
 ## Key management team files ##
 apps/desktop/src/key-management @bitwarden/team-key-management-dev
diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock
index 82dbebb12df..148e56fcb0d 100644
--- a/apps/desktop/desktop_native/Cargo.lock
+++ b/apps/desktop/desktop_native/Cargo.lock
@@ -62,6 +62,12 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "anstyle"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
 [[package]]
 name = "anyhow"
 version = "1.0.93"
@@ -147,9 +153,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.4"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
+checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
 dependencies = [
  "async-lock",
  "cfg-if",
@@ -412,9 +418,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cbc"
@@ -427,9 +433,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.34"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b9470d453346108f93a59222a9a1a5724db32d0a4727b7ab7ace4b4d822dc9"
+checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
 dependencies = [
  "shlex",
 ]
@@ -474,6 +480,32 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "clap"
+version = "4.5.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69371e34337c4c984bbe322360c2547210bf632eb2814bbe78a6e87a2935bd2b"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e24c1b4099818523236a8ca881d2b45db98dadfb4625cf6608c12069fcbbde1"
+dependencies = [
+ "anstyle",
+ "clap_lex",
+ "strsim",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
+
 [[package]]
 name = "clipboard-win"
 version = "5.4.0"
@@ -517,6 +549,16 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.10.0"
@@ -535,9 +577,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -561,9 +603,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f"
+checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
 dependencies = [
  "quote",
  "syn",
@@ -606,25 +648,26 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.129"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdc8cca144dce1c4981b5c9ab748761619979e515c3d53b5df385c677d1d007"
+checksum = "05e1ec88093d2abd9cf1b09ffd979136b8e922bf31cad966a8fe0d73233112ef"
 dependencies = [
  "cc",
+ "cxxbridge-cmd",
  "cxxbridge-flags",
  "cxxbridge-macro",
+ "foldhash",
  "link-cplusplus",
 ]
 
 [[package]]
 name = "cxx-build"
-version = "1.0.129"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5764c3142ab44fcf857101d12c0ddf09c34499900557c764f5ad0597159d1fc"
+checksum = "9afa390d956ee7ccb41aeed7ed7856ab3ffb4fc587e7216be7e0f83e949b4e6c"
 dependencies = [
  "cc",
  "codespan-reporting",
- "once_cell",
  "proc-macro2",
  "quote",
  "scratch",
@@ -632,19 +675,33 @@ dependencies = [
 ]
 
 [[package]]
-name = "cxxbridge-flags"
-version = "1.0.129"
+name = "cxxbridge-cmd"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d422aff542b4fa28c2ce8e5cc202d42dbf24702345c1fba3087b2d3f8a1b90ff"
+checksum = "3c23bfff654d6227cbc83de8e059d2f8678ede5fc3a6c5a35d5c379983cc61e6"
+dependencies = [
+ "clap",
+ "codespan-reporting",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "cxxbridge-flags"
+version = "1.0.133"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c01b36e22051bc6928a78583f1621abaaf7621561c2ada1b00f7878fbe2caa"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.129"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1719100f31492cd6adeeab9a0f46cdbc846e615fdb66d7b398aa46ec7fdd06f"
+checksum = "f6e14013136fac689345d17b9a6df55977251f11d333c0a571e8d963b55e1f95"
 dependencies = [
  "proc-macro2",
  "quote",
+ "rustversion",
  "syn",
 ]
 
@@ -692,7 +749,8 @@ dependencies = [
  "bitwarden-russh",
  "byteorder",
  "cbc",
- "core-foundation",
+ "core-foundation 0.10.0",
+ "desktop_objc",
  "dirs",
  "ed25519",
  "futures",
@@ -743,6 +801,18 @@ dependencies = [
  "windows-registry",
 ]
 
+[[package]]
+name = "desktop_objc"
+version = "0.0.0"
+dependencies = [
+ "anyhow",
+ "cc",
+ "core-foundation 0.9.4",
+ "glob",
+ "thiserror",
+ "tokio",
+]
+
 [[package]]
 name = "desktop_proxy"
 version = "0.0.0"
@@ -874,12 +944,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -901,9 +971,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
  "event-listener",
  "pin-project-lite",
@@ -911,9 +981,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "fiat-crypto"
@@ -933,6 +1003,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "futures"
 version = "0.3.31"
@@ -983,9 +1059,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f1fa2f9765705486b33fd2acf1577f8ec449c2ba1f318ae5447697b7c08d210"
+checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1"
 dependencies = [
  "fastrand",
  "futures-core",
@@ -1083,16 +1159,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
-name = "hashbrown"
-version = "0.15.1"
+name = "glob"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
+checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.9"
+name = "hashbrown"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "hermit-abi"
@@ -1138,9 +1214,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1173,9 +1249,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "keytar"
@@ -1215,9 +1291,9 @@ checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
 [[package]]
 name = "libloading"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.6",
@@ -1312,11 +1388,10 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi 0.3.9",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
@@ -1859,13 +1934,13 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polling"
-version = "3.7.3"
+version = "3.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
+checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.4.0",
+ "hermit-abi",
  "pin-project-lite",
  "rustix",
  "tracing",
@@ -1921,9 +1996,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
@@ -2016,9 +2091,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2079,18 +2154,18 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
  "bitflags",
  "errno",
@@ -2099,6 +2174,12 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+
 [[package]]
 name = "salsa20"
 version = "0.10.2"
@@ -2144,7 +2225,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9d0283c0a4a22a0f1b0e4edca251aa20b92fc96eaa09b84bec052f9415e9d71"
 dependencies = [
  "bitflags",
- "core-foundation",
+ "core-foundation 0.10.0",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -2168,18 +2249,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.214"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2272,9 +2353,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2349,6 +2430,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -2357,9 +2444,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2368,9 +2455,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -2410,9 +2497,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -2433,9 +2520,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2511,9 +2598,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -2522,9 +2609,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2533,9 +2620,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -2572,9 +2659,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-segmentation"
diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml
index 6e17cde2fa7..4ace1c13e08 100644
--- a/apps/desktop/desktop_native/core/Cargo.toml
+++ b/apps/desktop/desktop_native/core/Cargo.toml
@@ -23,7 +23,7 @@ sys = [
 aes = "=0.8.4"
 anyhow = "=1.0.93"
 arboard = { version = "=3.4.1", default-features = false, features = [
-    "wayland-data-control",
+  "wayland-data-control",
 ] }
 argon2 = { version = "=0.5.3", features = ["zeroize"] }
 async-stream = "=0.3.6"
@@ -44,10 +44,10 @@ scopeguard = "=1.2.0"
 sha2 = "=0.10.8"
 ssh-encoding = "=0.2.0"
 ssh-key = { version = "=0.6.7", default-features = false, features = [
-    "encryption",
-    "ed25519",
-    "rsa",
-    "getrandom",
+  "encryption",
+  "ed25519",
+  "rsa",
+  "getrandom",
 ] }
 bitwarden-russh = { git = "https://github.com/bitwarden/bitwarden-russh.git", rev = "b4e7f2fedbe3df8c35545feb000176d3e7b2bc32" }
 tokio = { version = "=1.41.1", features = ["io-util", "sync", "macros", "net"] }
@@ -81,6 +81,7 @@ keytar = "=0.1.6"
 core-foundation = { version = "=0.10.0", optional = true }
 security-framework = { version = "=3.0.0", optional = true }
 security-framework-sys = { version = "=2.12.0", optional = true }
+desktop_objc = { path = "../objc" }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 oo7 = "=0.3.3"
diff --git a/apps/desktop/desktop_native/core/src/autofill/macos.rs b/apps/desktop/desktop_native/core/src/autofill/macos.rs
new file mode 100644
index 00000000000..08f333abe93
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/autofill/macos.rs
@@ -0,0 +1,5 @@
+use anyhow::Result;
+
+pub async fn run_command(value: String) -> Result<String> {
+    desktop_objc::run_command(value).await
+}
diff --git a/apps/desktop/desktop_native/core/src/autofill/mod.rs b/apps/desktop/desktop_native/core/src/autofill/mod.rs
new file mode 100644
index 00000000000..5997add240f
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/autofill/mod.rs
@@ -0,0 +1,5 @@
+#[cfg_attr(target_os = "linux", path = "unix.rs")]
+#[cfg_attr(target_os = "windows", path = "windows.rs")]
+#[cfg_attr(target_os = "macos", path = "macos.rs")]
+mod autofill;
+pub use autofill::*;
diff --git a/apps/desktop/desktop_native/core/src/autofill/unix.rs b/apps/desktop/desktop_native/core/src/autofill/unix.rs
new file mode 100644
index 00000000000..d77130176a4
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/autofill/unix.rs
@@ -0,0 +1,5 @@
+use anyhow::Result;
+
+pub async fn run_command(value: String) -> Result<String> {
+    todo!("Unix does not support autofill");
+}
diff --git a/apps/desktop/desktop_native/core/src/autofill/windows.rs b/apps/desktop/desktop_native/core/src/autofill/windows.rs
new file mode 100644
index 00000000000..2e442263c1b
--- /dev/null
+++ b/apps/desktop/desktop_native/core/src/autofill/windows.rs
@@ -0,0 +1,5 @@
+use anyhow::Result;
+
+pub async fn run_command(value: String) -> Result<String> {
+    todo!("Windows does not support autofill");
+}
diff --git a/apps/desktop/desktop_native/core/src/lib.rs b/apps/desktop/desktop_native/core/src/lib.rs
index f38e6ef97b4..b63c773209f 100644
--- a/apps/desktop/desktop_native/core/src/lib.rs
+++ b/apps/desktop/desktop_native/core/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod autofill;
 #[cfg(feature = "sys")]
 pub mod biometric;
 #[cfg(feature = "sys")]
@@ -8,9 +9,8 @@ pub mod ipc;
 #[cfg(feature = "sys")]
 pub mod password;
 #[cfg(feature = "sys")]
-pub mod process_isolation;
-#[cfg(feature = "sys")]
 pub mod powermonitor;
 #[cfg(feature = "sys")]
-
+pub mod process_isolation;
+#[cfg(feature = "sys")]
 pub mod ssh_agent;
diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts
index 9ceb30c4ff5..0eaba197919 100644
--- a/apps/desktop/desktop_native/napi/index.d.ts
+++ b/apps/desktop/desktop_native/napi/index.d.ts
@@ -122,6 +122,9 @@ export declare namespace ipc {
     send(message: string): number
   }
 }
+export declare namespace autofill {
+  export function runCommand(value: string): Promise<string>
+}
 export declare namespace crypto {
   export function argon2(secret: Buffer, salt: Buffer, iterations: number, memory: number, parallelism: number): Promise<Buffer>
 }
diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs
index f160b19ad53..5037108afd7 100644
--- a/apps/desktop/desktop_native/napi/src/lib.rs
+++ b/apps/desktop/desktop_native/napi/src/lib.rs
@@ -8,7 +8,8 @@ pub mod passwords {
     /// Fetch the stored password from the keychain.
     #[napi]
     pub async fn get_password(service: String, account: String) -> napi::Result<String> {
-        desktop_core::password::get_password(&service, &account).await
+        desktop_core::password::get_password(&service, &account)
+            .await
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
@@ -19,21 +20,25 @@ pub mod passwords {
         account: String,
         password: String,
     ) -> napi::Result<()> {
-        desktop_core::password::set_password(&service, &account, &password).await
+        desktop_core::password::set_password(&service, &account, &password)
+            .await
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
     /// Delete the stored password from the keychain.
     #[napi]
     pub async fn delete_password(service: String, account: String) -> napi::Result<()> {
-        desktop_core::password::delete_password(&service, &account).await
+        desktop_core::password::delete_password(&service, &account)
+            .await
             .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
     // Checks if the os secure storage is available
     #[napi]
     pub async fn is_available() -> napi::Result<bool> {
-        desktop_core::password::is_available().await.map_err(|e| napi::Error::from_reason(e.to_string()))
+        desktop_core::password::is_available()
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 }
 
@@ -244,13 +249,17 @@ pub mod sshagent {
     pub async fn serve(
         callback: ThreadsafeFunction<(String, bool), CalleeHandled>,
     ) -> napi::Result<SshAgentState> {
-        let (auth_request_tx, mut auth_request_rx) = tokio::sync::mpsc::channel::<(u32, (String, bool))>(32);
-        let (auth_response_tx, auth_response_rx) = tokio::sync::broadcast::channel::<(u32, bool)>(32);
+        let (auth_request_tx, mut auth_request_rx) =
+            tokio::sync::mpsc::channel::<(u32, (String, bool))>(32);
+        let (auth_response_tx, auth_response_rx) =
+            tokio::sync::broadcast::channel::<(u32, bool)>(32);
         let auth_response_tx_arc = Arc::new(Mutex::new(auth_response_tx));
         tokio::spawn(async move {
             let _ = auth_response_rx;
 
-            while let Some((request_id, (cipher_uuid, is_list_request))) = auth_request_rx.recv().await {
+            while let Some((request_id, (cipher_uuid, is_list_request))) =
+                auth_request_rx.recv().await
+            {
                 let cloned_request_id = request_id.clone();
                 let cloned_cipher_uuid = cipher_uuid.clone();
                 let cloned_response_tx_arc = auth_response_tx_arc.clone();
@@ -260,23 +269,33 @@ pub mod sshagent {
                     let cipher_uuid = cloned_cipher_uuid;
                     let auth_response_tx_arc = cloned_response_tx_arc;
                     let callback = cloned_callback;
-                    let promise_result: Result<Promise<bool>, napi::Error> =
-                        callback.call_async(Ok((cipher_uuid, is_list_request))).await;
+                    let promise_result: Result<Promise<bool>, napi::Error> = callback
+                        .call_async(Ok((cipher_uuid, is_list_request)))
+                        .await;
                     match promise_result {
                         Ok(promise_result) => match promise_result.await {
                             Ok(result) => {
-                                let _ = auth_response_tx_arc.lock().await.send((request_id, result))
+                                let _ = auth_response_tx_arc
+                                    .lock()
+                                    .await
+                                    .send((request_id, result))
                                     .expect("should be able to send auth response to agent");
                             }
                             Err(e) => {
                                 println!("[SSH Agent Native Module] calling UI callback promise was rejected: {}", e);
-                                let _ = auth_response_tx_arc.lock().await.send((request_id, false))
+                                let _ = auth_response_tx_arc
+                                    .lock()
+                                    .await
+                                    .send((request_id, false))
                                     .expect("should be able to send auth response to agent");
                             }
                         },
                         Err(e) => {
                             println!("[SSH Agent Native Module] calling UI callback could not create promise: {}", e);
-                            let _ = auth_response_tx_arc.lock().await.send((request_id, false))
+                            let _ = auth_response_tx_arc
+                                .lock()
+                                .await
+                                .send((request_id, false))
                                 .expect("should be able to send auth response to agent");
                         }
                     }
@@ -343,7 +362,9 @@ pub mod sshagent {
     #[napi]
     pub fn clear_keys(agent_state: &mut SshAgentState) -> napi::Result<()> {
         let bitwarden_agent_state = &mut agent_state.state;
-        bitwarden_agent_state.clear_keys().map_err(|e| napi::Error::from_reason(e.to_string()))
+        bitwarden_agent_state
+            .clear_keys()
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
     }
 
     #[napi]
@@ -524,6 +545,16 @@ pub mod ipc {
     }
 }
 
+#[napi]
+pub mod autofill {
+    #[napi]
+    pub async fn run_command(value: String) -> napi::Result<String> {
+        desktop_core::autofill::run_command(value)
+            .await
+            .map_err(|e| napi::Error::from_reason(e.to_string()))
+    }
+}
+
 #[napi]
 pub mod crypto {
     use napi::bindgen_prelude::Buffer;
diff --git a/apps/desktop/desktop_native/objc/Cargo.toml b/apps/desktop/desktop_native/objc/Cargo.toml
new file mode 100644
index 00000000000..4b883ce6fa7
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+edition = "2021"
+license = "GPL-3.0"
+name = "desktop_objc"
+version = "0.0.0"
+publish = false
+
+[features]
+default = []
+
+[dependencies]
+anyhow = "=1.0.93"
+thiserror = "=1.0.69"
+tokio = "1.39.1"
+
+[target.'cfg(target_os = "macos")'.dependencies]
+core-foundation = "=0.9.4"
+
+[build-dependencies]
+cc = "1.0.104"
+glob = "0.3.1"
diff --git a/apps/desktop/desktop_native/objc/build.rs b/apps/desktop/desktop_native/objc/build.rs
new file mode 100644
index 00000000000..57f3b626bf7
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/build.rs
@@ -0,0 +1,22 @@
+use glob::glob;
+
+#[cfg(target_os = "macos")]
+fn main() {
+    let mut builder = cc::Build::new();
+
+    // Auto compile all .m files in the src/native directory
+    for entry in glob("src/native/**/*.m").expect("Failed to read glob pattern") {
+        let path = entry.expect("Failed to read glob entry");
+        builder.file(path.clone());
+        println!("cargo::rerun-if-changed={}", path.display());
+    }
+
+    builder
+        .flag("-fobjc-arc") // Enable Auto Reference Counting (ARC)
+        .compile("autofill");
+}
+
+#[cfg(not(target_os = "macos"))]
+fn main() {
+    // Crate is only supported on macOS
+}
diff --git a/apps/desktop/desktop_native/objc/src/lib.rs b/apps/desktop/desktop_native/objc/src/lib.rs
new file mode 100644
index 00000000000..64475b7956d
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/lib.rs
@@ -0,0 +1,124 @@
+#![cfg(target_os = "macos")]
+
+use std::{
+    ffi::{c_char, CStr, CString},
+    os::raw::c_void,
+};
+
+use anyhow::{Context, Result};
+
+#[repr(C)]
+pub struct ObjCString {
+    value: *const c_char,
+    size: usize,
+}
+
+#[repr(C)]
+pub struct CommandContext {
+    tx: Option<tokio::sync::oneshot::Sender<String>>,
+}
+
+impl CommandContext {
+    pub fn new() -> (Self, tokio::sync::oneshot::Receiver<String>) {
+        let (tx, rx) = tokio::sync::oneshot::channel::<String>();
+
+        (CommandContext { tx: Some(tx) }, rx)
+    }
+
+    pub fn send(&mut self, value: String) -> Result<()> {
+        let tx = self.tx.take().context(
+            "Failed to take Sender from CommandContext. Has this context already returned once?",
+        )?;
+
+        tx.send(value).map_err(|_| {
+            anyhow::anyhow!("Failed to send ObjCString from CommandContext to Rust code")
+        })?;
+
+        Ok(())
+    }
+
+    pub fn as_ptr(&mut self) -> *mut c_void {
+        self as *mut Self as *mut c_void
+    }
+}
+
+impl TryFrom<ObjCString> for String {
+    type Error = anyhow::Error;
+
+    fn try_from(value: ObjCString) -> Result<Self> {
+        let c_str = unsafe { CStr::from_ptr(value.value) };
+        let str = c_str
+            .to_str()
+            .context("Failed to convert ObjC output string to &str for use in Rust")?;
+
+        Ok(str.to_owned())
+    }
+}
+
+impl Drop for ObjCString {
+    fn drop(&mut self) {
+        unsafe {
+            objc::freeObjCString(self);
+        }
+    }
+}
+
+mod objc {
+    use std::os::raw::c_void;
+
+    use super::*;
+
+    extern "C" {
+        pub fn runCommand(context: *mut c_void, value: *const c_char);
+        pub fn freeObjCString(value: &ObjCString);
+    }
+
+    /// This function is called from the ObjC code to return the output of the command
+    #[no_mangle]
+    pub extern "C" fn commandReturn(context: &mut CommandContext, value: ObjCString) -> bool {
+        let value: String = match value.try_into() {
+            Ok(value) => value,
+            Err(e) => {
+                println!(
+                    "Error: Failed to convert ObjCString to Rust string during commandReturn: {}",
+                    e
+                );
+
+                return false;
+            }
+        };
+
+        match context.send(value) {
+            Ok(_) => 0,
+            Err(e) => {
+                println!(
+                    "Error: Failed to return ObjCString from ObjC code to Rust code: {}",
+                    e
+                );
+
+                return false;
+            }
+        };
+
+        return true;
+    }
+}
+
+pub async fn run_command(input: String) -> Result<String> {
+    // Convert input to type that can be passed to ObjC code
+    let c_input = CString::new(input)
+        .context("Failed to convert Rust input string to a CString for use in call to ObjC code")?;
+
+    let (mut context, rx) = CommandContext::new();
+
+    // Call ObjC code
+    unsafe { objc::runCommand(context.as_ptr(), c_input.as_ptr()) };
+
+    // Convert output from ObjC code to Rust string
+    let objc_output = rx.await?.try_into()?;
+
+    // Convert output from ObjC code to Rust string
+    // let objc_output = output.try_into()?;
+
+    Ok(objc_output)
+}
diff --git a/apps/desktop/desktop_native/objc/src/native/.clangd b/apps/desktop/desktop_native/objc/src/native/.clangd
new file mode 100644
index 00000000000..5369bebcdc0
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/.clangd
@@ -0,0 +1,2 @@
+CompileFlags:
+  Add: [-fobjc-arc]
diff --git a/apps/desktop/desktop_native/objc/src/native/autofill/commands/status.h b/apps/desktop/desktop_native/objc/src/native/autofill/commands/status.h
new file mode 100644
index 00000000000..e3e3c7969b6
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/autofill/commands/status.h
@@ -0,0 +1,8 @@
+#ifndef STATUS_H
+#define STATUS_H
+
+#import <Foundation/Foundation.h>
+
+void status(void *context, NSDictionary *params);
+
+#endif
diff --git a/apps/desktop/desktop_native/objc/src/native/autofill/commands/status.m b/apps/desktop/desktop_native/objc/src/native/autofill/commands/status.m
new file mode 100644
index 00000000000..8811ffc6f0c
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/autofill/commands/status.m
@@ -0,0 +1,57 @@
+#import <Foundation/Foundation.h>
+#import <AuthenticationServices/ASCredentialIdentityStore.h>
+#import <AuthenticationServices/ASCredentialIdentityStoreState.h>
+#import "../../interop.h"
+#import "status.h"
+
+void storeState(void (^callback)(ASCredentialIdentityStoreState*)) {
+  if (@available(macos 11, *)) {
+    ASCredentialIdentityStore *store = [ASCredentialIdentityStore sharedStore];
+    [store getCredentialIdentityStoreStateWithCompletion:^(ASCredentialIdentityStoreState * _Nonnull state) {
+      callback(state);
+    }];
+  } else {
+    callback(nil);
+  }
+}
+
+BOOL fido2Supported() {
+  if (@available(macos 14, *)) {
+    return YES;
+  } else {
+    return NO;
+  }
+}
+
+BOOL passwordSupported() {
+  if (@available(macos 11, *)) {
+    return YES;
+  } else {
+    return NO;
+  }
+}
+
+void status(void* context, __attribute__((unused)) NSDictionary *params) {
+  storeState(^(ASCredentialIdentityStoreState *state) {
+    BOOL enabled = NO;
+    BOOL supportsIncremental = NO;
+
+    if (state != nil) {
+      enabled = state.isEnabled;
+      supportsIncremental = state.supportsIncrementalUpdates;
+    }
+
+    _return(context,
+      _success(@{
+        @"support": @{
+          @"fido2": @(fido2Supported()),
+          @"password": @(passwordSupported()),
+          @"incrementalUpdates": @(supportsIncremental),
+        },
+        @"state": @{
+          @"enabled": @(enabled),
+        }
+      })
+    );
+  });
+}
diff --git a/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.h b/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.h
new file mode 100644
index 00000000000..4eb39ff24d6
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.h
@@ -0,0 +1,8 @@
+#ifndef SYNC_H
+#define SYNC_H
+
+#import <Foundation/Foundation.h>
+
+void runSync(void *context, NSDictionary *params);
+
+#endif
diff --git a/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m b/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
new file mode 100644
index 00000000000..8b73635a7ca
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/autofill/commands/sync.m
@@ -0,0 +1,59 @@
+#import <Foundation/Foundation.h>
+#import <AuthenticationServices/ASCredentialIdentityStore.h>
+#import <AuthenticationServices/ASCredentialIdentityStoreState.h>
+#import <AuthenticationServices/ASCredentialServiceIdentifier.h>
+#import <AuthenticationServices/ASPasswordCredentialIdentity.h>
+#import <AuthenticationServices/ASPasskeyCredentialIdentity.h>
+#import "../../utils.h"
+#import "../../interop.h"
+#import "sync.h"
+
+// 'run' is added to the name because it clashes with internal macOS function
+void runSync(void* context, NSDictionary *params) {
+  NSArray *credentials = params[@"credentials"];
+
+  // Map credentials to ASPasswordCredential objects
+  NSMutableArray *mappedCredentials = [NSMutableArray arrayWithCapacity:credentials.count];
+  for (NSDictionary *credential in credentials) {
+    NSString *type = credential[@"type"];
+
+    if ([type isEqualToString:@"password"]) {
+      NSString *cipherId = credential[@"cipherId"];
+      NSString *uri = credential[@"uri"];
+      NSString *username = credential[@"username"];
+
+      ASCredentialServiceIdentifier *serviceId = [[ASCredentialServiceIdentifier alloc]
+        initWithIdentifier:uri type:ASCredentialServiceIdentifierTypeURL];
+      ASPasswordCredentialIdentity *credential = [[ASPasswordCredentialIdentity alloc]
+        initWithServiceIdentifier:serviceId user:username recordIdentifier:cipherId];
+
+      [mappedCredentials addObject:credential];
+    }
+
+    if ([type isEqualToString:@"fido2"]) {
+      NSString *cipherId = credential[@"cipherId"];
+      NSString *rpId = credential[@"rpId"];
+      NSString *userName = credential[@"userName"];
+      NSData *credentialId = decodeBase64URL(credential[@"credentialId"]);
+      NSData *userHandle = decodeBase64URL(credential[@"userHandle"]);
+
+      ASPasskeyCredentialIdentity *credential = [[ASPasskeyCredentialIdentity alloc]
+        initWithRelyingPartyIdentifier:rpId
+        userName:userName
+        credentialID:credentialId
+        userHandle:userHandle
+        recordIdentifier:cipherId];
+
+      [mappedCredentials addObject:credential];
+    }
+  }
+
+  [ASCredentialIdentityStore.sharedStore replaceCredentialIdentityEntries:mappedCredentials
+    completion:^(__attribute__((unused)) BOOL success, NSError * _Nullable error) {
+      if (error) {
+        return _return(context, _error_er(error));
+      }
+
+      _return(context, _success(@{@"added": @([mappedCredentials count])}));
+    }];
+}
diff --git a/apps/desktop/desktop_native/objc/src/native/autofill/run_autofill_command.h b/apps/desktop/desktop_native/objc/src/native/autofill/run_autofill_command.h
new file mode 100644
index 00000000000..fba5f626863
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/autofill/run_autofill_command.h
@@ -0,0 +1,8 @@
+#ifndef RUN_AUTOFILL_COMMAND_H
+#define RUN_AUTOFILL_COMMAND_H
+
+#import <Foundation/Foundation.h>
+
+void runAutofillCommand(void* context, NSDictionary *input);
+
+#endif
diff --git a/apps/desktop/desktop_native/objc/src/native/autofill/run_autofill_command.m b/apps/desktop/desktop_native/objc/src/native/autofill/run_autofill_command.m
new file mode 100644
index 00000000000..46b188139bc
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/autofill/run_autofill_command.m
@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+#import "commands/sync.h"
+#import "commands/status.h"
+#import "../interop.h"
+#import "../utils.h"
+#import "run_autofill_command.h"
+
+void runAutofillCommand(void* context, NSDictionary *input) {
+  NSString *command = input[@"command"];
+  NSDictionary *params = input[@"params"];
+
+  if ([command isEqual:@"status"]) {
+    return status(context, params);
+  } else if ([command isEqual:@"sync"]) {
+    return runSync(context, params);
+  }
+
+  _return(context, _error([NSString stringWithFormat:@"Unknown command: %@", command]));
+}
+
diff --git a/apps/desktop/desktop_native/objc/src/native/interop.h b/apps/desktop/desktop_native/objc/src/native/interop.h
new file mode 100644
index 00000000000..584fe547a9d
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/interop.h
@@ -0,0 +1,47 @@
+#ifndef INTEROP_H
+#define INTEROP_H
+
+#import <Foundation/Foundation.h>
+
+// Tips for developing Objective-C code:
+// - Use the `NSLog` function to log messages to the system log
+//   - Example:
+//     NSLog(@"An example log: %@", someVariable);
+// - Use the `@try` and `@catch` directives to catch exceptions
+
+#if !__has_feature(objc_arc)
+  // Auto Reference Counting makes memory management easier for Objective-C objects
+  // Regular C objects still need to be managed manually
+  #error ARC must be enabled!
+#endif
+
+/// [Shared with Rust]
+/// Simple struct to hold a C-string and its length
+/// This is used to return strings created in Objective-C to Rust
+/// so that Rust can free the memory when it's done with the string
+struct ObjCString
+{
+  char *value;
+  size_t size;
+};
+
+/// [Defined in Rust]
+/// External function callable from Objective-C to return a string to Rust
+extern bool commandReturn(void *context, struct ObjCString output);
+
+/// [Callable from Rust]
+/// Frees the memory allocated for an ObjCString
+void freeObjCString(struct ObjCString *value);
+
+// --- Helper functions to convert between Objective-C and Rust types ---
+
+NSString *_success(NSDictionary *value);
+NSString *_error(NSString *error);
+NSString *_error_er(NSError *error);
+NSString *_error_ex(NSException *error);
+void _return(void *context, NSString *output);
+
+struct ObjCString nsStringToObjCString(NSString *string);
+NSString *cStringToNSString(char *string);
+
+#endif
diff --git a/apps/desktop/desktop_native/objc/src/native/interop.m b/apps/desktop/desktop_native/objc/src/native/interop.m
new file mode 100644
index 00000000000..dc41eb52d76
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/interop.m
@@ -0,0 +1,71 @@
+#import "interop.h"
+#import "utils.h"
+
+/// [Callable from Rust]
+/// Frees the memory allocated for an ObjCString
+void freeObjCString(struct ObjCString *value) {
+  free(value->value);
+}
+
+// --- Helper functions to convert between Objective-C and Rust types ---
+
+NSString *_success(NSDictionary *value) {
+  NSDictionary *wrapper = @{@"type": @"success", @"value": value};
+  NSError *jsonError = nil;
+  NSString *toReturn = serializeJson(wrapper, jsonError);
+
+  if (jsonError) {
+    // Manually format message since there seems to be an issue with the JSON serialization
+    return [NSString stringWithFormat:@"{\"type\": \"error\", \"error\": \"Error occurred while serializing error: %@\"}", jsonError];
+  }
+
+  return toReturn;
+}
+
+NSString *_error(NSString *error) {
+  NSDictionary *errorDictionary = @{@"type": @"error", @"error": error};
+  NSError *jsonError = nil;
+  NSString *toReturn = serializeJson(errorDictionary, jsonError);
+
+  if (jsonError) {
+    // Manually format message since there seems to be an issue with the JSON serialization
+    return [NSString stringWithFormat:@"{\"type\": \"error\", \"error\": \"Error occurred while serializing error: %@\"}", jsonError];
+  }
+
+  return toReturn;
+}
+
+NSString *_error_er(NSError *error) {
+  return _error([error localizedDescription]);
+}
+
+NSString *_error_ex(NSException *error) {
+  return _error([NSString stringWithFormat:@"%@ (%@): %@", error.name, error.reason, [error callStackSymbols]]);
+}
+
+void _return(void* context, NSString *output) {
+  if (!commandReturn(context, nsStringToObjCString(output))) {
+    NSLog(@"Error: Failed to return command output");
+    // NOTE: This will most likely crash the application
+    @throw [NSException exceptionWithName:@"CommandReturnError" reason:@"Failed to return command output" userInfo:nil];
+  }
+}
+
+/// Converts an NSString to an ObjCString struct
+struct ObjCString nsStringToObjCString(NSString* string) {
+  size_t size = [string lengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1;
+  char *value = malloc(size);
+  [string getCString:value maxLength:size encoding:NSUTF8StringEncoding];
+
+  struct ObjCString objCString;
+  objCString.value = value;
+  objCString.size = size;
+
+  return objCString;
+}
+
+/// Converts a C-string to an NSString
+NSString* cStringToNSString(char* string) {
+  return [[NSString alloc] initWithUTF8String:string];
+}
+
diff --git a/apps/desktop/desktop_native/objc/src/native/run_command.m b/apps/desktop/desktop_native/objc/src/native/run_command.m
new file mode 100644
index 00000000000..eb90a3340db
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/run_command.m
@@ -0,0 +1,39 @@
+#import <Foundation/Foundation.h>
+#import "autofill/run_autofill_command.h"
+#import "interop.h"
+#import "utils.h"
+
+void pickAndRunCommand(void* context, NSDictionary *input) {
+  NSString *namespace = input[@"namespace"];
+
+  if ([namespace isEqual:@"autofill"]) {
+    return runAutofillCommand(context, input);
+  }
+
+  _return(context, _error([NSString stringWithFormat:@"Unknown namespace: %@", namespace]));
+}
+
+/// [Callable from Rust]
+/// Runs a command with the given input JSON
+/// This function is called from Rust and is the entry point for running Objective-C code.
+/// It takes a JSON string as input, deserializes it, runs the command, and serializes the output.
+/// It also catches any exceptions that occur during the command execution.
+void runCommand(void *context, char* inputJson) {
+  @autoreleasepool {
+    @try {
+      NSString *inputString = cStringToNSString(inputJson);
+
+      NSError *error = nil;
+      NSDictionary *input = parseJson(inputString, error);
+      if (error) {
+        NSLog(@"Error occured while deserializing input params: %@", error);
+        return _return(context, _error([NSString stringWithFormat:@"Error occured while deserializing input params: %@", error]));
+      }
+
+      pickAndRunCommand(context, input);
+    } @catch (NSException *e) {
+      NSLog(@"Error occurred while running Objective-C command: %@", e);
+      _return(context, _error([NSString stringWithFormat:@"Error occurred while running Objective-C command: %@", e]));
+    }
+  }
+}
diff --git a/apps/desktop/desktop_native/objc/src/native/utils.h b/apps/desktop/desktop_native/objc/src/native/utils.h
new file mode 100644
index 00000000000..50fc991d15f
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/utils.h
@@ -0,0 +1,11 @@
+#ifndef UTILS_H
+#define UTILS_H
+
+#import <Foundation/Foundation.h>
+
+NSDictionary *parseJson(NSString *jsonString, NSError *error);
+NSString *serializeJson(NSDictionary *dictionary, NSError *error);
+
+NSData *decodeBase64URL(NSString *base64URLString);
+
+#endif
diff --git a/apps/desktop/desktop_native/objc/src/native/utils.m b/apps/desktop/desktop_native/objc/src/native/utils.m
new file mode 100644
index 00000000000..040c723a8ac
--- /dev/null
+++ b/apps/desktop/desktop_native/objc/src/native/utils.m
@@ -0,0 +1,28 @@
+#import "utils.h"
+
+NSDictionary *parseJson(NSString *jsonString, NSError *error) {
+  NSData *data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
+  NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
+  if (error) {
+    return nil;
+  }
+  return json;
+}
+
+NSString *serializeJson(NSDictionary *dictionary, NSError *error) {
+  NSData *data = [NSJSONSerialization dataWithJSONObject:dictionary options:0 error:&error];
+  if (error) {
+    return nil;
+  }
+  return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+}
+
+NSData *decodeBase64URL(NSString *base64URLString) {
+  NSString *base64String = [base64URLString stringByReplacingOccurrencesOfString:@"-" withString:@"+"];
+  base64String = [base64String stringByReplacingOccurrencesOfString:@"_" withString:@"/"];
+
+  NSData *nsdataFromBase64String = [[NSData alloc]
+    initWithBase64EncodedString:base64String options:0];
+
+  return nsdataFromBase64String;
+}
diff --git a/apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift b/apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
index d5c5cabeee4..4d03bf97e6c 100644
--- a/apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
+++ b/apps/desktop/macos/autofill-extension/CredentialProviderViewController.swift
@@ -19,17 +19,18 @@ class CredentialProviderViewController: ASCredentialProviderViewController {
      If using the credential would require showing custom UI for authenticating the user, cancel
      the request with error code ASExtensionError.userInteractionRequired.
 
-    override func provideCredentialWithoutUserInteraction(for credentialIdentity: ASPasswordCredentialIdentity) {
-        let databaseIsUnlocked = true
-        if (databaseIsUnlocked) {
-            let passwordCredential = ASPasswordCredential(user: "j_appleseed", password: "apple1234")
-            self.extensionContext.completeRequest(withSelectedCredential: passwordCredential, completionHandler: nil)
-        } else {
-            self.extensionContext.cancelRequest(withError: NSError(domain: ASExtensionErrorDomain, code:ASExtensionError.userInteractionRequired.rawValue))
-        }
-    }
-    */
+     */
 
+    override func provideCredentialWithoutUserInteraction(for credentialIdentity: ASPasswordCredentialIdentity) {
+//        let databaseIsUnlocked = true
+//        if (databaseIsUnlocked) {
+        let passwordCredential = ASPasswordCredential(user: credentialIdentity.user, password: "example1234")
+            self.extensionContext.completeRequest(withSelectedCredential: passwordCredential, completionHandler: nil)
+//        } else {
+//            self.extensionContext.cancelRequest(withError: NSError(domain: ASExtensionErrorDomain, code:ASExtensionError.userInteractionRequired.rawValue))
+//        }
+    }
+    
     /*
      Implement this method if provideCredentialWithoutUserInteraction(for:) can fail with
      ASExtensionError.userInteractionRequired. In this case, the system may present your extension's
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 54feb7df9e6..eab9a7d7119 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -48,6 +48,7 @@
     "dist:mac": "npm run build && npm run pack:mac",
     "dist:mac:mas": "npm run build && npm run pack:mac:mas",
     "dist:mac:masdev": "npm run build && npm run pack:mac:masdev",
+    "dist:mac:masdev:with-extension": "npm run build && npm run pack:mac:masdev:with-extension",
     "dist:win": "npm run build && npm run pack:win",
     "dist:win:ci": "npm run build && npm run pack:win:ci",
     "publish:lin": "npm run build && npm run clean:dist && electron-builder --linux --x64 -p always",
diff --git a/apps/desktop/scripts/build-macos-extension.js b/apps/desktop/scripts/build-macos-extension.js
index 3aa43fb6785..4cb643c34d4 100644
--- a/apps/desktop/scripts/build-macos-extension.js
+++ b/apps/desktop/scripts/build-macos-extension.js
@@ -28,8 +28,9 @@ async function buildMacOs() {
     "-alltargets",
     "-configuration",
     "Release",
-    "-xcconfig",
-    paths.macOsConfig,
+    // Uncomment when signing is fixed
+    // "-xcconfig",
+    // paths.macOsConfig,
   ]);
   stdOutProc(proc);
   await new Promise((resolve, reject) =>
diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts
index 0068a03d685..de80f95593a 100644
--- a/apps/desktop/src/app/services/init.service.ts
+++ b/apps/desktop/src/app/services/init.service.ts
@@ -20,6 +20,7 @@ import { VaultTimeoutService } from "@bitwarden/common/services/vault-timeout/va
 import { UserId } from "@bitwarden/common/types/guid";
 import { KeyService as KeyServiceAbstraction } from "@bitwarden/key-management";
 
+import { DesktopAutofillService } from "../../autofill/services/desktop-autofill.service";
 import { I18nRendererService } from "../../platform/services/i18n.renderer.service";
 import { SshAgentService } from "../../platform/services/ssh-agent.service";
 import { VersionService } from "../../platform/services/version.service";
@@ -45,6 +46,7 @@ export class InitService {
     private accountService: AccountService,
     private versionService: VersionService,
     private sshAgentService: SshAgentService,
+    private autofillService: DesktopAutofillService,
     @Inject(DOCUMENT) private document: Document,
   ) {}
 
@@ -82,6 +84,8 @@ export class InitService {
 
       const containerService = new ContainerService(this.keyService, this.encryptService);
       containerService.attachToGlobal(this.win);
+
+      await this.autofillService.init();
     };
   }
 }
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index 040102d0395..8ca24c0040c 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -48,6 +48,7 @@ import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/s
 import { ClientType } from "@bitwarden/common/enums";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
 import { DefaultProcessReloadService } from "@bitwarden/common/key-management/services/default-process-reload.service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
@@ -91,6 +92,7 @@ import {
 import { DesktopLoginApprovalComponentService } from "../../auth/login/desktop-login-approval-component.service";
 import { DesktopLoginComponentService } from "../../auth/login/desktop-login-component.service";
 import { DesktopAutofillSettingsService } from "../../autofill/services/desktop-autofill-settings.service";
+import { DesktopAutofillService } from "../../autofill/services/desktop-autofill.service";
 import { ElectronBiometricsService } from "../../key-management/biometrics/electron-biometrics.service";
 import { flagEnabled } from "../../platform/flags";
 import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
@@ -301,6 +303,10 @@ const safeProviders: SafeProvider[] = [
     provide: DesktopAutofillSettingsService,
     deps: [StateProvider],
   }),
+  safeProvider({
+    provide: DesktopAutofillService,
+    deps: [LogService, CipherServiceAbstraction, ConfigService],
+  }),
   safeProvider({
     provide: NativeMessagingManifestService,
     useClass: NativeMessagingManifestService,
diff --git a/apps/desktop/src/autofill/preload.ts b/apps/desktop/src/autofill/preload.ts
new file mode 100644
index 00000000000..9ce5e1319fd
--- /dev/null
+++ b/apps/desktop/src/autofill/preload.ts
@@ -0,0 +1,9 @@
+import { ipcRenderer } from "electron";
+
+import { Command } from "../platform/main/autofill/command";
+import { RunCommandParams, RunCommandResult } from "../platform/main/autofill/native-autofill.main";
+
+export default {
+  runCommand: <C extends Command>(params: RunCommandParams<C>): Promise<RunCommandResult<C>> =>
+    ipcRenderer.invoke("autofill.runCommand", params),
+};
diff --git a/apps/desktop/src/autofill/services/desktop-autofill.service.ts b/apps/desktop/src/autofill/services/desktop-autofill.service.ts
new file mode 100644
index 00000000000..8c5dd597850
--- /dev/null
+++ b/apps/desktop/src/autofill/services/desktop-autofill.service.ts
@@ -0,0 +1,121 @@
+import { Injectable, OnDestroy } from "@angular/core";
+import { EMPTY, Subject, distinctUntilChanged, mergeMap, switchMap, takeUntil } from "rxjs";
+
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { UriMatchStrategy } from "@bitwarden/common/models/domain/domain-service";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { getCredentialsForAutofill } from "@bitwarden/common/platform/services/fido2/fido2-autofill-utils";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
+import { CipherType } from "@bitwarden/common/vault/enums";
+import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
+
+import { NativeAutofillStatusCommand } from "../../platform/main/autofill/status.command";
+import {
+  NativeAutofillFido2Credential,
+  NativeAutofillPasswordCredential,
+  NativeAutofillSyncCommand,
+} from "../../platform/main/autofill/sync.command";
+
+@Injectable()
+export class DesktopAutofillService implements OnDestroy {
+  private destroy$ = new Subject<void>();
+
+  constructor(
+    private logService: LogService,
+    private cipherService: CipherService,
+    private configService: ConfigService,
+  ) {}
+
+  async init() {
+    this.configService
+      .getFeatureFlag$(FeatureFlag.MacOsNativeCredentialSync)
+      .pipe(
+        distinctUntilChanged(),
+        switchMap((enabled) => {
+          if (!enabled) {
+            return EMPTY;
+          }
+
+          return this.cipherService.cipherViews$;
+        }),
+        // TODO: This will unset all the autofill credentials on the OS
+        // when the account locks. We should instead explicilty clear the credentials
+        // when the user logs out. Maybe by subscribing to the encrypted ciphers observable instead.
+        mergeMap((cipherViewMap) => this.sync(Object.values(cipherViewMap ?? []))),
+        takeUntil(this.destroy$),
+      )
+      .subscribe();
+  }
+
+  /** Give metadata about all available credentials in the users vault */
+  async sync(cipherViews: CipherView[]) {
+    const status = await this.status();
+    if (status.type === "error") {
+      return this.logService.error("Error getting autofill status", status.error);
+    }
+
+    if (!status.value.state.enabled) {
+      // Autofill is disabled
+      return;
+    }
+
+    let fido2Credentials: NativeAutofillFido2Credential[];
+    let passwordCredentials: NativeAutofillPasswordCredential[];
+
+    if (status.value.support.password) {
+      passwordCredentials = cipherViews
+        .filter(
+          (cipher) =>
+            cipher.type === CipherType.Login &&
+            cipher.login.uris?.length > 0 &&
+            cipher.login.uris.some((uri) => uri.match !== UriMatchStrategy.Never) &&
+            cipher.login.uris.some((uri) => !Utils.isNullOrWhitespace(uri.uri)) &&
+            !Utils.isNullOrWhitespace(cipher.login.username),
+        )
+        .map((cipher) => ({
+          type: "password",
+          cipherId: cipher.id,
+          uri: cipher.login.uris.find((uri) => uri.match !== UriMatchStrategy.Never).uri,
+          username: cipher.login.username,
+        }));
+    }
+
+    if (status.value.support.fido2) {
+      fido2Credentials = (await getCredentialsForAutofill(cipherViews)).map((credential) => ({
+        type: "fido2",
+        ...credential,
+      }));
+    }
+
+    const syncResult = await ipc.autofill.runCommand<NativeAutofillSyncCommand>({
+      namespace: "autofill",
+      command: "sync",
+      params: {
+        credentials: [...fido2Credentials, ...passwordCredentials],
+      },
+    });
+
+    if (syncResult.type === "error") {
+      return this.logService.error("Error syncing autofill credentials", syncResult.error);
+    }
+
+    this.logService.debug(`Synced ${syncResult.value.added} autofill credentials`);
+  }
+
+  /** Get autofill status from OS */
+  private status() {
+    // TODO: Investigate why this type needs to be explicitly set
+    return ipc.autofill.runCommand<NativeAutofillStatusCommand>({
+      namespace: "autofill",
+      command: "status",
+      params: {},
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+}
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index bbb5c23513e..5ae72150ff8 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -35,6 +35,7 @@ import { PowerMonitorMain } from "./main/power-monitor.main";
 import { TrayMain } from "./main/tray.main";
 import { UpdaterMain } from "./main/updater.main";
 import { WindowMain } from "./main/window.main";
+import { NativeAutofillMain } from "./platform/main/autofill/native-autofill.main";
 import { ClipboardMain } from "./platform/main/clipboard.main";
 import { DesktopCredentialStorageListener } from "./platform/main/desktop-credential-storage-listener";
 import { MainCryptoFunctionService } from "./platform/main/main-crypto-function.service";
@@ -72,6 +73,7 @@ export class Main {
   biometricsService: DesktopBiometricsService;
   nativeMessagingMain: NativeMessagingMain;
   clipboardMain: ClipboardMain;
+  nativeAutofillMain: NativeAutofillMain;
   desktopAutofillSettingsService: DesktopAutofillSettingsService;
   versionMain: VersionMain;
   sshAgentService: MainSshAgentService;
@@ -256,6 +258,9 @@ export class Main {
 
     new EphemeralValueStorageService();
     new SSOLocalhostCallbackService(this.environmentService, this.messagingService);
+
+    this.nativeAutofillMain = new NativeAutofillMain(this.logService);
+    void this.nativeAutofillMain.init();
   }
 
   bootstrap() {
diff --git a/apps/desktop/src/platform/main/autofill/command.ts b/apps/desktop/src/platform/main/autofill/command.ts
new file mode 100644
index 00000000000..a8b5548052b
--- /dev/null
+++ b/apps/desktop/src/platform/main/autofill/command.ts
@@ -0,0 +1,23 @@
+import { NativeAutofillStatusCommand } from "./status.command";
+import { NativeAutofillSyncCommand } from "./sync.command";
+
+export type CommandDefinition = {
+  namespace: string;
+  name: string;
+  input: Record<string, unknown>;
+  output: Record<string, unknown>;
+};
+
+export type CommandOutput<SuccessOutput> =
+  | {
+      type: "error";
+      error: string;
+    }
+  | { type: "success"; value: SuccessOutput };
+
+export type IpcCommandInvoker<C extends CommandDefinition> = (
+  params: C["input"],
+) => Promise<CommandOutput<C["output"]>>;
+
+/** A list of all available commands */
+export type Command = NativeAutofillSyncCommand | NativeAutofillStatusCommand;
diff --git a/apps/desktop/src/platform/main/autofill/native-autofill.main.ts b/apps/desktop/src/platform/main/autofill/native-autofill.main.ts
new file mode 100644
index 00000000000..b4b7895e8ac
--- /dev/null
+++ b/apps/desktop/src/platform/main/autofill/native-autofill.main.ts
@@ -0,0 +1,53 @@
+import { ipcMain } from "electron";
+
+import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
+import { autofill } from "@bitwarden/desktop-napi";
+
+import { CommandDefinition } from "./command";
+
+export type RunCommandParams<C extends CommandDefinition> = {
+  namespace: C["namespace"];
+  command: C["name"];
+  params: C["input"];
+};
+
+export type RunCommandResult<C extends CommandDefinition> = C["output"];
+
+export class NativeAutofillMain {
+  constructor(private logService: LogService) {}
+
+  async init() {
+    ipcMain.handle(
+      "autofill.runCommand",
+      <C extends CommandDefinition>(
+        _event: any,
+        params: RunCommandParams<C>,
+      ): Promise<RunCommandResult<C>> => {
+        return this.runCommand(params);
+      },
+    );
+  }
+
+  private async runCommand<C extends CommandDefinition>(
+    command: RunCommandParams<C>,
+  ): Promise<RunCommandResult<C>> {
+    try {
+      const result = await autofill.runCommand(JSON.stringify(command));
+      const parsed = JSON.parse(result) as RunCommandResult<C>;
+
+      if (parsed.type === "error") {
+        this.logService.error(`Error running autofill command '${command.command}':`, parsed.error);
+      }
+
+      return parsed;
+    } catch (e) {
+      this.logService.error(`Error running autofill command '${command.command}':`, e);
+
+      if (e instanceof Error) {
+        return { type: "error", error: e.stack ?? String(e) } as RunCommandResult<C>;
+      }
+
+      return { type: "error", error: String(e) } as RunCommandResult<C>;
+    }
+  }
+}
diff --git a/apps/desktop/src/platform/main/autofill/status.command.ts b/apps/desktop/src/platform/main/autofill/status.command.ts
new file mode 100644
index 00000000000..b6c0943fa68
--- /dev/null
+++ b/apps/desktop/src/platform/main/autofill/status.command.ts
@@ -0,0 +1,20 @@
+import { CommandDefinition, CommandOutput } from "./command";
+
+export interface NativeAutofillStatusCommand extends CommandDefinition {
+  name: "status";
+  input: NativeAutofillStatusParams;
+  output: NativeAutofillStatusResult;
+}
+
+export type NativeAutofillStatusParams = Record<string, never>;
+
+export type NativeAutofillStatusResult = CommandOutput<{
+  support: {
+    fido2: boolean;
+    password: boolean;
+    incrementalUpdates: boolean;
+  };
+  state: {
+    enabled: boolean;
+  };
+}>;
diff --git a/apps/desktop/src/platform/main/autofill/sync.command.ts b/apps/desktop/src/platform/main/autofill/sync.command.ts
new file mode 100644
index 00000000000..dc3b12383ef
--- /dev/null
+++ b/apps/desktop/src/platform/main/autofill/sync.command.ts
@@ -0,0 +1,37 @@
+import { CommandDefinition, CommandOutput } from "./command";
+
+export interface NativeAutofillSyncCommand extends CommandDefinition {
+  name: "sync";
+  input: NativeAutofillSyncParams;
+  output: NativeAutofillSyncResult;
+}
+
+export type NativeAutofillSyncParams = {
+  credentials: NativeAutofillCredential[];
+};
+
+export type NativeAutofillCredential =
+  | NativeAutofillFido2Credential
+  | NativeAutofillPasswordCredential;
+
+export type NativeAutofillFido2Credential = {
+  type: "fido2";
+  cipherId: string;
+  rpId: string;
+  userName: string;
+  /** Should be Base64URL-encoded binary data */
+  credentialId: string;
+  /** Should be Base64URL-encoded binary data */
+  userHandle: string;
+};
+
+export type NativeAutofillPasswordCredential = {
+  type: "password";
+  cipherId: string;
+  uri: string;
+  username: string;
+};
+
+export type NativeAutofillSyncResult = CommandOutput<{
+  added: number;
+}>;
diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts
index 57b20490a4f..0fb2db37518 100644
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -1,6 +1,7 @@
 import { contextBridge } from "electron";
 
 import auth from "./auth/preload";
+import autofill from "./autofill/preload";
 import keyManagement from "./key-management/preload";
 import platform from "./platform/preload";
 
@@ -17,6 +18,7 @@ import platform from "./platform/preload";
 // Each team owns a subspace of the `ipc` global variable in the renderer.
 export const ipc = {
   auth,
+  autofill,
   platform,
   keyManagement,
 };
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 66d6b155e90..f79ebf8aa55 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -38,6 +38,7 @@ export enum FeatureFlag {
   NewDeviceVerificationTemporaryDismiss = "new-device-temporary-dismiss",
   NewDeviceVerificationPermanentDismiss = "new-device-permanent-dismiss",
   DisableFreeFamiliesSponsorship = "PM-12274-disable-free-families-sponsorship",
+  MacOsNativeCredentialSync = "macos-native-credential-sync",
   PM11360RemoveProviderExportPermission = "pm-11360-remove-provider-export-permission",
 }
 
@@ -87,6 +88,7 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.NewDeviceVerificationTemporaryDismiss]: FALSE,
   [FeatureFlag.NewDeviceVerificationPermanentDismiss]: FALSE,
   [FeatureFlag.DisableFreeFamiliesSponsorship]: FALSE,
+  [FeatureFlag.MacOsNativeCredentialSync]: FALSE,
   [FeatureFlag.PM11360RemoveProviderExportPermission]: FALSE,
 } satisfies Record<FeatureFlag, AllowedFeatureFlagTypes>;
 
diff --git a/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts b/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
new file mode 100644
index 00000000000..7ef705b95f9
--- /dev/null
+++ b/libs/common/src/platform/services/fido2/fido2-autofill-utils.ts
@@ -0,0 +1,26 @@
+// TODO: Add tests for this method
+
+import { CipherType } from "../../../vault/enums";
+import { CipherView } from "../../../vault/models/view/cipher.view";
+import { Fido2CredentialAutofillView } from "../../../vault/models/view/fido2-credential-autofill.view";
+
+// TODO: Move into Fido2AuthenticatorService
+export async function getCredentialsForAutofill(
+  ciphers: CipherView[],
+): Promise<Fido2CredentialAutofillView[]> {
+  return ciphers
+    .filter(
+      (cipher) =>
+        !cipher.isDeleted && cipher.type === CipherType.Login && cipher.login.hasFido2Credentials,
+    )
+    .map((cipher) => {
+      const credential = cipher.login.fido2Credentials[0];
+      return {
+        cipherId: cipher.id,
+        credentialId: credential.credentialId,
+        rpId: credential.rpId,
+        userHandle: credential.userHandle,
+        userName: credential.userName,
+      };
+    });
+}
diff --git a/libs/common/src/vault/models/view/fido2-credential-autofill.view.ts b/libs/common/src/vault/models/view/fido2-credential-autofill.view.ts
new file mode 100644
index 00000000000..b120f27b774
--- /dev/null
+++ b/libs/common/src/vault/models/view/fido2-credential-autofill.view.ts
@@ -0,0 +1,7 @@
+export class Fido2CredentialAutofillView {
+  cipherId: string;
+  credentialId: string;
+  rpId: string;
+  userHandle: string;
+  userName: string;
+}

From 7e2456224d0fab7b1c975e555523aa055d04bb7a Mon Sep 17 00:00:00 2001
From: Opeyemi <Alaoopeyemi101@gmail.com>
Date: Fri, 6 Dec 2024 16:52:31 +0000
Subject: [PATCH 37/46] [BRE-470] - Update Renovate Conf for BRE team (#12274)

---
 .github/renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 9295ea5d61e..7f3e7464fe3 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -10,7 +10,7 @@
     },
     {
       "matchManagers": ["github-actions"],
-      "commitMessagePrefix": "[deps] DevOps:"
+      "commitMessagePrefix": "[deps] BRE:"
     },
     {
       "matchManagers": ["cargo"],

From 9fcc4f0543fce95c90b10616fff13e3a273d0457 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Fri, 6 Dec 2024 12:43:17 -0500
Subject: [PATCH 38/46] PM-13659 - 2FA Timeout Log All the things (#12275)

---
 .../auth/components/two-factor.component.ts   | 10 ++++++
 .../abstractions/login-strategy.service.ts    |  2 ++
 .../login-strategy.service.ts                 | 36 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/libs/angular/src/auth/components/two-factor.component.ts b/libs/angular/src/auth/components/two-factor.component.ts
index 33269e28e96..f484ccd1e8d 100644
--- a/libs/angular/src/auth/components/two-factor.component.ts
+++ b/libs/angular/src/auth/components/two-factor.component.ts
@@ -102,10 +102,20 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
     super(environmentService, i18nService, platformUtilsService, toastService);
     this.webAuthnSupported = this.platformUtilsService.supportsWebAuthn(win);
 
+    this.logService.info(
+      "Subscribing to timeout on LoginStrategyService with service id: " +
+        this.loginStrategyService.id,
+    );
+
     // Add subscription to twoFactorTimeout$ and navigate to twoFactorTimeoutRoute if expired
     this.loginStrategyService.twoFactorTimeout$
       .pipe(takeUntilDestroyed())
       .subscribe(async (expired) => {
+        this.logService.info(
+          "Received emission from  LoginStrategyService.twoFactorTimeout$ with service id: " +
+            this.loginStrategyService.id,
+        );
+
         if (!expired) {
           return;
         }
diff --git a/libs/auth/src/common/abstractions/login-strategy.service.ts b/libs/auth/src/common/abstractions/login-strategy.service.ts
index e86cd6b0b0d..89e8491b27e 100644
--- a/libs/auth/src/common/abstractions/login-strategy.service.ts
+++ b/libs/auth/src/common/abstractions/login-strategy.service.ts
@@ -14,6 +14,8 @@ import {
 } from "../models/domain/login-credentials";
 
 export abstract class LoginStrategyServiceAbstraction {
+  id: string;
+
   /**
    * The current strategy being used to authenticate.
    * Emits null if the session has timed out.
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index 1d5001f1f06..0c857cf7cc8 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -7,6 +7,7 @@ import {
   shareReplay,
   Subscription,
   BehaviorSubject,
+  tap,
 } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -31,6 +32,7 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
+import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { TaskSchedulerService, ScheduledTaskNames } from "@bitwarden/common/platform/scheduling";
 import { GlobalState, GlobalStateProvider } from "@bitwarden/common/platform/state";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/src/auth/abstractions/device-trust.service.abstraction";
@@ -81,7 +83,36 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
   private authRequestPushNotificationState: GlobalState<string>;
   private twoFactorTimeoutSubject = new BehaviorSubject<boolean>(false);
 
-  twoFactorTimeout$: Observable<boolean> = this.twoFactorTimeoutSubject.asObservable();
+  twoFactorTimeout$: Observable<boolean> = this.twoFactorTimeoutSubject.asObservable().pipe(
+    // line 87 is the tap?
+    tap({
+      next: (value) => {
+        this.logService.info(
+          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} emmitted value: ${value}`,
+        );
+      },
+      error: (error: unknown) => {
+        this.logService.error(
+          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} errored with error: ${JSON.stringify(error)}`,
+        );
+      },
+      finalize: () => {
+        this.logService.info(
+          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} finalized`,
+        );
+      },
+      complete: () => {
+        this.logService.info(
+          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} completed`,
+        );
+      },
+      subscribe: () => {
+        this.logService.info(
+          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} subscribed`,
+        );
+      },
+    }),
+  );
 
   private loginStrategy$: Observable<
     | UserApiLoginStrategy
@@ -94,6 +125,8 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
 
   currentAuthType$: Observable<AuthenticationType | null>;
 
+  id: string = Utils.newGuid();
+
   constructor(
     protected accountService: AccountService,
     protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
@@ -131,6 +164,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     this.taskSchedulerService.registerTaskHandler(
       ScheduledTaskNames.loginStrategySessionTimeout,
       async () => {
+        this.logService.info("Timeout executing for LoginStrategyService with id: " + this.id);
         this.authnSessionTimeoutExecutor(async () => {
           this.twoFactorTimeoutSubject.next(true);
           try {

From 597e3855619468ec662323c9eefcd527cbbaa22a Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Fri, 6 Dec 2024 10:48:58 -0800
Subject: [PATCH 39/46] update height of iframe on web (#12265)

---
 apps/web/src/scss/plugins.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/scss/plugins.scss b/apps/web/src/scss/plugins.scss
index f4aa428532c..5fbd32ac4ee 100644
--- a/apps/web/src/scss/plugins.scss
+++ b/apps/web/src/scss/plugins.scss
@@ -12,7 +12,7 @@
 }
 
 #web-authn-frame {
-  height: 290px;
+  height: 315px;
   @include themify($themes) {
     background: themed("imgLoading") 0 0 no-repeat;
   }

From d295825ff11943ba348415b3d90eeec8f8df8a64 Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:29:35 -0800
Subject: [PATCH 40/46] [CL-511] - add variant to links within banners (#12090)

* add variant to links within banners

* add fix prop
---
 .../payment-method/organization-payment-method.component.html   | 2 +-
 apps/web/src/app/billing/shared/payment-method.component.html   | 2 +-
 .../individual-vault/vault-banners/vault-banners.component.html | 2 +-
 apps/web/src/app/vault/org-vault/vault.component.html           | 2 +-
 .../src/app/secrets-manager/overview/overview.component.html    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
index 7a6e8558bae..e7bc9cac01e 100644
--- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
+++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.html
@@ -9,7 +9,7 @@
   {{ freeTrialData.message }}
   <a
     bitLink
-    linkType="contrast"
+    linkType="secondary"
     (click)="changePayment()"
     class="tw-cursor-pointer"
     rel="noreferrer noopener"
diff --git a/apps/web/src/app/billing/shared/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html
index 1d4675847a1..e6537786d10 100644
--- a/apps/web/src/app/billing/shared/payment-method.component.html
+++ b/apps/web/src/app/billing/shared/payment-method.component.html
@@ -9,7 +9,7 @@
   {{ freeTrialData?.message }}
   <a
     bitLink
-    linkType="contrast"
+    linkType="secondary"
     (click)="changePayment()"
     class="tw-cursor-pointer"
     rel="noreferrer noopener"
diff --git a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html
index f3ecead886b..abb4d19c9d3 100644
--- a/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-banners/vault-banners.component.html
@@ -9,7 +9,7 @@
   {{ freeTrialMessage(organization) }}
   <a
     bitLink
-    linkType="contrast"
+    linkType="secondary"
     (click)="navigateToPaymentMethod(organization?.organizationId)"
     rel="noreferrer noopener"
     class="tw-cursor-pointer"
diff --git a/apps/web/src/app/vault/org-vault/vault.component.html b/apps/web/src/app/vault/org-vault/vault.component.html
index 9e9264e77cd..400775a9c28 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.html
+++ b/apps/web/src/app/vault/org-vault/vault.component.html
@@ -10,7 +10,7 @@
     {{ freeTrial.message }}
     <a
       bitLink
-      linkType="contrast"
+      linkType="secondary"
       (click)="navigateToPaymentMethod()"
       class="tw-cursor-pointer"
       rel="noreferrer noopener"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
index 31746e7601c..482ccaf0454 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.html
@@ -10,7 +10,7 @@
     {{ freeTrial.message }}
     <a
       bitLink
-      linkType="contrast"
+      linkType="secondary"
       class="tw-cursor-pointer"
       (click)="navigateToPaymentMethod()"
       rel="noreferrer noopener"

From 69800d01ab8889f6604e033efdc0db9a73986aa2 Mon Sep 17 00:00:00 2001
From: Alec Rippberger <127791530+alec-livefront@users.noreply.github.com>
Date: Fri, 6 Dec 2024 13:42:32 -0600
Subject: [PATCH 41/46] revert: [PR-13659] remove 2FA timeout logging and fix
 attempts

This reverts two previous commits:
- PM-13659 - 2FA Timeout Log All the things (#12275)
- Auth/PM-13659 - 2FA Timeout - Attempted Fix (#12263)
---
 .../service-container/service-container.ts    |  7 ---
 .../auth/components/two-factor.component.ts   | 10 ----
 libs/angular/src/services/injection-tokens.ts |  6 +--
 .../src/services/jslib-services.module.ts     |  9 +---
 .../abstractions/login-strategy.service.ts    |  2 -
 .../login-strategy.service.ts                 | 53 +++----------------
 6 files changed, 9 insertions(+), 78 deletions(-)

diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts
index ce944db78ff..21e8f9f2082 100644
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -17,7 +17,6 @@ import {
   PinService,
   PinServiceAbstraction,
   UserDecryptionOptionsService,
-  Executor,
 } from "@bitwarden/auth/common";
 import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service";
 import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service";
@@ -615,11 +614,6 @@ export class ServiceContainer {
       this.configService,
     );
 
-    // Execute any authn session timeout logic without any wrapping logic.
-    // An executor is required to ensure the logic is executed in an Angular context when it
-    // it is available.
-    const authnSessionTimeoutExecutor: Executor = (fn) => fn();
-
     this.loginStrategyService = new LoginStrategyService(
       this.accountService,
       this.masterPasswordService,
@@ -646,7 +640,6 @@ export class ServiceContainer {
       this.vaultTimeoutSettingsService,
       this.kdfConfigService,
       this.taskSchedulerService,
-      authnSessionTimeoutExecutor,
     );
 
     // FIXME: CLI does not support autofill
diff --git a/libs/angular/src/auth/components/two-factor.component.ts b/libs/angular/src/auth/components/two-factor.component.ts
index f484ccd1e8d..33269e28e96 100644
--- a/libs/angular/src/auth/components/two-factor.component.ts
+++ b/libs/angular/src/auth/components/two-factor.component.ts
@@ -102,20 +102,10 @@ export class TwoFactorComponent extends CaptchaProtectedComponent implements OnI
     super(environmentService, i18nService, platformUtilsService, toastService);
     this.webAuthnSupported = this.platformUtilsService.supportsWebAuthn(win);
 
-    this.logService.info(
-      "Subscribing to timeout on LoginStrategyService with service id: " +
-        this.loginStrategyService.id,
-    );
-
     // Add subscription to twoFactorTimeout$ and navigate to twoFactorTimeoutRoute if expired
     this.loginStrategyService.twoFactorTimeout$
       .pipe(takeUntilDestroyed())
       .subscribe(async (expired) => {
-        this.logService.info(
-          "Received emission from  LoginStrategyService.twoFactorTimeout$ with service id: " +
-            this.loginStrategyService.id,
-        );
-
         if (!expired) {
           return;
         }
diff --git a/libs/angular/src/services/injection-tokens.ts b/libs/angular/src/services/injection-tokens.ts
index 69a1ed3f613..86c5642a0c4 100644
--- a/libs/angular/src/services/injection-tokens.ts
+++ b/libs/angular/src/services/injection-tokens.ts
@@ -1,7 +1,7 @@
 import { InjectionToken } from "@angular/core";
 import { Observable, Subject } from "rxjs";
 
-import { Executor, LogoutReason } from "@bitwarden/auth/common";
+import { LogoutReason } from "@bitwarden/auth/common";
 import { ClientType } from "@bitwarden/common/enums";
 import { RegionConfig } from "@bitwarden/common/platform/abstractions/environment.service";
 import {
@@ -68,7 +68,3 @@ export const REFRESH_ACCESS_TOKEN_ERROR_CALLBACK = new SafeInjectionToken<() =>
 export const ENV_ADDITIONAL_REGIONS = new SafeInjectionToken<RegionConfig[]>(
   "ENV_ADDITIONAL_REGIONS",
 );
-
-export const AUTHN_SESSION_TIMEOUT_EXECUTOR = new SafeInjectionToken<Executor>(
-  "AuthnSessionTimeoutExecutor",
-);
diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts
index 8637e26a2b2..a43f1fa07a8 100644
--- a/libs/angular/src/services/jslib-services.module.ts
+++ b/libs/angular/src/services/jslib-services.module.ts
@@ -1,4 +1,4 @@
-import { ErrorHandler, LOCALE_ID, NgModule, NgZone } from "@angular/core";
+import { ErrorHandler, LOCALE_ID, NgModule } from "@angular/core";
 import { Subject } from "rxjs";
 
 import {
@@ -319,7 +319,6 @@ import {
   CLIENT_TYPE,
   REFRESH_ACCESS_TOKEN_ERROR_CALLBACK,
   ENV_ADDITIONAL_REGIONS,
-  AUTHN_SESSION_TIMEOUT_EXECUTOR,
 } from "./injection-tokens";
 import { ModalService } from "./modal.service";
 
@@ -412,11 +411,6 @@ const safeProviders: SafeProvider[] = [
       TokenServiceAbstraction,
     ],
   }),
-  safeProvider({
-    provide: AUTHN_SESSION_TIMEOUT_EXECUTOR,
-    useFactory: (ngZone: NgZone) => (fn: () => void) => ngZone.run(fn),
-    deps: [NgZone],
-  }),
   safeProvider({
     provide: LoginStrategyServiceAbstraction,
     useClass: LoginStrategyService,
@@ -446,7 +440,6 @@ const safeProviders: SafeProvider[] = [
       VaultTimeoutSettingsServiceAbstraction,
       KdfConfigService,
       TaskSchedulerService,
-      AUTHN_SESSION_TIMEOUT_EXECUTOR,
     ],
   }),
   safeProvider({
diff --git a/libs/auth/src/common/abstractions/login-strategy.service.ts b/libs/auth/src/common/abstractions/login-strategy.service.ts
index 89e8491b27e..e86cd6b0b0d 100644
--- a/libs/auth/src/common/abstractions/login-strategy.service.ts
+++ b/libs/auth/src/common/abstractions/login-strategy.service.ts
@@ -14,8 +14,6 @@ import {
 } from "../models/domain/login-credentials";
 
 export abstract class LoginStrategyServiceAbstraction {
-  id: string;
-
   /**
    * The current strategy being used to authenticate.
    * Emits null if the session has timed out.
diff --git a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
index 0c857cf7cc8..99e3c057e11 100644
--- a/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
+++ b/libs/auth/src/common/services/login-strategies/login-strategy.service.ts
@@ -7,7 +7,6 @@ import {
   shareReplay,
   Subscription,
   BehaviorSubject,
-  tap,
 } from "rxjs";
 
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -32,7 +31,6 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
-import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { TaskSchedulerService, ScheduledTaskNames } from "@bitwarden/common/platform/scheduling";
 import { GlobalState, GlobalStateProvider } from "@bitwarden/common/platform/state";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/src/auth/abstractions/device-trust.service.abstraction";
@@ -73,8 +71,6 @@ import {
 
 const sessionTimeoutLength = 5 * 60 * 1000; // 5 minutes
 
-export type Executor = (fn: () => void) => void;
-
 export class LoginStrategyService implements LoginStrategyServiceAbstraction {
   private sessionTimeoutSubscription: Subscription;
   private currentAuthnTypeState: GlobalState<AuthenticationType | null>;
@@ -83,36 +79,7 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
   private authRequestPushNotificationState: GlobalState<string>;
   private twoFactorTimeoutSubject = new BehaviorSubject<boolean>(false);
 
-  twoFactorTimeout$: Observable<boolean> = this.twoFactorTimeoutSubject.asObservable().pipe(
-    // line 87 is the tap?
-    tap({
-      next: (value) => {
-        this.logService.info(
-          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} emmitted value: ${value}`,
-        );
-      },
-      error: (error: unknown) => {
-        this.logService.error(
-          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} errored with error: ${JSON.stringify(error)}`,
-        );
-      },
-      finalize: () => {
-        this.logService.info(
-          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} finalized`,
-        );
-      },
-      complete: () => {
-        this.logService.info(
-          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} completed`,
-        );
-      },
-      subscribe: () => {
-        this.logService.info(
-          `LoginStrategyService.twoFactorTimeout$ with service id: ${this.id} subscribed`,
-        );
-      },
-    }),
-  );
+  twoFactorTimeout$: Observable<boolean> = this.twoFactorTimeoutSubject.asObservable();
 
   private loginStrategy$: Observable<
     | UserApiLoginStrategy
@@ -125,8 +92,6 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
 
   currentAuthType$: Observable<AuthenticationType | null>;
 
-  id: string = Utils.newGuid();
-
   constructor(
     protected accountService: AccountService,
     protected masterPasswordService: InternalMasterPasswordServiceAbstraction,
@@ -153,7 +118,6 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     protected vaultTimeoutSettingsService: VaultTimeoutSettingsService,
     protected kdfConfigService: KdfConfigService,
     protected taskSchedulerService: TaskSchedulerService,
-    private authnSessionTimeoutExecutor: Executor = (fn) => fn(), // Default to no-op
   ) {
     this.currentAuthnTypeState = this.stateProvider.get(CURRENT_LOGIN_STRATEGY_KEY);
     this.loginStrategyCacheState = this.stateProvider.get(CACHE_KEY);
@@ -164,15 +128,12 @@ export class LoginStrategyService implements LoginStrategyServiceAbstraction {
     this.taskSchedulerService.registerTaskHandler(
       ScheduledTaskNames.loginStrategySessionTimeout,
       async () => {
-        this.logService.info("Timeout executing for LoginStrategyService with id: " + this.id);
-        this.authnSessionTimeoutExecutor(async () => {
-          this.twoFactorTimeoutSubject.next(true);
-          try {
-            await this.clearCache();
-          } catch (e) {
-            this.logService.error("Failed to clear cache during session timeout", e);
-          }
-        });
+        this.twoFactorTimeoutSubject.next(true);
+        try {
+          await this.clearCache();
+        } catch (e) {
+          this.logService.error("Failed to clear cache during session timeout", e);
+        }
       },
     );
 

From 019a4d16c477ab67242ecc08cfaf65ca1579d144 Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Fri, 6 Dec 2024 23:23:18 +0100
Subject: [PATCH 42/46] Resolve the Unauthorized issue on secrets manager
 (#12278)

---
 .../src/app/secrets-manager/overview/overview.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
index 3585f09faf6..534b1c4ea3c 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts
@@ -140,7 +140,7 @@ export class OverviewComponent implements OnInit, OnDestroy {
     });
 
     this.freeTrial$ = org$.pipe(
-      filter((org) => org.isOwner),
+      filter((org) => org.isOwner && org.canViewBillingHistory && org.canViewSubscription),
       switchMap((org) =>
         combineLatest([
           of(org),

From a05162b373bca13ddad84765dec465b3b1734880 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:09:05 -0600
Subject: [PATCH 43/46] [deps] AC: Update mini-css-extract-plugin to v2.9.2
 (#11937)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 36b494c00c0..584a19adcd8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -155,7 +155,7 @@
         "jest-mock-extended": "3.0.7",
         "jest-preset-angular": "14.1.1",
         "lint-staged": "15.2.8",
-        "mini-css-extract-plugin": "2.9.1",
+        "mini-css-extract-plugin": "2.9.2",
         "node-ipc": "9.2.1",
         "postcss": "8.4.47",
         "postcss-loader": "8.1.1",
@@ -24579,9 +24579,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz",
-      "integrity": "sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 7d418b27d0c..4574e94d191 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "jest-mock-extended": "3.0.7",
     "jest-preset-angular": "14.1.1",
     "lint-staged": "15.2.8",
-    "mini-css-extract-plugin": "2.9.1",
+    "mini-css-extract-plugin": "2.9.2",
     "node-ipc": "9.2.1",
     "postcss": "8.4.47",
     "postcss-loader": "8.1.1",

From c6eb78d7fc08d49578e4c77396961b46b71da5f8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:42:56 -0600
Subject: [PATCH 44/46] [deps] AC: Update postcss to v8.4.49 (#11938)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 10 +++++-----
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 584a19adcd8..f1bc7e0c80f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -157,7 +157,7 @@
         "lint-staged": "15.2.8",
         "mini-css-extract-plugin": "2.9.2",
         "node-ipc": "9.2.1",
-        "postcss": "8.4.47",
+        "postcss": "8.4.49",
         "postcss-loader": "8.1.1",
         "prettier": "3.3.3",
         "prettier-plugin-tailwindcss": "0.6.9",
@@ -27224,9 +27224,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.47",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
       "dev": true,
       "funding": [
         {
@@ -27245,7 +27245,7 @@
       "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.1.0",
+        "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
       "engines": {
diff --git a/package.json b/package.json
index 4574e94d191..1915aef2e96 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "lint-staged": "15.2.8",
     "mini-css-extract-plugin": "2.9.2",
     "node-ipc": "9.2.1",
-    "postcss": "8.4.47",
+    "postcss": "8.4.49",
     "postcss-loader": "8.1.1",
     "prettier": "3.3.3",
     "prettier-plugin-tailwindcss": "0.6.9",

From 1654ff9b7adc019c47626e2d2ffae26c0682574d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 19:56:05 -0600
Subject: [PATCH 45/46] [deps] AC: Update sass-loader to v16.0.4 (#11309)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f1bc7e0c80f..fa2484612ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -165,7 +165,7 @@
         "remark-gfm": "4.0.0",
         "rimraf": "6.0.1",
         "sass": "1.81.0",
-        "sass-loader": "16.0.1",
+        "sass-loader": "16.0.4",
         "storybook": "8.4.5",
         "style-loader": "3.3.4",
         "tailwindcss": "3.4.15",
@@ -29135,9 +29135,9 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.1.tgz",
-      "integrity": "sha512-xACl1ToTsKnL9Ce5yYpRxrLj9QUDCnwZNhzpC7tKiFyA8zXsd3Ap+HGVnbCgkdQcm43E+i6oKAWBsvGA6ZoiMw==",
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.4.tgz",
+      "integrity": "sha512-LavLbgbBGUt3wCiYzhuLLu65+fWXaXLmq7YxivLhEqmiupCFZ5sKUAipK3do6V80YSU0jvSxNhEdT13IXNr3rg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 1915aef2e96..e5a595a3f89 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "remark-gfm": "4.0.0",
     "rimraf": "6.0.1",
     "sass": "1.81.0",
-    "sass-loader": "16.0.1",
+    "sass-loader": "16.0.4",
     "storybook": "8.4.5",
     "style-loader": "3.3.4",
     "tailwindcss": "3.4.15",

From d5af932cef43066e91ca9ea145afe67303f27cf2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 23:17:47 -0600
Subject: [PATCH 46/46] [deps] AC: Update style-loader to v4 (#10589)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package-lock.json | 29 +++++++++++++++++++++++------
 package.json      |  2 +-
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fa2484612ee..1abea1dbcfc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -167,7 +167,7 @@
         "sass": "1.81.0",
         "sass-loader": "16.0.4",
         "storybook": "8.4.5",
-        "style-loader": "3.3.4",
+        "style-loader": "4.0.0",
         "tailwindcss": "3.4.15",
         "ts-jest": "29.2.2",
         "ts-loader": "9.5.1",
@@ -9098,6 +9098,23 @@
         }
       }
     },
+    "node_modules/@storybook/builder-webpack5/node_modules/style-loader": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
     "node_modules/@storybook/components": {
       "version": "8.4.5",
       "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.4.5.tgz",
@@ -30494,20 +30511,20 @@
       }
     },
     "node_modules/style-loader": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
-      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-4.0.0.tgz",
+      "integrity": "sha512-1V4WqhhZZgjVAVJyt7TdDPZoPBPNHbekX4fWnCJL1yQukhCeZhJySUL+gL9y6sNdN95uEOS83Y55SqHcP7MzLA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^5.0.0"
+        "webpack": "^5.27.0"
       }
     },
     "node_modules/sucrase": {
diff --git a/package.json b/package.json
index e5a595a3f89..68017a92362 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "sass": "1.81.0",
     "sass-loader": "16.0.4",
     "storybook": "8.4.5",
-    "style-loader": "3.3.4",
+    "style-loader": "4.0.0",
     "tailwindcss": "3.4.15",
     "ts-jest": "29.2.2",
     "ts-loader": "9.5.1",