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

Throw error if not enough seats available for a sync (#1241)

Browse Source 
* BadRequest if a sync cannot be completed due to seat count

* Comment the reason for the suppressed exception
This commit is contained in:
Matt Gibson 2021-03-25 08:42:04 -05:00 committed by GitHub
parent c09ae5f906
commit 584d3e771c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -1515,32 +1515,35 @@ namespace Bit.Core.Services
enoughSeatsAvailable = seatsAvailable >= usersToAdd.Count; enoughSeatsAvailable = seatsAvailable >= usersToAdd.Count;
} }
if (enoughSeatsAvailable) if (!enoughSeatsAvailable)
{ {
foreach (var user in newUsers) throw new BadRequestException($"Organization does not have enough seats available. Need {usersToAdd.Count} but {seatsAvailable} available.");
{ }
if (!usersToAdd.Contains(user.ExternalId) || string.IsNullOrWhiteSpace(user.Email))
{
continue;
}
try foreach (var user in newUsers)
{
if (!usersToAdd.Contains(user.ExternalId) || string.IsNullOrWhiteSpace(user.Email))
{
continue;
}
try
{
var invite = new OrganizationUserInvite
{ {
var invite = new OrganizationUserInvite Emails = new List<string> { user.Email },
{ Type = OrganizationUserType.User,
Emails = new List<string> { user.Email }, AccessAll = false,
Type = OrganizationUserType.User, Collections = new List<SelectionReadOnly>(),
AccessAll = false, };
Collections = new List<SelectionReadOnly>(), var newUser = await InviteUserAsync(organizationId, importingUserId, user.Email,
}; OrganizationUserType.User, false, user.ExternalId, new List<SelectionReadOnly>());
var newUser = await InviteUserAsync(organizationId, importingUserId, user.Email, existingExternalUsersIdDict.Add(newUser.ExternalId, newUser.Id);
OrganizationUserType.User, false, user.ExternalId, new List<SelectionReadOnly>()); }
existingExternalUsersIdDict.Add(newUser.ExternalId, newUser.Id); catch (BadRequestException)
} {
catch (BadRequestException) // Thrown when the user is already invited to the organization
{ continue;
continue;
}
} }
} }
} }