nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-27 22:26:13 -05:00
Code

cr feedback

Browse Source
This commit is contained in:
Brandon 2025-06-24 10:12:27 -04:00
parent 08549c5ac6
commit a786032b1e
No known key found for this signature in database
GPG Key ID: A0E0EF0B207BA40D
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,19 +196,8 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA
OrganizationUserImportData importUserData) OrganizationUserImportData importUserData)
{ {
// Determine which users are already in the organization // Determine which users are already in the organization
var existingUsersSet = new HashSet<string>(importUserData.ExistingExternalUsersIdDict.Keys).ToList(); var existingUsersSet = new HashSet<string>(importUserData.ExistingExternalUsersIdDict.Keys);
var usersToAdd = importUserData.ImportedExternalIds.Except(existingUsersSet).ToList(); var usersToAdd = importUserData.ImportedExternalIds.Except(existingUsersSet).ToList();
var seatsAvailable = int.MaxValue;
var enoughSeatsAvailable = true;
if (organization.Seats.HasValue)
{
var occupiedSeats = await _organizationRepository.GetOccupiedSeatCountByOrganizationIdAsync(organization.Id);
seatsAvailable = organization.Seats.Value - occupiedSeats.Total;
enoughSeatsAvailable = seatsAvailable >= usersToAdd.Count;
}
var userInvites = new List<(OrganizationUserInvite, string)>(); var userInvites = new List<(OrganizationUserInvite, string)>();
var hasStandaloneSecretsManager = await _paymentService.HasSecretsManagerStandalone(organization); var hasStandaloneSecretsManager = await _paymentService.HasSecretsManagerStandalone(organization);

6
test/Api.IntegrationTest/AdminConsole/Import/ImportOrganizationUsersAndGroupsCommandTests.cs
View File

@ -193,7 +193,7 @@ public class ImportOrganizationUsersAndGroupsCommandTests : IClassFixture<ApiApp
new OrganizationImportRequestModel.OrganizationImportGroupRequestModel new OrganizationImportRequestModel.OrganizationImportGroupRequestModel
{ {
Name = group.Name, Name = group.Name,
ExternalId = group.ExternalId, ExternalId = Guid.NewGuid().ToString(),
MemberExternalIds = [] MemberExternalIds = []
} }
]; ];
@ -267,13 +267,13 @@ public class ImportOrganizationUsersAndGroupsCommandTests : IClassFixture<ApiApp
new OrganizationImportRequestModel.OrganizationImportGroupRequestModel new OrganizationImportRequestModel.OrganizationImportGroupRequestModel
{ {
Name = existingGroup.Name, Name = existingGroup.Name,
ExternalId = existingGroup.ExternalId, ExternalId = Guid.NewGuid().ToString(),
MemberExternalIds = [] MemberExternalIds = []
}, },
new OrganizationImportRequestModel.OrganizationImportGroupRequestModel new OrganizationImportRequestModel.OrganizationImportGroupRequestModel
{ {
Name = newGroup.Name, Name = newGroup.Name,
ExternalId = newGroup.ExternalId, ExternalId = Guid.NewGuid().ToString(),
MemberExternalIds = [] MemberExternalIds = []
} }
]; ];

2
test/Api.IntegrationTest/Helpers/OrganizationTestHelpers.cs
View File

@ -141,7 +141,7 @@ public static class OrganizationTestHelpers
{ {
OrganizationId = organizationId, OrganizationId = organizationId,
Id = new Guid(), Id = new Guid(),
ExternalId = new Guid().ToString(), ExternalId = Guid.NewGuid().ToString(),
Name = "bwtest" Name = "bwtest"
}; };