changed all OnlyOrg wording to be SingleOrg instead (#974)

* changed all OnlyOrg wording to be SingleOrg instead

* missed an OnlyOrg to change to SingleOrg

bitwarden_license/src/Portal/Controllers/PoliciesController.cs

@@ -135,7 +135,7 @@ namespace Bit.Portal.Controllers
                 case PolicyType.MasterPassword:
                 case PolicyType.PasswordGenerator:
                 case PolicyType.TwoFactorAuthentication:
-                case PolicyType.OnlyOrg:
+                case PolicyType.SingleOrg:
                     break;
                 
                 case PolicyType.RequireSso:

bitwarden_license/src/Portal/Models/PolicyEditModel.cs

@@ -81,7 +81,7 @@ namespace Bit.Portal.Models
                 case PolicyType.PasswordGenerator:
                     existingPolicy.Data = JsonSerializer.Serialize(PasswordGeneratorDataModel, options);
                     break;
-                case PolicyType.OnlyOrg: 
+                case PolicyType.SingleOrg: 
                 case PolicyType.TwoFactorAuthentication:
                 case PolicyType.RequireSso:
                     break;

bitwarden_license/src/Portal/Models/PolicyModel.cs

@@ -32,9 +32,9 @@ namespace Bit.Portal.Models
                     DescriptionKey = "PasswordGeneratorDescription";
                     break;
 
-                case PolicyType.OnlyOrg:
+                case PolicyType.SingleOrg:
-                    NameKey = "OnlyOrganization";
+                    NameKey = "SingleOrganization";
-                    DescriptionKey = "OnlyOrganizationDescription";
+                    DescriptionKey = "SingleOrganizationDescription";
                     break;
                 
                 case PolicyType.RequireSso:

bitwarden_license/src/Portal/Views/Policies/Edit.cshtml

@@ -22,14 +22,14 @@
         </div>
     }
 
-    @if (Model.PolicyType == PolicyType.OnlyOrg)
+    @if (Model.PolicyType == PolicyType.SingleOrg)
     {
         <div class="callout callout-warning" role="alert">
             <h3 class="callout-heading">
                 <i class="fa fa-warning" *ngIf="icon" aria-hidden="true"></i>
                 @i18nService.T("Warning")
             </h3>
-            @i18nService.T("OnlyOrganizationPolicyWarning")
+            @i18nService.T("SingleOrganizationPolicyWarning")
         </div>
     }
     

src/Api/Controllers/OrganizationsController.cs

@@ -161,7 +161,7 @@ namespace Bit.Api.Controllers
             }
 
             var policies = await _policyRepository.GetManyByUserIdAsync(user.Id);
-            if (policies.Any(policy => policy.Type == PolicyType.OnlyOrg))
+            if (policies.Any(policy => policy.Type == PolicyType.SingleOrg))
             {
                 throw new Exception("You may not create an organization. You belong to an organization " +
                      "which has a policy that prohibits you from being a member of any other organization.");
@@ -189,7 +189,7 @@ namespace Bit.Api.Controllers
             }
 
             var policies = await _policyRepository.GetManyByUserIdAsync(user.Id);
-            if (policies.Any(policy => policy.Type == PolicyType.OnlyOrg))
+            if (policies.Any(policy => policy.Type == PolicyType.SingleOrg))
             {
                 throw new Exception("You may not create an organization. You belong to an organization " +
                      "which has a policy that prohibits you from being a member of any other organization.");

src/Core/Enums/PolicyType.cs

@@ -5,7 +5,7 @@
         TwoFactorAuthentication = 0,
         MasterPassword = 1,
         PasswordGenerator = 2,
-        OnlyOrg = 3,
+        SingleOrg = 3,
         RequireSso = 4,
     }
 }

src/Core/Models/Mail/OrganizationUserRemovedForPolicySingleOrgViewModel.cs

@@ -1,6 +1,6 @@
 namespace Bit.Core.Models.Mail
 {
-    public class OrganizationUserRemovedForPolicyOnlyOrgViewModel : BaseMailModel
+    public class OrganizationUserRemovedForPolicySingleOrgViewModel : BaseMailModel
     {
         public string OrganizationName { get; set; }
     }

src/Core/Resources/SharedResources.en.resx

@@ -539,13 +539,13 @@
   <data name="RedirectBehavior" xml:space="preserve">
     <value>OIDC Redirect Behavior</value>
   </data>
-  <data name="OnlyOrganization" xml:space="preserve">
+  <data name="SingleOrganization" xml:space="preserve">
-    <value>Only Organization</value>
+    <value>Single Organization</value>
   </data>
-  <data name="OnlyOrganizationDescription" xml:space="preserve">
+  <data name="SingleOrganizationDescription" xml:space="preserve">
     <value>Restrict users from being able to join any other organizations.</value>
   </data>
-  <data name="OnlyOrganizationPolicyWarning" xml:space="preserve">
+  <data name="SingleOrganizationPolicyWarning" xml:space="preserve">
     <value>Organization members who are already a part of another organization will be removed from this organization and will receive an email notifying them about the change.</value>
   </data>
   <data name="RequireSso" xml:space="preserve">

src/Core/Services/IMailService.cs

@@ -28,6 +28,6 @@ namespace Bit.Core.Services
         Task SendLicenseExpiredAsync(IEnumerable<string> emails, string organizationName = null);
         Task SendNewDeviceLoggedInEmail(string email, string deviceType, DateTime timestamp, string ip);
         Task SendRecoverTwoFactorEmail(string email, DateTime timestamp, string ip);
-        Task SendOrganizationUserRemovedForPolicyOnlyOrgEmailAsync(string organizationName, string email);
+        Task SendOrganizationUserRemovedForPolicySingleOrgEmailAsync(string organizationName, string email);
     }
 }

src/Core/Services/Implementations/HandlebarsMailService.cs

@@ -326,17 +326,17 @@ namespace Bit.Core.Services
             await _mailDeliveryService.SendEmailAsync(message);
         }
 
-        public async Task SendOrganizationUserRemovedForPolicyOnlyOrgEmailAsync(string organizationName, string email)
+        public async Task SendOrganizationUserRemovedForPolicySingleOrgEmailAsync(string organizationName, string email)
         {
             var message = CreateDefaultMessage($"You have been removed from {organizationName}", email);
-            var model = new OrganizationUserRemovedForPolicyOnlyOrgViewModel
+            var model = new OrganizationUserRemovedForPolicySingleOrgViewModel
             {
                 OrganizationName = CoreHelpers.SanitizeForEmail(organizationName),
                 WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
                 SiteName = _globalSettings.SiteName
             };
-            await AddMessageContentAsync(message, "OrganizationUserRemovedForPolicyOnlyOrg", model);
+            await AddMessageContentAsync(message, "OrganizationUserRemovedForPolicySingleOrg", model);
-            message.Category = "OrganizationUserRemovedForPolicyOnlyOrg";
+            message.Category = "OrganizationUserRemovedForPolicySingleOrg";
             await _mailDeliveryService.SendEmailAsync(message);
         }
 

src/Core/Services/Implementations/OrganizationService.cs

@@ -1148,12 +1148,12 @@ namespace Bit.Core.Services
             var userOrgs = await _organizationUserRepository.GetManyByUserAsync(user.Id);
             if (userOrgs.Any(ou => ou.OrganizationId != orgUser.OrganizationId && ou.Status != OrganizationUserStatusType.Invited))
             {   
-                if (await hasPolicyAsync(PolicyType.OnlyOrg))
+                if (await hasPolicyAsync(PolicyType.SingleOrg))
                 {
                     throw new BadRequestException("You may not join this organization until you leave or remove " +
                         "all other organizations.");
                 }
-                if (await hasPolicyAsync(PolicyType.OnlyOrg, true))
+                if (await hasPolicyAsync(PolicyType.SingleOrg, true))
                 {
                     throw new BadRequestException("You cannot join this organization because you are a member of " + 
                         "an organization which forbids it");
@@ -1209,8 +1209,8 @@ namespace Bit.Core.Services
                 throw new BadRequestException("User does not have two-step login enabled.");
             }
 
-            var usingOnlyOrgPolicy = policies.Any(p => p.Type == PolicyType.OnlyOrg && p.Enabled);
+            var usingSingleOrgPolicy = policies.Any(p => p.Type == PolicyType.SingleOrg && p.Enabled);
-            if (usingOnlyOrgPolicy)
+            if (usingSingleOrgPolicy)
             {
                 var userOrgs = await _organizationUserRepository.GetManyByUserAsync(user.Id);
                 if (userOrgs.Any(ou => ou.OrganizationId != organizationId && ou.Status != OrganizationUserStatusType.Invited))

src/Core/Services/Implementations/PolicyService.cs

@@ -76,7 +76,7 @@ namespace Bit.Core.Services
                                 }
                             }
                         break;
-                        case Enums.PolicyType.OnlyOrg:
+                        case Enums.PolicyType.SingleOrg:
                             var userOrgs = await _organizationUserRepository.GetManyByManyUsersAsync(
                                     removableOrgUsers.Select(ou => ou.UserId.Value));
                             foreach (var orgUser in removableOrgUsers)
@@ -86,7 +86,7 @@ namespace Bit.Core.Services
                                     organization = organization ?? await _organizationRepository.GetByIdAsync(policy.OrganizationId);
                                     await organizationService.DeleteUserAsync(policy.OrganizationId, orgUser.Id,
                                         savingUserId);
-                                    await _mailService.SendOrganizationUserRemovedForPolicyOnlyOrgEmailAsync(
+                                    await _mailService.SendOrganizationUserRemovedForPolicySingleOrgEmailAsync(
                                         organization.Name, orgUser.Email);
                                 }
                             }

src/Core/Services/NoopImplementations/NoopMailService.cs

@@ -103,7 +103,7 @@ namespace Bit.Core.Services
             return Task.FromResult(0);
         }
 
-        public Task SendOrganizationUserRemovedForPolicyOnlyOrgEmailAsync(string organizationName, string email)
+        public Task SendOrganizationUserRemovedForPolicySingleOrgEmailAsync(string organizationName, string email)
         {
             return Task.FromResult(0);
         }