From 9fabdbd0a1c58633c3ada90f5fb212c9eeec4dbd Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Fri, 30 Jul 2021 08:10:00 -0500
Subject: [PATCH] Fix setup provider page (#1106)

* Show only business org create form if provider

* Remove business name from provider views
---
 .../providers/settings/account.component.html |  5 ----
 .../app/providers/setup/setup.component.html  |  6 -----
 .../app/providers/setup/setup.component.ts    |  2 --
 .../organization-plans.component.html         | 27 +++++++++++++------
 .../settings/organization-plans.component.ts  |  5 ++++
 src/locales/en/messages.json                  |  4 +--
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/bitwarden_license/src/app/providers/settings/account.component.html b/bitwarden_license/src/app/providers/settings/account.component.html
index 70aa5c6e..0a90198a 100644
--- a/bitwarden_license/src/app/providers/settings/account.component.html
+++ b/bitwarden_license/src/app/providers/settings/account.component.html
@@ -18,11 +18,6 @@
                 <input id="billingEmail" class="form-control" type="text" name="BillingEmail"
                     [(ngModel)]="provider.billingEmail" [disabled]="selfHosted">
             </div>
-            <div class="form-group">
-                <label for="businessName">{{'businessName' | i18n}}</label>
-                <input id="businessName" class="form-control" type="text" name="BusinessName"
-                    [(ngModel)]="provider.businessName" [disabled]="selfHosted">
-            </div>
         </div>
         <div class="col-6">
             <app-avatar data="{{provider.name}}" dynamic="true" size="75" fontSize="35"></app-avatar>
diff --git a/bitwarden_license/src/app/providers/setup/setup.component.html b/bitwarden_license/src/app/providers/setup/setup.component.html
index 1f62512c..f8327f28 100644
--- a/bitwarden_license/src/app/providers/setup/setup.component.html
+++ b/bitwarden_license/src/app/providers/setup/setup.component.html
@@ -17,12 +17,6 @@
                 <input id="billingEmail" class="form-control" type="text" name="BillingEmail" [(ngModel)]="billingEmail" required>
             </div>
         </div>
-        <div class="row">
-            <div class="form-group col-6">
-                <label for="businessName">{{'businessName' | i18n}}</label>
-                <input id="businessName" class="form-control" type="text" name="BusinessName" [(ngModel)]="businessName">
-            </div>
-        </div>
 
         <div class="mt-4">
             <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
diff --git a/bitwarden_license/src/app/providers/setup/setup.component.ts b/bitwarden_license/src/app/providers/setup/setup.component.ts
index b3c68c0b..ce9eb66c 100644
--- a/bitwarden_license/src/app/providers/setup/setup.component.ts
+++ b/bitwarden_license/src/app/providers/setup/setup.component.ts
@@ -33,7 +33,6 @@ export class SetupComponent implements OnInit {
     token: string;
     name: string;
     billingEmail: string;
-    businessName: string;
 
     constructor(private router: Router, private toasterService: ToasterService,
         private i18nService: I18nService, private route: ActivatedRoute,
@@ -80,7 +79,6 @@ export class SetupComponent implements OnInit {
             const request = new ProviderSetupRequest();
             request.name = this.name;
             request.billingEmail = this.billingEmail;
-            request.businessName = this.businessName;
             request.token = this.token;
             request.key = key;
 
diff --git a/src/app/settings/organization-plans.component.html b/src/app/settings/organization-plans.component.html
index 296b82ad..c611383f 100644
--- a/src/app/settings/organization-plans.component.html
+++ b/src/app/settings/organization-plans.component.html
@@ -29,17 +29,28 @@
             <input id="billingEmail" class="form-control" type="text" name="BillingEmail" [(ngModel)]="billingEmail"
                 required>
         </div>
-    </div>
-    <div class="form-group form-check">
-        <input id="ownedBusiness" class="form-check-input" type="checkbox" name="OwnedBusiness"
-            [(ngModel)]="ownedBusiness" (change)="changedOwnedBusiness()">
-        <label for="ownedBusiness" class="form-check-label">{{'accountOwnedBusiness' | i18n}}</label>
-    </div>
-    <div class="row" *ngIf="ownedBusiness">
-        <div class="form-group col-6">
+        <div class="form-group col-6" *ngIf="!!providerId">
+            <label for="email">{{'clientOwnerEmail' | i18n}}</label>
+            <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="clientOwnerEmail" required>
+            <small class="text-muted">{{'ownerDesc' | i18n : '20'}}</small>
+        </div>
+        <div class="form-group col-6" *ngIf="!!providerId">
             <label for="businessName">{{'businessName' | i18n}}</label>
             <input id="businessName" class="form-control" type="text" name="BusinessName" [(ngModel)]="businessName">
         </div>
+        </div>
+        <div *ngIf="!providerId">
+        <div class="form-group form-check">
+            <input id="ownedBusiness" class="form-check-input" type="checkbox" name="OwnedBusiness" [(ngModel)]="ownedBusiness"
+                (change)="changedOwnedBusiness()">
+            <label for="ownedBusiness" class="form-check-label">{{'accountOwnedBusiness' | i18n}}</label>
+        </div>
+        <div class="row" *ngIf="ownedBusiness">
+            <div class="form-group col-6">
+                <label for="businessName">{{'businessName' | i18n}}</label>
+                <input id="businessName" class="form-control" type="text" name="BusinessName" [(ngModel)]="businessName">
+                </div>
+        </div>
     </div>
     <h2 class="mt-5">{{'chooseYourPlan' | i18n}}</h2>
     <div *ngFor="let selectableProduct of selectableProducts" class="form-check form-check-block">
diff --git a/src/app/settings/organization-plans.component.ts b/src/app/settings/organization-plans.component.ts
index 2c17c9cc..6da79895 100644
--- a/src/app/settings/organization-plans.component.ts
+++ b/src/app/settings/organization-plans.component.ts
@@ -85,6 +85,11 @@ export class OrganizationPlansComponent implements OnInit {
                 this.ownedBusiness = true;
             }
         }
+
+        if (this.providerId) {
+            this.ownedBusiness = true;
+        }
+
         this.loading = false;
     }
 
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 795710c1..9471407e 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -4046,13 +4046,13 @@
     "message": "Manage Users must also be enabled with the Manage Password Reset permission"
   },
   "setupProvider": {
-    "message": "Setup Provider"
+    "message": "Provider Setup"
   },
   "setupProviderLoginDesc": {
     "message": "You've been invited to setup a new provider. To continue, you need to log in or create a new Bitwarden account."
   },
   "setupProviderDesc": {
-    "message": "You have been invited to create a Provider, please enter the details below to complete the setup. Contact customer support if you have any questions."
+    "message": "Please enter the details below to complete the provider setup. Contact Customer Support if you have any questions."
   },
   "providerName": {
     "message": "Provider Name"