From a70564cea8a3cbec17b4fc723f5d98af0901a5da Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Thu, 2 Dec 2021 10:27:41 -0600
Subject: [PATCH] Families for enterprise/fix new org sponsorship after deleted
 sponsored org (#1740)

* Sponsorship exists only if sponsored org is not null

* Replace existing sponsorship if necessary

* Update src/Core/Services/Implementations/OrganizationSponsorshipService.cs

Co-authored-by: Robyn MacCallum <nickersthecat@gmail.com>

* Fix tests

Co-authored-by: Robyn MacCallum <nickersthecat@gmail.com>
---
 .../Implementations/OrganizationSponsorshipService.cs  | 10 ++++++++--
 .../Services/OrganizationSponsorshipServiceTests.cs    |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Core/Services/Implementations/OrganizationSponsorshipService.cs b/src/Core/Services/Implementations/OrganizationSponsorshipService.cs
index faf1967979..8dbd07e38b 100644
--- a/src/Core/Services/Implementations/OrganizationSponsorshipService.cs
+++ b/src/Core/Services/Implementations/OrganizationSponsorshipService.cs
@@ -98,7 +98,7 @@ namespace Bit.Core.Services
 
             var existingOrgSponsorship = await _organizationSponsorshipRepository
                 .GetBySponsoringOrganizationUserIdAsync(sponsoringOrgUser.Id);
-            if (existingOrgSponsorship != null)
+            if (existingOrgSponsorship?.SponsoredOrganizationId != null)
             {
                 throw new BadRequestException("Can only sponsor one organization per Organization User.");
             }
@@ -113,9 +113,15 @@ namespace Bit.Core.Services
                 CloudSponsor = true,
             };
 
+            if (existingOrgSponsorship != null)
+            {
+                // Replace existing invalid offer with our new sponsorship offer
+                sponsorship.Id = existingOrgSponsorship.Id;
+            }
+
             try
             {
-                sponsorship = await _organizationSponsorshipRepository.CreateAsync(sponsorship);
+                await _organizationSponsorshipRepository.UpsertAsync(sponsorship);
 
                 await SendSponsorshipOfferAsync(sponsorship, sponsoringUserEmail);
             }
diff --git a/test/Core.Test/Services/OrganizationSponsorshipServiceTests.cs b/test/Core.Test/Services/OrganizationSponsorshipServiceTests.cs
index c17a4d21ba..ebd1c05a09 100644
--- a/test/Core.Test/Services/OrganizationSponsorshipServiceTests.cs
+++ b/test/Core.Test/Services/OrganizationSponsorshipServiceTests.cs
@@ -139,7 +139,7 @@ namespace Bit.Core.Test.Services
             };
 
             await sutProvider.GetDependency<IOrganizationSponsorshipRepository>().Received(1)
-                .CreateAsync(Arg.Is<OrganizationSponsorship>(s => SponsorshipValidator(s, expectedSponsorship)));
+                .UpsertAsync(Arg.Is<OrganizationSponsorship>(s => SponsorshipValidator(s, expectedSponsorship)));
 
             await sutProvider.GetDependency<IMailService>().Received(1).
                 SendFamiliesForEnterpriseOfferEmailAsync(sponsoredEmail, email,
@@ -156,7 +156,7 @@ namespace Bit.Core.Test.Services
 
             var expectedException = new Exception();
             OrganizationSponsorship createdSponsorship = null;
-            sutProvider.GetDependency<IOrganizationSponsorshipRepository>().CreateAsync(default).ThrowsForAnyArgs(callInfo =>
+            sutProvider.GetDependency<IOrganizationSponsorshipRepository>().UpsertAsync(default).ThrowsForAnyArgs(callInfo =>
             {
                 createdSponsorship = callInfo.ArgAt<OrganizationSponsorship>(0);
                 createdSponsorship.Id = Guid.NewGuid();