From b914260705901ff32783e3eebb5ac8dab4e93a92 Mon Sep 17 00:00:00 2001
From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com>
Date: Fri, 12 Apr 2024 10:17:38 -0400
Subject: [PATCH] [AC-2319] remove the owned by business checkbox business name
 (#8674)

* Removed business name from organization create/upgrade flows, and org info page

* Prefilling the logged in user's email to the billing email when creating an organization
---
 .../organization-information.component.html   | 15 -------------
 .../organization-information.component.ts     | 21 +++++++++++++++++--
 .../settings/account.component.html           |  4 ----
 .../settings/account.component.ts             |  7 -------
 .../organization-plans.component.ts           |  7 -------
 5 files changed, 19 insertions(+), 35 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html
index 6029cfd833..e0a8006081 100644
--- a/apps/web/src/app/admin-console/organizations/create/organization-information.component.html
+++ b/apps/web/src/app/admin-console/organizations/create/organization-information.component.html
@@ -20,19 +20,4 @@
       <input bitInput type="email" formControlName="clientOwnerEmail" />
     </bit-form-field>
   </div>
-  <div *ngIf="!isProvider && !acceptingSponsorship">
-    <input
-      type="checkbox"
-      name="businessOwned"
-      formControlName="businessOwned"
-      (change)="changedBusinessOwned.emit()"
-    />
-    <bit-label for="businessOwned" class="tw-mb-3">{{ "accountOwnedBusiness" | i18n }}</bit-label>
-    <div class="tw-mt-4" *ngIf="formGroup.controls['businessOwned'].value">
-      <bit-form-field class="tw-w-1/2">
-        <bit-label>{{ "businessName" | i18n }}</bit-label>
-        <input bitInput type="text" formControlName="businessName" />
-      </bit-form-field>
-    </div>
-  </div>
 </form>
diff --git a/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts b/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts
index 99cb3102aa..602ad82972 100644
--- a/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts
+++ b/apps/web/src/app/admin-console/organizations/create/organization-information.component.ts
@@ -1,15 +1,32 @@
-import { Component, EventEmitter, Input, Output } from "@angular/core";
+import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core";
 import { UntypedFormGroup } from "@angular/forms";
+import { firstValueFrom } from "rxjs";
+
+import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 
 @Component({
   selector: "app-org-info",
   templateUrl: "organization-information.component.html",
 })
-export class OrganizationInformationComponent {
+export class OrganizationInformationComponent implements OnInit {
   @Input() nameOnly = false;
   @Input() createOrganization = true;
   @Input() isProvider = false;
   @Input() acceptingSponsorship = false;
   @Input() formGroup: UntypedFormGroup;
   @Output() changedBusinessOwned = new EventEmitter<void>();
+
+  constructor(private accountService: AccountService) {}
+
+  async ngOnInit(): Promise<void> {
+    if (this.formGroup.controls.billingEmail.value) {
+      return;
+    }
+
+    const activeAccount = await firstValueFrom(this.accountService.activeAccount$);
+
+    if (activeAccount?.email) {
+      this.formGroup.controls.billingEmail.setValue(activeAccount.email);
+    }
+  }
 }
diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.html b/apps/web/src/app/admin-console/organizations/settings/account.component.html
index 7035b976ca..082fe7eb80 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.html
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.html
@@ -20,10 +20,6 @@
           <bit-label>{{ "billingEmail" | i18n }}</bit-label>
           <input bitInput id="billingEmail" formControlName="billingEmail" type="email" />
         </bit-form-field>
-        <bit-form-field>
-          <bit-label>{{ "businessName" | i18n }}</bit-label>
-          <input bitInput id="businessName" formControlName="businessName" type="text" />
-        </bit-form-field>
       </div>
       <div>
         <bit-avatar [text]="org.name" [id]="org.id" size="large"></bit-avatar>
diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
index b218e680e3..1ce05f7a30 100644
--- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts
@@ -65,10 +65,6 @@ export class AccountComponent {
       { value: "", disabled: true },
       { validators: [Validators.required, Validators.email, Validators.maxLength(256)] },
     ),
-    businessName: this.formBuilder.control(
-      { value: "", disabled: true },
-      { validators: [Validators.maxLength(50)] },
-    ),
   });
 
   protected collectionManagementFormGroup = this.formBuilder.group({
@@ -124,7 +120,6 @@ export class AccountComponent {
         // Update disabled states - reactive forms prefers not using disabled attribute
         if (!this.selfHosted) {
           this.formGroup.get("orgName").enable();
-          this.formGroup.get("businessName").enable();
           this.collectionManagementFormGroup.get("limitCollectionCreationDeletion").enable();
           this.collectionManagementFormGroup.get("allowAdminAccessToAllCollectionItems").enable();
         }
@@ -143,7 +138,6 @@ export class AccountComponent {
         this.formGroup.patchValue({
           orgName: this.org.name,
           billingEmail: this.org.billingEmail,
-          businessName: this.org.businessName,
         });
         this.collectionManagementFormGroup.patchValue({
           limitCollectionCreationDeletion: this.org.limitCollectionCreationDeletion,
@@ -168,7 +162,6 @@ export class AccountComponent {
 
     const request = new OrganizationUpdateRequest();
     request.name = this.formGroup.value.orgName;
-    request.businessName = this.formGroup.value.businessName;
     request.billingEmail = this.formGroup.value.billingEmail;
 
     // Backfill pub/priv key if necessary
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 17eddbd33d..f2fb296522 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.ts
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts
@@ -120,7 +120,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
     additionalStorage: [0, [Validators.min(0), Validators.max(99)]],
     additionalSeats: [0, [Validators.min(0), Validators.max(100000)]],
     clientOwnerEmail: ["", [Validators.email]],
-    businessName: [""],
     plan: [this.plan],
     product: [this.product],
     secretsManager: this.secretsManagerSubscription,
@@ -596,9 +595,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
   private async updateOrganization(orgId: string) {
     const request = new OrganizationUpgradeRequest();
-    request.businessName = this.formGroup.controls.businessOwned.value
-      ? this.formGroup.controls.businessName.value
-      : null;
     request.additionalSeats = this.formGroup.controls.additionalSeats.value;
     request.additionalStorageGb = this.formGroup.controls.additionalStorage.value;
     request.premiumAccessAddon =
@@ -656,9 +652,6 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy {
 
       request.paymentToken = tokenResult[0];
       request.paymentMethodType = tokenResult[1];
-      request.businessName = this.formGroup.controls.businessOwned.value
-        ? this.formGroup.controls.businessName.value
-        : null;
       request.additionalSeats = this.formGroup.controls.additionalSeats.value;
       request.additionalStorageGb = this.formGroup.controls.additionalStorage.value;
       request.premiumAccessAddon =