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

[PM-15621] Fix minor naming and type issues.

Browse Source
This commit is contained in:
Jimmy Vo 2025-04-17 15:54:15 -04:00
parent 3775ec2448
commit bb4d7294ad
No known key found for this signature in database
GPG Key ID: 7CB834D6F4FFCA11
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountValidator.cs
View File

@ -27,7 +27,7 @@ public class DeleteClaimedOrganizationUserAccountValidator(
EnsureUserBelongsToOrganization, EnsureUserBelongsToOrganization,
EnsureUserStatusIsNotInvited, EnsureUserStatusIsNotInvited,
PreventSelfDeletion, PreventSelfDeletion,
EnsureUserIsManagedByOrganization EnsureUserIsClaimedByOrganization
}; };
var asyncValidators = new[] var asyncValidators = new[]
@ -95,9 +95,9 @@ public class DeleteClaimedOrganizationUserAccountValidator(
return new Valid<DeleteUserValidationRequest>(); return new Valid<DeleteUserValidationRequest>();
} }
private static ValidationResult<DeleteUserValidationRequest> EnsureUserIsManagedByOrganization(DeleteUserValidationRequest request) private static ValidationResult<DeleteUserValidationRequest> EnsureUserIsClaimedByOrganization(DeleteUserValidationRequest request)
{ {
if (request.IsClaimed == true) if (request.IsClaimed)
{ {
return new Valid<DeleteUserValidationRequest>(); return new Valid<DeleteUserValidationRequest>();
} }
@ -116,7 +116,7 @@ public class DeleteClaimedOrganizationUserAccountValidator(
private static ValidationResult<DeleteUserValidationRequest> PreventSelfDeletion(DeleteUserValidationRequest request) private static ValidationResult<DeleteUserValidationRequest> PreventSelfDeletion(DeleteUserValidationRequest request)
{ {
if (request.OrganizationUser.UserId == request.DeletingUserId) if (request.OrganizationUser!.UserId == request.DeletingUserId)
{ {
return new Invalid<DeleteUserValidationRequest>(new BadRequestError<DeleteUserValidationRequest>("You cannot delete yourself.", request)); return new Invalid<DeleteUserValidationRequest>(new BadRequestError<DeleteUserValidationRequest>("You cannot delete yourself.", request));
} }
@ -126,7 +126,7 @@ public class DeleteClaimedOrganizationUserAccountValidator(
private async Task<ValidationResult<DeleteUserValidationRequest>> EnsureOnlyOwnersCanDeleteOwnersAsync(DeleteUserValidationRequest request) private async Task<ValidationResult<DeleteUserValidationRequest>> EnsureOnlyOwnersCanDeleteOwnersAsync(DeleteUserValidationRequest request)
{ {
if (request.OrganizationUser.Type != OrganizationUserType.Owner) if (request.OrganizationUser!.Type != OrganizationUserType.Owner)
{ {
return new Valid<DeleteUserValidationRequest>(request); return new Valid<DeleteUserValidationRequest>(request);
} }
@ -162,7 +162,7 @@ public class DeleteClaimedOrganizationUserAccountValidator(
private async Task<ValidationResult<DeleteUserValidationRequest>> EnsureCustomUsersCannotDeleteAdminsAsync(DeleteUserValidationRequest request) private async Task<ValidationResult<DeleteUserValidationRequest>> EnsureCustomUsersCannotDeleteAdminsAsync(DeleteUserValidationRequest request)
{ {
if (request.OrganizationUser.Type == OrganizationUserType.Admin && await currentContext.OrganizationCustom(request.OrganizationId)) if (request.OrganizationUser!.Type == OrganizationUserType.Admin && await currentContext.OrganizationCustom(request.OrganizationId))
{ {
return new Invalid<DeleteUserValidationRequest>(new BadRequestError<DeleteUserValidationRequest>("Custom users can not delete admins.", request)); return new Invalid<DeleteUserValidationRequest>(new BadRequestError<DeleteUserValidationRequest>("Custom users can not delete admins.", request));
} }