nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 05:00:19 -05:00
Code

Update restore/revoke error message wording (#2126)

Browse Source
This commit is contained in:
Thomas Rittson 2022-07-20 11:42:06 +10:00 committed by GitHub
parent 28ca17109a
commit 4f145b3938
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -2216,18 +2216,18 @@ namespace Bit.Core.Services
{ {
if (organizationUser.Status == OrganizationUserStatusType.Deactivated) if (organizationUser.Status == OrganizationUserStatusType.Deactivated)
{ {
throw new BadRequestException("Already deactivated."); throw new BadRequestException("Already revoked.");
} }
if (disablingUserId.HasValue && organizationUser.UserId == disablingUserId.Value) 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 && if (organizationUser.Type == OrganizationUserType.Owner && disablingUserId.HasValue &&
!await _currentContext.OrganizationOwner(organizationUser.OrganizationId)) !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 })) if (!await HasConfirmedOwnersExceptAsync(organizationUser.OrganizationId, new[] { organizationUser.Id }))
@ -2271,17 +2271,17 @@ namespace Bit.Core.Services
{ {
if (organizationUser.Status == OrganizationUserStatusType.Deactivated) if (organizationUser.Status == OrganizationUserStatusType.Deactivated)
{ {
throw new BadRequestException("Already deactivated."); throw new BadRequestException("Already revoked.");
} }
if (disablingUserId.HasValue && organizationUser.UserId == disablingUserId) 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) 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); await _organizationUserRepository.DeactivateAsync(organizationUser.Id);
@ -2308,13 +2308,13 @@ namespace Bit.Core.Services
if (enablingUserId.HasValue && organizationUser.UserId == enablingUserId.Value) 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 && if (organizationUser.Type == OrganizationUserType.Owner && enablingUserId.HasValue &&
!await _currentContext.OrganizationOwner(organizationUser.OrganizationId)) !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); var status = GetPriorActiveOrganizationUserStatusType(organizationUser);
@ -2355,12 +2355,12 @@ namespace Bit.Core.Services
if (enablingUserId.HasValue && organizationUser.UserId == enablingUserId) 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) 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); var status = GetPriorActiveOrganizationUserStatusType(organizationUser);