nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-05 18:12:48 -05:00
Code Activity

Add sponsorship validation to upcoming invoice webhook

Browse Source
This commit is contained in:
Matt Gibson
2021-11-11 14:13:45 -05:00
committed by Justin Baur
parent be6ab1883c
commit 1d34c276e7
7 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Core/Services/Implementations/OrganizationSponsorshipService.cs
View File

@ -133,38 +133,30 @@ namespace Bit.Core.Services
if (existingSponsorship == null)
{
// TODO: null safe this method
await RemoveSponsorshipAsync(sponsoredOrganization, null);
// TODO on fail, mark org as disabled.
return false;
}
var validated = true;
if (existingSponsorship.SponsoringOrganizationId == null || existingSponsorship.SponsoringOrganizationUserId == null)
if (existingSponsorship.SponsoringOrganizationId == null || existingSponsorship.SponsoringOrganizationUserId == null || existingSponsorship.PlanSponsorshipType == null)
{
await RemoveSponsorshipAsync(sponsoredOrganization, existingSponsorship);
validated = false;
return false;
}
var sponsoredPlan = Utilities.StaticStore.GetSponsoredPlan(existingSponsorship.PlanSponsorshipType.Value);
var sponsoringOrganization = await _organizationRepository
.GetByIdAsync(existingSponsorship.SponsoringOrganizationId.Value);
if (!sponsoringOrganization.Enabled)
if (sponsoringOrganization == null)
{
await RemoveSponsorshipAsync(sponsoredOrganization, existingSponsorship);
validated = false;
return false;
}
if (!validated && existingSponsorship.SponsoredOrganizationId != null)
var sponsoringOrgPlan = Utilities.StaticStore.GetPlan(sponsoringOrganization.PlanType);
if (!sponsoringOrganization.Enabled || sponsoredPlan.SponsoringProductType != sponsoringOrgPlan.Product)
{
existingSponsorship.TimesRenewedWithoutValidation += 1;
existingSponsorship.SponsorshipLapsedDate ??= DateTime.UtcNow;
await _organizationSponsorshipRepository.UpsertAsync(existingSponsorship);
if (existingSponsorship.TimesRenewedWithoutValidation >= 6)
{
sponsoredOrganization.Enabled = false;
await _organizationRepository.UpsertAsync(sponsoredOrganization);
}
await RemoveSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
return true;
@ -175,6 +167,10 @@ namespace Bit.Core.Services
await _paymentService.RemoveOrganizationSponsorshipAsync(sponsoredOrganization, sponsorship);
await _organizationRepository.UpsertAsync(sponsoredOrganization);
await _mailService.SendFamiliesForEnterpriseSponsorshipRevertingEmailAsync(
sponsoredOrganization.BillingEmailAddress(),
sponsoredOrganization.Name);
if (sponsorship == null)
{
return;
@ -197,6 +193,5 @@ namespace Bit.Core.Services
await _organizationSponsorshipRepository.UpsertAsync(sponsorship);
}
}
}
}