1
1
using Bit . Core . AdminConsole . Errors ;
2
2
using Bit . Core . AdminConsole . OrganizationFeatures . OrganizationUsers . Interfaces ;
3
+ using Bit . Core . AdminConsole . Repositories ;
3
4
using Bit . Core . AdminConsole . Shared . Validation ;
4
5
using Bit . Core . Context ;
5
6
using Bit . Core . Entities ;
@@ -23,16 +24,14 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz
23
24
{
24
25
private readonly IUserService _userService ;
25
26
private readonly IEventService _eventService ;
26
- private readonly IDeleteManagedOrganizationUserAccountValidator _deleteManagedOrganizationUserAccountValidator ;
27
- private readonly IGetOrganizationUsersManagementStatusQuery _getOrganizationUsersManagementStatusQuery ;
28
27
private readonly IGetOrganizationUsersClaimedStatusQuery _getOrganizationUsersClaimedStatusQuery ;
28
+ private readonly IDeleteClaimedOrganizationUserAccountValidator _deleteManagedOrganizationUserAccountValidator ;
29
+ private readonly ILogger < DeleteClaimedOrganizationUserAccountCommand > _logger ;
29
30
private readonly IOrganizationUserRepository _organizationUserRepository ;
30
31
private readonly IUserRepository _userRepository ;
31
32
private readonly ICurrentContext _currentContext ;
32
- private readonly ILogger < DeleteClaimedOrganizationUserAccountCommand > _logger ;
33
33
private readonly IReferenceEventService _referenceEventService ;
34
34
private readonly IPushNotificationService _pushService ;
35
- private readonly IOrganizationRepository _organizationRepository ;
36
35
private readonly IProviderUserRepository _providerUserRepository ;
37
36
public DeleteClaimedOrganizationUserAccountCommand (
38
37
IUserService userService ,
@@ -41,21 +40,23 @@ public DeleteClaimedOrganizationUserAccountCommand(
41
40
IOrganizationUserRepository organizationUserRepository ,
42
41
IUserRepository userRepository ,
43
42
ICurrentContext currentContext ,
44
- ILogger < DeleteClaimedOrganizationUserAccountCommand > logger ,
45
43
IReferenceEventService referenceEventService ,
46
- IPushNotificationService pushService )
44
+ IPushNotificationService pushService ,
45
+ IProviderUserRepository providerUserRepository ,
46
+ ILogger < DeleteClaimedOrganizationUserAccountCommand > logger ,
47
+ IDeleteClaimedOrganizationUserAccountValidator deleteManagedOrganizationUserAccountValidator )
47
48
{
48
49
_userService = userService ;
49
50
_eventService = eventService ;
50
- _deleteManagedOrganizationUserAccountValidator = deleteManagedOrganizationUserAccountValidator ;
51
- _getOrganizationUsersManagementStatusQuery = _getOrganizationUsersManagementStatusQuery ;
52
51
_getOrganizationUsersClaimedStatusQuery = getOrganizationUsersClaimedStatusQuery ;
53
52
_organizationUserRepository = organizationUserRepository ;
54
53
_userRepository = userRepository ;
55
54
_currentContext = currentContext ;
56
- _logger = logger ;
57
55
_referenceEventService = referenceEventService ;
58
56
_pushService = pushService ;
57
+ _providerUserRepository = providerUserRepository ;
58
+ _logger = logger ;
59
+ _deleteManagedOrganizationUserAccountValidator = deleteManagedOrganizationUserAccountValidator ;
59
60
}
60
61
61
62
public async Task < CommandResult < DeleteUserResponse > > DeleteUserAsync ( Guid organizationId , Guid organizationUserId , Guid deletingUserId )
@@ -93,7 +94,7 @@ private async Task<PartialValidationResult<DeleteUserValidationRequest>> Interna
93
94
{
94
95
var orgUsers = await _organizationUserRepository . GetManyAsync ( orgUserIds ) ;
95
96
var users = await GetUsersAsync ( orgUsers ) ;
96
- var managementStatuses = await _getOrganizationUsersManagementStatusQuery . GetUsersOrganizationManagementStatusAsync ( organizationId , orgUserIds ) ;
97
+ var managementStatuses = await _getOrganizationUsersClaimedStatusQuery . GetUsersOrganizationClaimedStatusAsync ( organizationId , orgUserIds ) ;
97
98
98
99
var requests = CreateRequests ( organizationId , deletingUserId , orgUserIds , orgUsers , users , managementStatuses ) ;
99
100
var results = await _deleteManagedOrganizationUserAccountValidator . ValidateAsync ( requests ) ;
0 commit comments