Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

Refactor RemoveOrganizationUserCommand to improve variable naming and remove unused logging method

Browse Source
This commit is contained in:
Rui Tome 2024-11-14 12:41:07 +00:00
parent 5a493c43eb
commit b711506fde
No known key found for this signature in database
GPG Key ID: 526239D96A8EC066
1 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/RemoveOrganizationUserCommand.cs
View File

@ -95,11 +95,11 @@ public class RemoveOrganizationUserCommand : IRemoveOrganizationUserCommand
deletingUserIsOwner = await _currentContext.OrganizationOwner(organizationId); deletingUserIsOwner = await _currentContext.OrganizationOwner(organizationId);
} }
var managementStatus = _featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning) ? var managementStatus = _featureService.IsEnabled(FeatureFlagKeys.AccountDeprovisioning)
await _getOrganizationUsersManagementStatusQuery.GetUsersOrganizationManagementStatusAsync(organizationId, filteredUsers.Select(u => u.Id)) : ? await _getOrganizationUsersManagementStatusQuery.GetUsersOrganizationManagementStatusAsync(organizationId, filteredUsers.Select(u => u.Id))
filteredUsers.ToDictionary(u => u.Id, u => false); : filteredUsers.ToDictionary(u => u.Id, u => false);
var result = new List<(Guid OrganizationUserId, string ErrorMessage)>(); var result = new List<(Guid OrganizationUserId, string ErrorMessage)>();
var deletedUserIds = new List<Guid>(); var userIdsToDelete = new List<Guid>();
foreach (var orgUser in filteredUsers) foreach (var orgUser in filteredUsers)
{ {
try try
@ -126,7 +126,7 @@ public class RemoveOrganizationUserCommand : IRemoveOrganizationUserCommand
await DeleteAndPushUserRegistrationAsync(organizationId, orgUser.UserId.Value); await DeleteAndPushUserRegistrationAsync(organizationId, orgUser.UserId.Value);
} }
result.Add((orgUser.Id, string.Empty)); result.Add((orgUser.Id, string.Empty));
deletedUserIds.Add(orgUser.Id); userIdsToDelete.Add(orgUser.Id);
} }
catch (BadRequestException e) catch (BadRequestException e)
{ {
@ -134,12 +134,12 @@ public class RemoveOrganizationUserCommand : IRemoveOrganizationUserCommand
} }
} }
if (deletedUserIds.Any()) if (userIdsToDelete.Any())
{ {
DateTime? eventDate = DateTime.UtcNow; DateTime? eventDate = DateTime.UtcNow;
await _organizationUserRepository.DeleteManyAsync(deletedUserIds); await _organizationUserRepository.DeleteManyAsync(userIdsToDelete);
await _eventService.LogOrganizationUserEventsAsync( await _eventService.LogOrganizationUserEventsAsync(
orgUsers.Where(u => deletedUserIds.Contains(u.Id)) filteredUsers.Where(u => userIdsToDelete.Contains(u.Id))
.Select(u => (u, EventType.OrganizationUser_Removed, eventDate))); .Select(u => (u, EventType.OrganizationUser_Removed, eventDate)));
} }
@ -206,29 +206,4 @@ public class RemoveOrganizationUserCommand : IRemoveOrganizationUserCommand
organizationId.ToString()); organizationId.ToString());
await _pushNotificationService.PushSyncOrgKeysAsync(userId); await _pushNotificationService.PushSyncOrgKeysAsync(userId);
} }
private async Task LogDeletedOrganizationUsersAsync(
IEnumerable<OrganizationUser> orgUsers,
IEnumerable<(Guid OrgUserId, string ErrorMessage)> results)
{
var eventDate = DateTime.UtcNow;
var events = new List<(OrganizationUser OrgUser, EventType Event, DateTime? EventDate)>();
foreach (var (orgUserId, errorMessage) in results)
{
var orgUser = orgUsers.FirstOrDefault(ou => ou.Id == orgUserId);
// If the user was not found or there was an error, we skip logging the event
if (orgUser == null || !string.IsNullOrEmpty(errorMessage))
{
continue;
}
events.Add((orgUser, EventType.OrganizationUser_Deleted, eventDate));
}
if (events.Any())
{
await _eventService.LogOrganizationUserEventsAsync(events);
}
}
} }