From ebe5a6030e2b436d4f4a313b428f8fa2f8191b35 Mon Sep 17 00:00:00 2001
From: Addison Beck <abeck@bitwarden.com>
Date: Tue, 27 Oct 2020 10:28:57 -0400
Subject: [PATCH] Only org to single org (#680)

* change OnlyOrg references to SingleOrg

* updated jslib

* change OnlyOrg references to SingleOrg

* missed a reference to OnlyOrg in messages
---
 jslib                                                  |  2 +-
 src/app/organizations/manage/policies.component.ts     |  6 +++---
 .../organizations/manage/policy-edit.component.html    |  4 ++--
 src/app/organizations/manage/policy-edit.component.ts  |  6 +++---
 src/app/settings/organization-plans.component.html     |  4 ++--
 src/app/settings/organization-plans.component.ts       | 10 +++++-----
 src/locales/en/messages.json                           | 10 +++++-----
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/jslib b/jslib
index d84d6da7f7..76c09641ba 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit d84d6da7f77ec89ba69299b1ff982f083fd77203
+Subproject commit 76c09641ba8ef6cdbf74977a7a719b9aa099edb7
diff --git a/src/app/organizations/manage/policies.component.ts b/src/app/organizations/manage/policies.component.ts
index e7fa5583a9..3335c6306f 100644
--- a/src/app/organizations/manage/policies.component.ts
+++ b/src/app/organizations/manage/policies.component.ts
@@ -80,9 +80,9 @@ export class PoliciesComponent implements OnInit {
                     display: true,
                 },
                 {
-                    name: this.i18nService.t('onlyOrg'),
-                    description: this.i18nService.t('onlyOrgDesc'),
-                    type: PolicyType.OnlyOrg,
+                    name: this.i18nService.t('singleOrg'),
+                    description: this.i18nService.t('singleOrgDesc'),
+                    type: PolicyType.SingleOrg,
                     enabled: false,
                     display: true,
                 },
diff --git a/src/app/organizations/manage/policy-edit.component.html b/src/app/organizations/manage/policy-edit.component.html
index 421d14ebd4..d5bf41585c 100644
--- a/src/app/organizations/manage/policy-edit.component.html
+++ b/src/app/organizations/manage/policy-edit.component.html
@@ -17,9 +17,9 @@
                     title="{{'warning' | i18n}}" icon="fa-warning">
                     {{'twoStepLoginPolicyWarning' | i18n}}
                 </app-callout>
-                <app-callout type="warning" *ngIf="type === policyType.OnlyOrg" title="{{'warning' | i18n}}"
+                <app-callout type="warning" *ngIf="type === policyType.SingleOrg" title="{{'warning' | i18n}}"
                     icon="fa-warning">
-                    {{'onlyOrgPolicyWarning' | i18n}}
+                    {{'singleOrgPolicyWarning' | i18n}}
                 </app-callout>
                 <app-callout type="tip" title="{{'prerequisite' | i18n}}" *ngIf="type === policyType.RequireSso">
                     {{'requireSsoPolicyReq' | i18n}}
diff --git a/src/app/organizations/manage/policy-edit.component.ts b/src/app/organizations/manage/policy-edit.component.ts
index 8b1f69d2fd..5856b3abf5 100644
--- a/src/app/organizations/manage/policy-edit.component.ts
+++ b/src/app/organizations/manage/policy-edit.component.ts
@@ -178,9 +178,9 @@ export class PolicyEditComponent implements OnInit {
                 if (!this.enabled) { // Don't need prevalidation checks if submitting to disable
                     return true;
                 }
-                // Have OnlyOrg policy enabled?
-                if (!(this.policiesEnabledMap.has(PolicyType.OnlyOrg)
-                    && this.policiesEnabledMap.get(PolicyType.OnlyOrg))) {
+                // Have SingleOrg policy enabled?
+                if (!(this.policiesEnabledMap.has(PolicyType.SingleOrg)
+                    && this.policiesEnabledMap.get(PolicyType.SingleOrg))) {
                     this.toasterService.popAsync('error', null, this.i18nService.t('requireSsoPolicyReqError'));
                     return false;
                 }
diff --git a/src/app/settings/organization-plans.component.html b/src/app/settings/organization-plans.component.html
index 4692419d42..bfafba7c7a 100644
--- a/src/app/settings/organization-plans.component.html
+++ b/src/app/settings/organization-plans.component.html
@@ -222,8 +222,8 @@
         <small class="text-muted font-italic mt-2 d-block" *ngIf="!createOrganization">
             {{'paymentCharged' | i18n : (interval | i18n) }}</small>
     </div>
-    <div *ngIf="onlyOrgPolicyBlock" class="mt-4">
-        <app-callout [type]="'error'">{{'onlyOrgBlockCreateMessage' | i18n}}</app-callout>
+    <div *ngIf="singleOrgPolicyBlock" class="mt-4">
+        <app-callout [type]="'error'">{{'singleOrgBlockCreateMessage' | i18n}}</app-callout>
     </div>
     <div class="mt-4">
         <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
diff --git a/src/app/settings/organization-plans.component.ts b/src/app/settings/organization-plans.component.ts
index e9373a573b..b8d84f8138 100644
--- a/src/app/settings/organization-plans.component.ts
+++ b/src/app/settings/organization-plans.component.ts
@@ -58,7 +58,7 @@ export class OrganizationPlansComponent implements OnInit {
     businessName: string;
     productTypes = ProductType;
     formPromise: Promise<any>;
-    onlyOrgPolicyBlock: boolean = false;
+    singleOrgPolicyBlock: boolean = false;
 
     plans: PlanResponse[];
 
@@ -197,12 +197,12 @@ export class OrganizationPlansComponent implements OnInit {
     }
 
     async submit() {
-        if (this.onlyOrgPolicyBlock) {
+        if (this.singleOrgPolicyBlock) {
             return;
         } else {
-            const policies = await this.policyService.getAll(PolicyType.OnlyOrg);
-            this.onlyOrgPolicyBlock = policies.some(policy => policy.enabled);
-            if (this.onlyOrgPolicyBlock) {
+            const policies = await this.policyService.getAll(PolicyType.SingleOrg);
+            this.singleOrgPolicyBlock = policies.some(policy => policy.enabled);
+            if (this.singleOrgPolicyBlock) {
                 return;
             }
         }
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index f91cd04aa9..9b158d309e 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3210,16 +3210,16 @@
   "webPoliciesDeprecationWarning": {
     "message": "Policy configuration has been moved, and this page will soon be deprecated. Please click below to use the Business Portal policies page instead."
   },
-  "onlyOrg": {
-    "message": "Only Organization"
+  "singleOrg": {
+    "message": "Single Organization"
   },
-  "onlyOrgDesc": {
+  "singleOrgDesc": {
     "message": "Restrict users from being able to join any other organizations."
   },
-  "onlyOrgBlockCreateMessage": {
+  "singleOrgBlockCreateMessage": {
     "message": "Your current organization has a policy that does not allow you to join more than one organization. Please contact your organization admins or sign up from a different Bitwarden account."
   },
-  "onlyOrgPolicyWarning": {
+  "singleOrgPolicyWarning": {
     "message": "Organization members who are already a member of another organization will be removed from your organization."
   },
   "requireSso": {