From e938bb10875e4d2bef02b22e7eefa4a49bbe53e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Wed, 27 Nov 2024 15:51:40 +0000
Subject: [PATCH] [PM-15386] Refactor DomainVerificationComponent to warn about
 enabling SingleOrg policy only when it is not already enabled (#12156)

---
 .../domain-verification.component.ts                | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
index 987888741a..9c0bae1052 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.ts
@@ -14,6 +14,8 @@ import {
 import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction";
 import { OrgDomainServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain.service.abstraction";
 import { OrganizationDomainResponse } from "@bitwarden/common/admin-console/abstractions/organization-domain/responses/organization-domain.response";
+import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
+import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { HttpStatusCode } from "@bitwarden/common/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
@@ -33,6 +35,7 @@ import {
 })
 export class DomainVerificationComponent implements OnInit, OnDestroy {
   private componentDestroyed$ = new Subject<void>();
+  private singleOrgPolicyEnabled = false;
 
   loading = true;
 
@@ -48,6 +51,7 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
     private validationService: ValidationService,
     private toastService: ToastService,
     private configService: ConfigService,
+    private policyApiService: PolicyApiServiceAbstraction,
   ) {}
 
   // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -71,6 +75,14 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
   async load() {
     await this.orgDomainApiService.getAllByOrgId(this.organizationId);
 
+    if (await this.configService.getFeatureFlag(FeatureFlag.AccountDeprovisioning)) {
+      const singleOrgPolicy = await this.policyApiService.getPolicy(
+        this.organizationId,
+        PolicyType.SingleOrg,
+      );
+      this.singleOrgPolicyEnabled = singleOrgPolicy?.enabled ?? false;
+    }
+
     this.loading = false;
   }
 
@@ -87,6 +99,7 @@ export class DomainVerificationComponent implements OnInit, OnDestroy {
         map(async ([accountDeprovisioningEnabled, organizationDomains]) => {
           if (
             accountDeprovisioningEnabled &&
+            !this.singleOrgPolicyEnabled &&
             organizationDomains.every((domain) => domain.verifiedDate === null)
           ) {
             await this.dialogService.openSimpleDialog({