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

Removed duplicated expires/refresh logic in the organization license constructor

Browse Source
This commit is contained in:
Conner Turnbull 2025-05-20 16:05:01 -04:00
parent 5e87a23d89
commit de2969badf
No known key found for this signature in database
1 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Core/Models/Business/OrganizationLicense.cs
View File

@ -88,49 +88,21 @@ public class OrganizationLicense : BaseLicense
AllowAdminAccessToAllCollectionItems = org.AllowAdminAccessToAllCollectionItems; AllowAdminAccessToAllCollectionItems = org.AllowAdminAccessToAllCollectionItems;
// //
if (subscriptionInfo?.Subscription == null) // Calculate expiration dates using extension methods
{ Expires = org.CalculateFreshExpirationDate(subscriptionInfo);
if (org.PlanType == PlanType.Custom && org.ExpirationDate.HasValue)
{
Expires = Refresh = org.ExpirationDate.Value;
Trial = false;
}
else
{
Expires = Refresh = Issued.AddDays(7);
Trial = true;
}
}
else if (subscriptionInfo.Subscription.TrialEndDate.HasValue &&
subscriptionInfo.Subscription.TrialEndDate.Value > DateTime.UtcNow)
{
Expires = Refresh = subscriptionInfo.Subscription.TrialEndDate.Value;
Trial = true;
}
else
{
if (org.ExpirationDate.HasValue && org.ExpirationDate.Value < DateTime.UtcNow)
{
// expired
Expires = Refresh = org.ExpirationDate.Value;
}
else if (subscriptionInfo?.Subscription?.PeriodDuration != null &&
subscriptionInfo.Subscription.PeriodDuration > TimeSpan.FromDays(180))
{
Refresh = DateTime.UtcNow.AddDays(30);
Expires = subscriptionInfo.Subscription.PeriodEndDate?.AddDays(Constants
.OrganizationSelfHostSubscriptionGracePeriodDays);
ExpirationWithoutGracePeriod = subscriptionInfo.Subscription.PeriodEndDate;
}
else
{
Expires = org.ExpirationDate.HasValue ? org.ExpirationDate.Value.AddMonths(11) : Issued.AddYears(1);
Refresh = DateTime.UtcNow - Expires > TimeSpan.FromDays(30) ? DateTime.UtcNow.AddDays(30) : Expires;
}
Trial = false; // Since Expires is now assigned, we can safely use it for the other calculations
if (Expires.HasValue)
{
Refresh = org.CalculateFreshRefreshDate(subscriptionInfo, Expires.Value);
ExpirationWithoutGracePeriod = org.CalculateFreshExpirationDateWithoutGracePeriod(subscriptionInfo, Expires.Value);
} }
// Determine if this is a trial license
Trial = subscriptionInfo?.Subscription == null
? (org.PlanType != PlanType.Custom || !org.ExpirationDate.HasValue)
: subscriptionInfo.Subscription.TrialEndDate > DateTime.UtcNow;
UseAdminSponsoredFamilies = org.UseAdminSponsoredFamilies; UseAdminSponsoredFamilies = org.UseAdminSponsoredFamilies;
Hash = Convert.ToBase64String(ComputeHash()); Hash = Convert.ToBase64String(ComputeHash());
Signature = Convert.ToBase64String(licenseService.SignLicense(this)); Signature = Convert.ToBase64String(licenseService.SignLicense(this));