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

[AC-2950] Added logs when validating an existing sponsorship (#4592)

Browse Source 
* Added logs when validating an existing sponsorship

* Removed early return in CancelSponsorshipAsync when validating a sponsorship

* Added missing logging messages
This commit is contained in:
Conner Turnbull 2024-08-21 15:20:53 -04:00 committed by GitHub
parent b9d75326a7
commit dcc199bcce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 77 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/Core/OrganizationFeatures/OrganizationSponsorships/FamiliesForEnterprise/Cloud/ValidateSponsorshipCommand.cs
View File

@ -28,8 +28,10 @@ public class ValidateSponsorshipCommand : CancelSponsorshipCommand, IValidateSpo
public async Task<bool> ValidateSponsorshipAsync(Guid sponsoredOrganizationId) public async Task<bool> ValidateSponsorshipAsync(Guid sponsoredOrganizationId)
{ {
var sponsoredOrganization = await _organizationRepository.GetByIdAsync(sponsoredOrganizationId); var sponsoredOrganization = await _organizationRepository.GetByIdAsync(sponsoredOrganizationId);
if (sponsoredOrganization == null) if (sponsoredOrganization == null)
{ {
_logger.LogWarning("Sponsored Organization {OrganizationId} does not exist", sponsoredOrganizationId);
return false; return false;
} }
@ -38,39 +40,108 @@ public class ValidateSponsorshipCommand : CancelSponsorshipCommand, IValidateSpo
if (existingSponsorship == null) if (existingSponsorship == null)
{ {
_logger.LogWarning("Existing sponsorship for sponsored Organization {SponsoredOrganizationId} does not exist", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, null); await CancelSponsorshipAsync(sponsoredOrganization, null);
return false; return false;
} }
if (existingSponsorship.SponsoringOrganizationId == null || existingSponsorship.SponsoringOrganizationUserId == default || existingSponsorship.PlanSponsorshipType == null) if (existingSponsorship.SponsoringOrganizationId == null)
{ {
_logger.LogWarning("Sponsoring OrganizationId is null for sponsored Organization {SponsoredOrganizationId}", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship); await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false; return false;
} }
if (existingSponsorship.SponsoringOrganizationUserId == default)
{
_logger.LogWarning("Sponsoring OrganizationUserId is null for sponsored Organization {SponsoredOrganizationId}", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
if (existingSponsorship.PlanSponsorshipType == null)
{
_logger.LogWarning("PlanSponsorshipType is null for sponsored Organization {SponsoredOrganizationId}", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
if (existingSponsorship.SponsoringOrganizationId == null)
{
_logger.LogWarning("Sponsoring OrganizationId is null for sponsored Organization {SponsoredOrganizationId}", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
if (existingSponsorship.SponsoringOrganizationUserId == default)
{
_logger.LogWarning("Sponsoring OrganizationUserId is null for sponsored Organization {SponsoredOrganizationId}", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
if (existingSponsorship.PlanSponsorshipType == null)
{
_logger.LogWarning("PlanSponsorshipType is null for sponsored Organization {SponsoredOrganizationId}", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
var sponsoredPlan = Utilities.StaticStore.GetSponsoredPlan(existingSponsorship.PlanSponsorshipType.Value); var sponsoredPlan = Utilities.StaticStore.GetSponsoredPlan(existingSponsorship.PlanSponsorshipType.Value);
var sponsoringOrganization = await _organizationRepository var sponsoringOrganization = await _organizationRepository
.GetByIdAsync(existingSponsorship.SponsoringOrganizationId.Value); .GetByIdAsync(existingSponsorship.SponsoringOrganizationId.Value);
if (sponsoringOrganization == null) if (sponsoringOrganization == null)
{ {
_logger.LogWarning("Sponsoring Organization {SponsoringOrganizationId} does not exist", existingSponsorship.SponsoringOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship); await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false; return false;
} }
var sponsoringOrgPlan = Utilities.StaticStore.GetPlan(sponsoringOrganization.PlanType); var sponsoringOrgPlan = Utilities.StaticStore.GetPlan(sponsoringOrganization.PlanType);
if (OrgDisabledForMoreThanGracePeriod(sponsoringOrganization) ||
sponsoredPlan.SponsoringProductTierType != sponsoringOrgPlan.ProductTier || if (OrgDisabledForMoreThanGracePeriod(sponsoringOrganization))
existingSponsorship.ToDelete ||
SponsorshipIsSelfHostedOutOfSync(existingSponsorship))
{ {
_logger.LogWarning("Sponsoring Organization {SponsoringOrganizationId} is disabled for more than 3 months.", sponsoringOrganization.Id);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship); await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false; return false;
} }
if (sponsoredPlan.SponsoringProductTierType != sponsoringOrgPlan.ProductTier)
{
_logger.LogWarning("Sponsoring Organization {SponsoringOrganizationId} is not on the required product type.", sponsoringOrganization.Id);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
if (existingSponsorship.ToDelete)
{
_logger.LogWarning("Sponsorship for sponsored Organization {SponsoredOrganizationId} is marked for deletion", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
if (SponsorshipIsSelfHostedOutOfSync(existingSponsorship))
{
_logger.LogWarning("Sponsorship for sponsored Organization {SponsoredOrganizationId} is out of sync with self-hosted instance.", sponsoredOrganizationId);
await CancelSponsorshipAsync(sponsoredOrganization, existingSponsorship);
return false;
}
_logger.LogInformation("Sponsorship for sponsored Organization {SponsoredOrganizationId} is valid", sponsoredOrganizationId);
return true; return true;
} }
protected async Task CancelSponsorshipAsync(Organization sponsoredOrganization, OrganizationSponsorship sponsorship = null) private async Task CancelSponsorshipAsync(Organization sponsoredOrganization, OrganizationSponsorship sponsorship = null)
{ {
if (sponsoredOrganization != null) if (sponsoredOrganization != null)
{ {