bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-22 19:23:45 +00:00
Code Issues Releases Wiki Activity

Add the expiration date (#6191)

Browse Source
This commit is contained in:
cyprain-okeke
2025-08-19 15:53:54 +01:00
committed by GitHub
parent ae1e9a2aed
commit 29d6288b27
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Billing/Licenses/Extensions/LicenseExtensions.cs
View File

@@ -3,7 +3,6 @@
using System.Security.Claims; using System.Security.Claims;
using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Enums;
using Bit.Core.Models.Business; using Bit.Core.Models.Business;
namespace Bit.Core.Billing.Licenses.Extensions; namespace Bit.Core.Billing.Licenses.Extensions;
@@ -14,7 +13,7 @@ public static class LicenseExtensions
{ {
if (subscriptionInfo?.Subscription == null) if (subscriptionInfo?.Subscription == null)
{ {
if (org.PlanType == PlanType.Custom && org.ExpirationDate.HasValue) if (org.ExpirationDate.HasValue)
{ {
return org.ExpirationDate.Value; return org.ExpirationDate.Value;
} }

3
src/Core/Billing/Licenses/Services/Implementations/OrganizationLicenseClaimsFactory.cs
View File

@@ -4,7 +4,6 @@
using System.Globalization; using System.Globalization;
using System.Security.Claims; using System.Security.Claims;
using Bit.Core.AdminConsole.Entities; using Bit.Core.AdminConsole.Entities;
using Bit.Core.Billing.Enums;
using Bit.Core.Billing.Licenses.Extensions; using Bit.Core.Billing.Licenses.Extensions;
using Bit.Core.Billing.Licenses.Models; using Bit.Core.Billing.Licenses.Models;
using Bit.Core.Enums; using Bit.Core.Enums;
@@ -121,6 +120,6 @@ public class OrganizationLicenseClaimsFactory : ILicenseClaimsFactory<Organizati
private static bool IsTrialing(Organization org, SubscriptionInfo subscriptionInfo) => private static bool IsTrialing(Organization org, SubscriptionInfo subscriptionInfo) =>
subscriptionInfo?.Subscription is null subscriptionInfo?.Subscription is null
? org.PlanType != PlanType.Custom || !org.ExpirationDate.HasValue ? !org.ExpirationDate.HasValue
: subscriptionInfo.Subscription.TrialEndDate > DateTime.UtcNow; : subscriptionInfo.Subscription.TrialEndDate > DateTime.UtcNow;
} }

2
src/Core/Billing/Organizations/Models/OrganizationLicense.cs
View File

@@ -98,7 +98,7 @@ public class OrganizationLicense : ILicense
if (subscriptionInfo?.Subscription == null) if (subscriptionInfo?.Subscription == null)
{ {
if (org.PlanType == PlanType.Custom && org.ExpirationDate.HasValue) if (org.ExpirationDate.HasValue)
{ {
Expires = Refresh = org.ExpirationDate.Value; Expires = Refresh = org.ExpirationDate.Value;
Trial = false; Trial = false;