nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-20 10:58:07 -05:00
Code

[PM-15621] Update the remaining names to 'claimed'.

Browse Source
This commit is contained in:
Jimmy Vo 2025-04-15 15:32:25 -04:00
parent c89feec953
commit e5c62945cf
No known key found for this signature in database
GPG Key ID: 7CB834D6F4FFCA11
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountCommand.cs
View File

@ -25,14 +25,13 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz
private readonly IUserService _userService; private readonly IUserService _userService;
private readonly IEventService _eventService; private readonly IEventService _eventService;
private readonly IGetOrganizationUsersClaimedStatusQuery _getOrganizationUsersClaimedStatusQuery; private readonly IGetOrganizationUsersClaimedStatusQuery _getOrganizationUsersClaimedStatusQuery;
private readonly IDeleteClaimedOrganizationUserAccountValidator _deleteManagedOrganizationUserAccountValidator; private readonly IDeleteClaimedOrganizationUserAccountValidator _deleteClaimedOrganizationUserAccountValidator;
private readonly ILogger<DeleteClaimedOrganizationUserAccountCommand> _logger; private readonly ILogger<DeleteClaimedOrganizationUserAccountCommand> _logger;
private readonly IOrganizationUserRepository _organizationUserRepository; private readonly IOrganizationUserRepository _organizationUserRepository;
private readonly IUserRepository _userRepository; private readonly IUserRepository _userRepository;
private readonly ICurrentContext _currentContext; private readonly ICurrentContext _currentContext;
private readonly IReferenceEventService _referenceEventService; private readonly IReferenceEventService _referenceEventService;
private readonly IPushNotificationService _pushService; private readonly IPushNotificationService _pushService;
private readonly IProviderUserRepository _providerUserRepository;
public DeleteClaimedOrganizationUserAccountCommand( public DeleteClaimedOrganizationUserAccountCommand(
IUserService userService, IUserService userService,
IEventService eventService, IEventService eventService,
@ -44,7 +43,7 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz
IPushNotificationService pushService, IPushNotificationService pushService,
IProviderUserRepository providerUserRepository, IProviderUserRepository providerUserRepository,
ILogger<DeleteClaimedOrganizationUserAccountCommand> logger, ILogger<DeleteClaimedOrganizationUserAccountCommand> logger,
IDeleteClaimedOrganizationUserAccountValidator deleteManagedOrganizationUserAccountValidator) IDeleteClaimedOrganizationUserAccountValidator deleteClaimedOrganizationUserAccountValidator)
{ {
_userService = userService; _userService = userService;
_eventService = eventService; _eventService = eventService;
@ -54,9 +53,8 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz
_currentContext = currentContext; _currentContext = currentContext;
_referenceEventService = referenceEventService; _referenceEventService = referenceEventService;
_pushService = pushService; _pushService = pushService;
_providerUserRepository = providerUserRepository;
_logger = logger; _logger = logger;
_deleteManagedOrganizationUserAccountValidator = deleteManagedOrganizationUserAccountValidator; _deleteClaimedOrganizationUserAccountValidator = deleteClaimedOrganizationUserAccountValidator;
} }
public async Task<CommandResult<DeleteUserResponse>> DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId) public async Task<CommandResult<DeleteUserResponse>> DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId)
@ -94,10 +92,10 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz
{ {
var orgUsers = await _organizationUserRepository.GetManyAsync(orgUserIds); var orgUsers = await _organizationUserRepository.GetManyAsync(orgUserIds);
var users = await GetUsersAsync(orgUsers); var users = await GetUsersAsync(orgUsers);
var managementStatuses = await _getOrganizationUsersClaimedStatusQuery.GetUsersOrganizationClaimedStatusAsync(organizationId, orgUserIds); var claimedStatuses = await _getOrganizationUsersClaimedStatusQuery.GetUsersOrganizationClaimedStatusAsync(organizationId, orgUserIds);
var requests = CreateRequests(organizationId, deletingUserId, orgUserIds, orgUsers, users, managementStatuses); var requests = CreateRequests(organizationId, deletingUserId, orgUserIds, orgUsers, users, claimedStatuses);
var results = await _deleteManagedOrganizationUserAccountValidator.ValidateAsync(requests); var results = await _deleteClaimedOrganizationUserAccountValidator.ValidateAsync(requests);
await CancelPremiumsAsync(results.ValidResults); await CancelPremiumsAsync(results.ValidResults);
await HandleUserDeletionsAsync(results.ValidResults); await HandleUserDeletionsAsync(results.ValidResults);
@ -112,37 +110,27 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz
IEnumerable<Guid> orgUserIds, IEnumerable<Guid> orgUserIds,
ICollection<OrganizationUser> orgUsers, ICollection<OrganizationUser> orgUsers,
IEnumerable<User> users, IEnumerable<User> users,
IDictionary<Guid, bool> managementStatuses) IDictionary<Guid, bool> claimedStatuses)
{ {
var requests = new List<DeleteUserValidationRequest>(); var requests = new List<DeleteUserValidationRequest>();
foreach (var orgUserId in orgUserIds) foreach (var orgUserId in orgUserIds)
{ {
var orgUser = orgUsers.FirstOrDefault(orgUser => orgUser.Id == orgUserId); var orgUser = orgUsers.FirstOrDefault(orgUser => orgUser.Id == orgUserId);
var user = users.FirstOrDefault(user => user.Id == orgUser?.UserId); var user = users.FirstOrDefault(user => user.Id == orgUser?.UserId);
managementStatuses.TryGetValue(orgUserId, out var isManaged); claimedStatuses.TryGetValue(orgUserId, out var isClaimed);
requests.Add(new DeleteUserValidationRequest requests.Add(new DeleteUserValidationRequest
{ {
User = user, User = user,
OrganizationUserId = orgUserId, OrganizationUserId = orgUserId,
OrganizationUser = orgUser, OrganizationUser = orgUser,
IsManaged = isManaged, IsClaimed = isClaimed,
OrganizationId = organizationId, OrganizationId = organizationId,
DeletingUserId = deletingUserId, DeletingUserId = deletingUserId,
}); });
} }
return requests; return requests;
// Jimmy move this to the validator
// if (orgUser.Type == OrganizationUserType.Admin && await _currentContext.OrganizationCustom(organizationId))
// {
// throw new BadRequestException("Custom users can not delete admins.");
// }
// if (!claimedStatus.TryGetValue(orgUser.Id, out var isClaimed) || !isClaimed)
// {
// throw new BadRequestException("Member is not claimed by the organization.");
// }
} }
private async Task<IEnumerable<User>> GetUsersAsync(ICollection<OrganizationUser> orgUsers) private async Task<IEnumerable<User>> GetUsersAsync(ICollection<OrganizationUser> orgUsers)

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

@ -97,7 +97,7 @@ public class DeleteClaimedOrganizationUserAccountValidator(
private static ValidationResult<DeleteUserValidationRequest> EnsureUserIsManagedByOrganization(DeleteUserValidationRequest request) private static ValidationResult<DeleteUserValidationRequest> EnsureUserIsManagedByOrganization(DeleteUserValidationRequest request)
{ {
if (request.IsManaged == true) if (request.IsClaimed == true)
{ {
return new Valid<DeleteUserValidationRequest>(); return new Valid<DeleteUserValidationRequest>();
} }

2
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteUserValidationRequest.cs
View File

@ -10,5 +10,5 @@ public class DeleteUserValidationRequest
public OrganizationUser? OrganizationUser { get; init; } public OrganizationUser? OrganizationUser { get; init; }
public User? User { get; init; } public User? User { get; init; }
public Guid DeletingUserId { get; init; } public Guid DeletingUserId { get; init; }
public bool? IsManaged { get; init; } public bool? IsClaimed { get; init; }
} }