From f6df9983a38df6641ccbf25506f0aa5e0cfe1408 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Tue, 3 Aug 2021 10:33:08 -0400
Subject: [PATCH] Add owner email to provider org creation (#1101)

* Add owner email to provider org creation

* Use Correct request model

* Update jslib

* Remove unused input

* Remove unused input

* Improve client owner email description
---
 jslib                                         |  2 +-
 .../organization-plans.component.html         | 43 +++++++++----------
 .../settings/organization-plans.component.ts  |  9 +++-
 src/locales/en/messages.json                  |  6 +++
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/jslib b/jslib
index 23309d33e2..fdf0eb989b 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 23309d33e2a335574ed898d6543040372d41526a
+Subproject commit fdf0eb989be49e6f5d8215f2eac1da275923f427
diff --git a/src/app/settings/organization-plans.component.html b/src/app/settings/organization-plans.component.html
index c611383f3d..2cb6cbb945 100644
--- a/src/app/settings/organization-plans.component.html
+++ b/src/app/settings/organization-plans.component.html
@@ -8,7 +8,8 @@
         <div class="form-group">
             <label for="file">{{'licenseFile' | i18n}}</label>
             <input type="file" id="file" class="form-control-file" name="file" required>
-            <small class="form-text text-muted">{{'licenseFileDesc' | i18n : 'bitwarden_organization_license.json'}}</small>
+            <small class="form-text text-muted">{{'licenseFileDesc' | i18n :
+                'bitwarden_organization_license.json'}}</small>
         </div>
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
             <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
@@ -34,22 +35,19 @@
             <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>
+    <div *ngIf="!providerId">
         <div class="form-group form-check">
-            <input id="ownedBusiness" class="form-check-input" type="checkbox" name="OwnedBusiness" [(ngModel)]="ownedBusiness"
-                (change)="changedOwnedBusiness()">
+            <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>
+                <input id="businessName" class="form-control" type="text" name="BusinessName"
+                    [(ngModel)]="businessName">
+            </div>
         </div>
     </div>
     <h2 class="mt-5">{{'chooseYourPlan' | i18n}}</h2>
@@ -99,7 +97,7 @@
                     {{'includesXUsers' | i18n : selectableProduct.baseSeats}}
                     <ng-container *ngIf="selectableProduct.hasAdditionalSeatsOption">
                         {{('additionalUsers' | i18n).toLowerCase()}}
-                        {{selectableProduct.seatPrice  / 12 | currency:'$'}} /{{'month' | i18n}}
+                        {{selectableProduct.seatPrice / 12 | currency:'$'}} /{{'month' | i18n}}
                     </ng-container>
                 </ng-container>
             </span>
@@ -128,8 +126,8 @@
                 <label for="additionalSeats">{{'additionalUserSeats' | i18n}}</label>
                 <input id="additionalSeats" class="form-control" type="number" name="AdditionalSeats"
                     [(ngModel)]="additionalSeats" min="0" max="100000" placeholder="{{'userSeatsDesc' | i18n}}">
-                <small
-                    class="text-muted form-text">{{'userSeatsAdditionalDesc' | i18n : selectedPlan.baseSeats : (seatPriceMonthly(selectedPlan) | currency:'$')}}</small>
+                <small class="text-muted form-text">{{'userSeatsAdditionalDesc' | i18n : selectedPlan.baseSeats :
+                    (seatPriceMonthly(selectedPlan) | currency:'$')}}</small>
             </div>
         </div>
         <div class="row">
@@ -138,8 +136,8 @@
                 <input id="additionalStorage" class="form-control" type="number" name="AdditionalStorageGb"
                     [(ngModel)]="additionalStorage" min="0" max="99" step="1"
                     placeholder="{{'additionalStorageGbDesc' | i18n}}">
-                <small
-                    class="text-muted form-text">{{'additionalStorageIntervalDesc' | i18n : '1 GB' : (additionalStoragePriceMonthly(selectedPlan) | currency:'$') : ('month' | i18n)}}</small>
+                <small class="text-muted form-text">{{'additionalStorageIntervalDesc' | i18n : '1 GB' :
+                    (additionalStoragePriceMonthly(selectedPlan) | currency:'$') : ('month' | i18n)}}</small>
             </div>
         </div>
         <div class="row">
@@ -149,8 +147,8 @@
                         [(ngModel)]="premiumAccessAddon">
                     <label for="premiumAccess" class="form-check-label bold">{{'premiumAccess' | i18n}}</label>
                 </div>
-                <small
-                    class="text-muted form-text">{{'premiumAccessDesc' | i18n : (3.33 | currency:'$') : ('month' | i18n)}}</small>
+                <small class="text-muted form-text">{{'premiumAccessDesc' | i18n : (3.33 | currency:'$') : ('month' |
+                    i18n)}}</small>
             </div>
         </div>
         <h2 class="spaced-header">{{'summary' | i18n}}</h2>
@@ -172,7 +170,7 @@
                         <span *ngIf="!selectablePlan.baseSeats">{{'users' | i18n}}:</span>
                         {{additionalSeats || 0}} &times; {{selectablePlan.seatPrice / 12 | currency:'$'}} &times; 12
                         {{'monthAbbr' | i18n}} = {{seatTotal(selectablePlan)
-                    | currency:'$'}} /{{'year' | i18n}}
+                        | currency:'$'}} /{{'year' | i18n}}
                     </small>
                     <small *ngIf="selectablePlan.hasAdditionalStorageOption">
                         {{'additionalStorageGb' | i18n}}: {{additionalStorage || 0}} &times;
@@ -201,7 +199,7 @@
                         <span *ngIf="!selectablePlan.baseSeats">{{'users' | i18n}}:</span>
                         {{additionalSeats || 0}} &times; {{selectablePlan.seatPrice | currency:'$'}}
                         {{'monthAbbr' | i18n}} = {{seatTotal(selectablePlan)
-                    | currency:'$'}} /{{'month' | i18n}}
+                        | currency:'$'}} /{{'month' | i18n}}
                     </small>
                     <small *ngIf="selectablePlan.hasAdditionalStorageOption">
                         {{'additionalStorageGb' | i18n}}: {{additionalStorage || 0}} &times;
@@ -219,7 +217,8 @@
             </label>
         </div>
         <hr class="my-3">
-        <h2 class="spaced-header mb-4">{{ (createOrganization ? 'paymentInformation' : 'billingInformation') | i18n}}</h2>
+        <h2 class="spaced-header mb-4">{{ (createOrganization ? 'paymentInformation' : 'billingInformation') | i18n}}
+        </h2>
         <app-payment *ngIf="createOrganization" [hideCredit]="true"></app-payment>
         <app-tax-info (onCountryChanged)="changedCountry()"></app-tax-info>
         <div id="price" class="my-4">
@@ -237,7 +236,7 @@
         <small class="text-muted font-italic" *ngIf="freeTrial && createOrganization; else paymentChargedImmediately">
             {{'paymentChargedWithTrial' | i18n : (selectedPlanInterval | i18n) }}
         </small>
-        <ng-template  #paymentChargedImmediately>
+        <ng-template #paymentChargedImmediately>
             <small class="text-muted font-italic mt-2 d-block">
                 {{'paymentCharged' | i18n : (selectedPlanInterval | i18n) }}
             </small>
diff --git a/src/app/settings/organization-plans.component.ts b/src/app/settings/organization-plans.component.ts
index 6da79895f9..7ada4c02b9 100644
--- a/src/app/settings/organization-plans.component.ts
+++ b/src/app/settings/organization-plans.component.ts
@@ -34,6 +34,7 @@ import { ProductType } from 'jslib-common/enums/productType';
 import { OrganizationCreateRequest } from 'jslib-common/models/request/organizationCreateRequest';
 import { OrganizationKeysRequest } from 'jslib-common/models/request/organizationKeysRequest';
 import { OrganizationUpgradeRequest } from 'jslib-common/models/request/organizationUpgradeRequest';
+import { ProviderOrganizationCreateRequest } from 'jslib-common/models/request/provider/providerOrganizationCreateRequest';
 
 import { PlanResponse } from 'jslib-common/models/response/planResponse';
 
@@ -62,6 +63,7 @@ export class OrganizationPlansComponent implements OnInit {
     additionalSeats: number = 0;
     name: string;
     billingEmail: string;
+    clientOwnerEmail: string;
     businessName: string;
     productTypes = ProductType;
     formPromise: Promise<any>;
@@ -336,9 +338,12 @@ export class OrganizationPlansComponent implements OnInit {
         }
 
         if (this.providerId) {
+            const providerRequest = new ProviderOrganizationCreateRequest(this.clientOwnerEmail, request);
             const providerKey = await this.cryptoService.getProviderKey(this.providerId);
-            request.key = (await this.cryptoService.encrypt(orgKey.key, providerKey)).encryptedString;
-            return (await this.apiService.postProviderCreateOrganization(this.providerId, request)).id;
+            providerRequest.organizationCreateRequest.key = (await this.cryptoService.encrypt(orgKey.key, providerKey)).encryptedString;
+            const orgId = (await this.apiService.postProviderCreateOrganization(this.providerId, providerRequest)).organizationId;
+
+            return orgId;
         } else {
             return (await this.apiService.postOrganization(request)).id;
         }
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index f64ccb5a42..7d1145ac41 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -2238,12 +2238,18 @@
   "confirmed": {
     "message": "Confirmed"
   },
+  "clientOwnerEmail": {
+    "message": "Client Owner Email"
+  },
   "owner": {
     "message": "Owner"
   },
   "ownerDesc": {
     "message": "The highest access user that can manage all aspects of your organization."
   },
+  "clientOwnerDesc": {
+    "message": "This email should NOT be associated with the provider. This user will have permissions to access and manage all aspects of this organization."
+  },
   "admin": {
     "message": "Admin"
   },