From 584d3e771cf0974fab27cf2b0302747a40d8d37e Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Thu, 25 Mar 2021 08:42:04 -0500
Subject: [PATCH] Throw error if not enough seats available for a sync (#1241)

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

* Comment the reason for the suppressed exception
---
 .../Implementations/OrganizationService.cs    | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs
index 66ec725202..2850996e53 100644
--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -1515,32 +1515,35 @@ namespace Bit.Core.Services
                     enoughSeatsAvailable = seatsAvailable >= usersToAdd.Count;
                 }
 
-                if (enoughSeatsAvailable)
+                if (!enoughSeatsAvailable) 
                 {
-                    foreach (var user in newUsers)
-                    {
-                        if (!usersToAdd.Contains(user.ExternalId) || string.IsNullOrWhiteSpace(user.Email))
-                        {
-                            continue;
-                        }
+                    throw new BadRequestException($"Organization does not have enough seats available. Need {usersToAdd.Count} but {seatsAvailable} available.");
+                }
 
-                        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,
-                                AccessAll = false,
-                                Collections = new List<SelectionReadOnly>(),
-                            };
-                            var newUser = await InviteUserAsync(organizationId, importingUserId, user.Email, 
-                                    OrganizationUserType.User, false, user.ExternalId, new List<SelectionReadOnly>());
-                            existingExternalUsersIdDict.Add(newUser.ExternalId, newUser.Id);
-                        }
-                        catch (BadRequestException)
-                        {
-                            continue;
-                        }
+                            Emails = new List<string> { user.Email },
+                            Type = OrganizationUserType.User,
+                            AccessAll = false,
+                            Collections = new List<SelectionReadOnly>(),
+                        };
+                        var newUser = await InviteUserAsync(organizationId, importingUserId, user.Email, 
+                                OrganizationUserType.User, false, user.ExternalId, new List<SelectionReadOnly>());
+                        existingExternalUsersIdDict.Add(newUser.ExternalId, newUser.Id);
+                    }
+                    catch (BadRequestException)
+                    {
+                        // Thrown when the user is already invited to the organization
+                        continue;
                     }
                 }
             }