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

fix tests

Browse Source
This commit is contained in:
Brandon 2025-06-11 12:06:22 -04:00
parent e309c3cc2f
commit a5055fe120
No known key found for this signature in database
GPG Key ID: A0E0EF0B207BA40D
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommand.cs
View File

@ -338,7 +338,7 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA
group.CreationDate = group.RevisionDate = DateTime.UtcNow; group.CreationDate = group.RevisionDate = DateTime.UtcNow;
savedGroups.Add(await _groupRepository.CreateAsync(group)); savedGroups.Add(await _groupRepository.CreateAsync(group));
await UpdateUsersAsync(group, importGroupData.GroupsDict[group.ExternalId].ExternalUserIds, await UpdateUsersAsync(group, importGroupData.GroupsDict[group.ExternalId!].ExternalUserIds,
importUserData.ExistingExternalUsersIdDict); importUserData.ExistingExternalUsersIdDict);
} }
@ -359,7 +359,7 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA
Organization organization) Organization organization)
{ {
var updateGroups = importGroupData.ExistingExternalGroups var updateGroups = importGroupData.ExistingExternalGroups
.Where(g => importGroupData.GroupsDict.ContainsKey(g.ExternalId)) .Where(g => importGroupData.GroupsDict.ContainsKey(g.ExternalId!))
.ToList(); .ToList();
if (updateGroups.Any()) if (updateGroups.Any())
@ -373,7 +373,7 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA
foreach (var group in updateGroups) foreach (var group in updateGroups)
{ {
// Check for changes to the group, update if changed. // Check for changes to the group, update if changed.
var updatedGroup = importGroupData.GroupsDict[group.ExternalId].Group; var updatedGroup = importGroupData.GroupsDict[group.ExternalId!].Group;
if (group.Name != updatedGroup.Name) if (group.Name != updatedGroup.Name)
{ {
group.RevisionDate = DateTime.UtcNow; group.RevisionDate = DateTime.UtcNow;
@ -383,7 +383,7 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA
} }
// compare and update user group associations // compare and update user group associations
await UpdateUsersAsync(group, importGroupData.GroupsDict[group.ExternalId].ExternalUserIds, await UpdateUsersAsync(group, importGroupData.GroupsDict[group.ExternalId!].ExternalUserIds,
importUserData.ExistingExternalUsersIdDict, importUserData.ExistingExternalUsersIdDict,
existingGroupUsers.ContainsKey(group.Id) ? existingGroupUsers[group.Id] : null); existingGroupUsers.ContainsKey(group.Id) ? existingGroupUsers[group.Id] : null);

2
src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs
View File

@ -197,7 +197,7 @@ public static class OrganizationServiceCollectionExtensions
services.AddScoped<IInviteUsersPasswordManagerValidator, InviteUsersPasswordManagerValidator>(); services.AddScoped<IInviteUsersPasswordManagerValidator, InviteUsersPasswordManagerValidator>();
services.AddScoped<IInviteUsersEnvironmentValidator, InviteUsersEnvironmentValidator>(); services.AddScoped<IInviteUsersEnvironmentValidator, InviteUsersEnvironmentValidator>();
services.AddScoped<IInitPendingOrganizationCommand, InitPendingOrganizationCommand>(); services.AddScoped<IInitPendingOrganizationCommand, InitPendingOrganizationCommand>();
services.AddScoped<IImportOrganizationUserCommand, ImportOrganizationUserCommand>(); services.AddScoped<IImportOrganizationUsersAndGroupsCommand, ImportOrganizationUsersAndGroupsCommand>();
} }
// TODO: move to OrganizationSubscriptionServiceCollectionExtensions when OrganizationUser methods are moved out of // TODO: move to OrganizationSubscriptionServiceCollectionExtensions when OrganizationUser methods are moved out of

9
test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs → test/Core.Test/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommandTests.cs
View File

@ -1,4 +1,5 @@
using Bit.Core.AdminConsole.Models.Business; using Bit.Core.AdminConsole.Models.Business;
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers;
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers; using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers;
using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models; using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models;
using Bit.Core.AdminConsole.Utilities.Commands; using Bit.Core.AdminConsole.Utilities.Commands;
@ -21,14 +22,14 @@ using Organization = Bit.Core.AdminConsole.Entities.Organization;
namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers; namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers;
public class ImportOrganizationUserCommandTests public class ImportOrganizationUsersAndGroupsCommandTests
{ {
private readonly IDataProtectorTokenFactory<OrgUserInviteTokenable> _orgUserInviteTokenDataFactory = new FakeDataProtectorTokenFactory<OrgUserInviteTokenable>(); private readonly IDataProtectorTokenFactory<OrgUserInviteTokenable> _orgUserInviteTokenDataFactory = new FakeDataProtectorTokenFactory<OrgUserInviteTokenable>();
[Theory, PaidOrganizationCustomize, BitAutoData] [Theory, PaidOrganizationCustomize, BitAutoData]
public async Task OrgImportCallsInviteOrgUserCommand( public async Task OrgImportCallsInviteOrgUserCommand(
SutProvider<ImportOrganizationUserCommand> sutProvider, SutProvider<ImportOrganizationUsersAndGroupsCommand> sutProvider,
Organization org, Organization org,
List<OrganizationUserUserDetails> existingUsers, List<OrganizationUserUserDetails> existingUsers,
List<ImportedOrganizationUser> newUsers, List<ImportedOrganizationUser> newUsers,
@ -75,7 +76,7 @@ public class ImportOrganizationUserCommandTests
[Theory, PaidOrganizationCustomize, BitAutoData] [Theory, PaidOrganizationCustomize, BitAutoData]
public async Task OrgImportCreateNewUsersAndMarryExistingUser( public async Task OrgImportCreateNewUsersAndMarryExistingUser(
SutProvider<ImportOrganizationUserCommand> sutProvider, SutProvider<ImportOrganizationUsersAndGroupsCommand> sutProvider,
Organization org, Organization org,
List<OrganizationUserUserDetails> existingUsers, List<OrganizationUserUserDetails> existingUsers,
List<ImportedOrganizationUser> newUsers, List<ImportedOrganizationUser> newUsers,
@ -130,7 +131,7 @@ public class ImportOrganizationUserCommandTests
} }
private void SetupOrganizationConfigForImport( private void SetupOrganizationConfigForImport(
SutProvider<ImportOrganizationUserCommand> sutProvider, SutProvider<ImportOrganizationUsersAndGroupsCommand> sutProvider,
Organization org, Organization org,
List<OrganizationUserUserDetails> existingUsers, List<OrganizationUserUserDetails> existingUsers,
List<ImportedOrganizationUser> newUsers) List<ImportedOrganizationUser> newUsers)