From 4f145b3938f2f4ccf876e55c0ed7c4cb1e79d624 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Wed, 20 Jul 2022 11:42:06 +1000
Subject: [PATCH] Update restore/revoke error message wording (#2126)

---
 .../Implementations/OrganizationService.cs    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs
index ca1913c4e6..fcbab6d831 100644
--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -2216,18 +2216,18 @@ namespace Bit.Core.Services
         {
             if (organizationUser.Status == OrganizationUserStatusType.Deactivated)
             {
-                throw new BadRequestException("Already deactivated.");
+                throw new BadRequestException("Already revoked.");
             }
 
             if (disablingUserId.HasValue && organizationUser.UserId == disablingUserId.Value)
             {
-                throw new BadRequestException("You cannot deactivate yourself.");
+                throw new BadRequestException("You cannot revoke yourself.");
             }
 
             if (organizationUser.Type == OrganizationUserType.Owner && disablingUserId.HasValue &&
                 !await _currentContext.OrganizationOwner(organizationUser.OrganizationId))
             {
-                throw new BadRequestException("Only owners can deactivate other owners.");
+                throw new BadRequestException("Only owners can revoke other owners.");
             }
 
             if (!await HasConfirmedOwnersExceptAsync(organizationUser.OrganizationId, new[] { organizationUser.Id }))
@@ -2271,17 +2271,17 @@ namespace Bit.Core.Services
                 {
                     if (organizationUser.Status == OrganizationUserStatusType.Deactivated)
                     {
-                        throw new BadRequestException("Already deactivated.");
+                        throw new BadRequestException("Already revoked.");
                     }
 
                     if (disablingUserId.HasValue && organizationUser.UserId == disablingUserId)
                     {
-                        throw new BadRequestException("You cannot deactivate yourself.");
+                        throw new BadRequestException("You cannot revoke yourself.");
                     }
 
                     if (organizationUser.Type == OrganizationUserType.Owner && disablingUserId.HasValue && !deletingUserIsOwner)
                     {
-                        throw new BadRequestException("Only owners can deactivate other owners.");
+                        throw new BadRequestException("Only owners can revoke other owners.");
                     }
 
                     await _organizationUserRepository.DeactivateAsync(organizationUser.Id);
@@ -2308,13 +2308,13 @@ namespace Bit.Core.Services
 
             if (enablingUserId.HasValue && organizationUser.UserId == enablingUserId.Value)
             {
-                throw new BadRequestException("You cannot activate yourself.");
+                throw new BadRequestException("You cannot restore yourself.");
             }
 
             if (organizationUser.Type == OrganizationUserType.Owner && enablingUserId.HasValue &&
                 !await _currentContext.OrganizationOwner(organizationUser.OrganizationId))
             {
-                throw new BadRequestException("Only owners can activate other owners.");
+                throw new BadRequestException("Only owners can restore other owners.");
             }
 
             var status = GetPriorActiveOrganizationUserStatusType(organizationUser);
@@ -2355,12 +2355,12 @@ namespace Bit.Core.Services
 
                     if (enablingUserId.HasValue && organizationUser.UserId == enablingUserId)
                     {
-                        throw new BadRequestException("You cannot activate yourself.");
+                        throw new BadRequestException("You cannot restore yourself.");
                     }
 
                     if (organizationUser.Type == OrganizationUserType.Owner && enablingUserId.HasValue && !deletingUserIsOwner)
                     {
-                        throw new BadRequestException("Only owners can activate other owners.");
+                        throw new BadRequestException("Only owners can restore other owners.");
                     }
 
                     var status = GetPriorActiveOrganizationUserStatusType(organizationUser);