Skip to content

Commit c89feec

Browse files
committed
[PM-15621] Fix merge conflicts
1 parent 3ec56fe commit c89feec

File tree

6 files changed

+284
-721
lines changed

6 files changed

+284
-721
lines changed

src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountCommand.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Bit.Core.AdminConsole.Errors;
22
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
3+
using Bit.Core.AdminConsole.Repositories;
34
using Bit.Core.AdminConsole.Shared.Validation;
45
using Bit.Core.Context;
56
using Bit.Core.Entities;
@@ -23,16 +24,14 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz
2324
{
2425
private readonly IUserService _userService;
2526
private readonly IEventService _eventService;
26-
private readonly IDeleteManagedOrganizationUserAccountValidator _deleteManagedOrganizationUserAccountValidator;
27-
private readonly IGetOrganizationUsersManagementStatusQuery _getOrganizationUsersManagementStatusQuery;
2827
private readonly IGetOrganizationUsersClaimedStatusQuery _getOrganizationUsersClaimedStatusQuery;
28+
private readonly IDeleteClaimedOrganizationUserAccountValidator _deleteManagedOrganizationUserAccountValidator;
29+
private readonly ILogger<DeleteClaimedOrganizationUserAccountCommand> _logger;
2930
private readonly IOrganizationUserRepository _organizationUserRepository;
3031
private readonly IUserRepository _userRepository;
3132
private readonly ICurrentContext _currentContext;
32-
private readonly ILogger<DeleteClaimedOrganizationUserAccountCommand> _logger;
3333
private readonly IReferenceEventService _referenceEventService;
3434
private readonly IPushNotificationService _pushService;
35-
private readonly IOrganizationRepository _organizationRepository;
3635
private readonly IProviderUserRepository _providerUserRepository;
3736
public DeleteClaimedOrganizationUserAccountCommand(
3837
IUserService userService,
@@ -41,21 +40,23 @@ public DeleteClaimedOrganizationUserAccountCommand(
4140
IOrganizationUserRepository organizationUserRepository,
4241
IUserRepository userRepository,
4342
ICurrentContext currentContext,
44-
ILogger<DeleteClaimedOrganizationUserAccountCommand> logger,
4543
IReferenceEventService referenceEventService,
46-
IPushNotificationService pushService)
44+
IPushNotificationService pushService,
45+
IProviderUserRepository providerUserRepository,
46+
ILogger<DeleteClaimedOrganizationUserAccountCommand> logger,
47+
IDeleteClaimedOrganizationUserAccountValidator deleteManagedOrganizationUserAccountValidator)
4748
{
4849
_userService = userService;
4950
_eventService = eventService;
50-
_deleteManagedOrganizationUserAccountValidator = deleteManagedOrganizationUserAccountValidator;
51-
_getOrganizationUsersManagementStatusQuery = _getOrganizationUsersManagementStatusQuery;
5251
_getOrganizationUsersClaimedStatusQuery = getOrganizationUsersClaimedStatusQuery;
5352
_organizationUserRepository = organizationUserRepository;
5453
_userRepository = userRepository;
5554
_currentContext = currentContext;
56-
_logger = logger;
5755
_referenceEventService = referenceEventService;
5856
_pushService = pushService;
57+
_providerUserRepository = providerUserRepository;
58+
_logger = logger;
59+
_deleteManagedOrganizationUserAccountValidator = deleteManagedOrganizationUserAccountValidator;
5960
}
6061

6162
public async Task<CommandResult<DeleteUserResponse>> DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId)
@@ -93,7 +94,7 @@ private async Task<PartialValidationResult<DeleteUserValidationRequest>> Interna
9394
{
9495
var orgUsers = await _organizationUserRepository.GetManyAsync(orgUserIds);
9596
var users = await GetUsersAsync(orgUsers);
96-
var managementStatuses = await _getOrganizationUsersManagementStatusQuery.GetUsersOrganizationManagementStatusAsync(organizationId, orgUserIds);
97+
var managementStatuses = await _getOrganizationUsersClaimedStatusQuery.GetUsersOrganizationClaimedStatusAsync(organizationId, orgUserIds);
9798

9899
var requests = CreateRequests(organizationId, deletingUserId, orgUserIds, orgUsers, users, managementStatuses);
99100
var results = await _deleteManagedOrganizationUserAccountValidator.ValidateAsync(requests);
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers;
1010

11-
public class DeleteManagedOrganizationUserAccountValidator(
11+
public class DeleteClaimedOrganizationUserAccountValidator(
1212
ICurrentContext currentContext,
1313
IOrganizationUserRepository organizationUserRepository,
14-
IProviderUserRepository providerUserRepository) : IDeleteManagedOrganizationUserAccountValidator
14+
IProviderUserRepository providerUserRepository) : IDeleteClaimedOrganizationUserAccountValidator
1515
{
1616
public async Task<PartialValidationResult<DeleteUserValidationRequest>> ValidateAsync(List<DeleteUserValidationRequest> requests)
1717
{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
44

5-
public interface IDeleteManagedOrganizationUserAccountValidator
5+
public interface IDeleteClaimedOrganizationUserAccountValidator
66
{
77
Task<PartialValidationResult<DeleteUserValidationRequest>> ValidateAsync(List<DeleteUserValidationRequest> requests);
88
}

src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private static void AddOrganizationUserCommands(this IServiceCollection services
128128
services.AddScoped<IUpdateOrganizationUserCommand, UpdateOrganizationUserCommand>();
129129
services.AddScoped<IUpdateOrganizationUserGroupsCommand, UpdateOrganizationUserGroupsCommand>();
130130
services.AddScoped<IDeleteClaimedOrganizationUserAccountCommand, DeleteClaimedOrganizationUserAccountCommand>();
131-
services.AddScoped<IDeleteManagedOrganizationUserAccountValidator, DeleteManagedOrganizationUserAccountValidator>();
131+
services.AddScoped<IDeleteClaimedOrganizationUserAccountValidator, DeleteClaimedOrganizationUserAccountValidator>();
132132
services.AddScoped<IConfirmOrganizationUserCommand, ConfirmOrganizationUserCommand>();
133133
}
134134

test/Api.Test/AdminConsole/Controllers/OrganizationUsersControllerTests.cs

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ await Assert.ThrowsAsync<UnauthorizedAccessException>(() =>
360360
sutProvider.Sut.DeleteAccount(orgId, id));
361361
}
362362

363-
<<<<<<< HEAD
364363
// [Theory]
365364
// [BitAutoData]
366365
// public async Task BulkDeleteAccount_WhenUserCanManageUsers_Success(
@@ -369,40 +368,18 @@ await Assert.ThrowsAsync<UnauthorizedAccessException>(() =>
369368
// {
370369
// sutProvider.GetDependency<ICurrentContext>().ManageUsers(orgId).Returns(true);
371370
// sutProvider.GetDependency<IUserService>().GetUserByPrincipalAsync(default).ReturnsForAnyArgs(currentUser);
372-
// sutProvider.GetDependency<IDeleteManagedOrganizationUserAccountCommand>()
371+
// sutProvider.GetDependency<IDeleteClaimedOrganizationUserAccountCommand>()
373372
// .DeleteManyUsersAsync(orgId, model.Ids, currentUser.Id)
374373
// .Returns(deleteResults);
375374
//
376375
// var response = await sutProvider.Sut.BulkDeleteAccount(orgId, model);
377376
//
378377
// Assert.Equal(deleteResults.Count, response.Data.Count());
379378
// Assert.True(response.Data.All(r => deleteResults.Any(res => res.Item1 == r.Id && res.Item2 == r.Error)));
380-
// await sutProvider.GetDependency<IDeleteManagedOrganizationUserAccountCommand>()
379+
// await sutProvider.GetDependency<IDeleteClaimedOrganizationUserAccountCommand>()
381380
// .Received(1)
382381
// .DeleteManyUsersAsync(orgId, model.Ids, currentUser.Id);
383382
// }
384-
=======
385-
[Theory]
386-
[BitAutoData]
387-
public async Task BulkDeleteAccount_WhenUserCanManageUsers_Success(
388-
Guid orgId, OrganizationUserBulkRequestModel model, User currentUser,
389-
List<(Guid, string)> deleteResults, SutProvider<OrganizationUsersController> sutProvider)
390-
{
391-
sutProvider.GetDependency<ICurrentContext>().ManageUsers(orgId).Returns(true);
392-
sutProvider.GetDependency<IUserService>().GetUserByPrincipalAsync(default).ReturnsForAnyArgs(currentUser);
393-
sutProvider.GetDependency<IDeleteClaimedOrganizationUserAccountCommand>()
394-
.DeleteManyUsersAsync(orgId, model.Ids, currentUser.Id)
395-
.Returns(deleteResults);
396-
397-
var response = await sutProvider.Sut.BulkDeleteAccount(orgId, model);
398-
399-
Assert.Equal(deleteResults.Count, response.Data.Count());
400-
Assert.True(response.Data.All(r => deleteResults.Any(res => res.Item1 == r.Id && res.Item2 == r.Error)));
401-
await sutProvider.GetDependency<IDeleteClaimedOrganizationUserAccountCommand>()
402-
.Received(1)
403-
.DeleteManyUsersAsync(orgId, model.Ids, currentUser.Id);
404-
}
405-
>>>>>>> main
406383

407384
[Theory]
408385
[BitAutoData]

0 commit comments

Comments
 (0)