Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-01 13:43:23 +01:00
Code Issues Projects Releases Wiki Activity

Fix no licence expiration date on self-hosted (#1217)

Browse Source 
* Use our expiration date if no next billing date

* Remove unnecessary null checks

* Remove null check
This commit is contained in:
Thomas Rittson 2021-03-19 08:05:57 +10:00 committed by GitHub
parent aea85ea0eb
commit 694347e8d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Models/Business/UserLicense.cs
View File

@ -26,7 +26,9 @@ namespace Bit.Core.Models.Business
Premium = user.Premium; Premium = user.Premium;
MaxStorageGb = user.MaxStorageGb; MaxStorageGb = user.MaxStorageGb;
Issued = DateTime.UtcNow; Issued = DateTime.UtcNow;
Expires = subscriptionInfo?.UpcomingInvoice?.Date?.AddDays(7); Expires = subscriptionInfo?.UpcomingInvoice?.Date != null ?
subscriptionInfo.UpcomingInvoice.Date.Value.AddDays(7) :
user.PremiumExpirationDate?.AddDays(7);
Refresh = subscriptionInfo?.UpcomingInvoice?.Date; Refresh = subscriptionInfo?.UpcomingInvoice?.Date;
Trial = (subscriptionInfo?.Subscription?.TrialEndDate.HasValue ?? false) && Trial = (subscriptionInfo?.Subscription?.TrialEndDate.HasValue ?? false) &&
subscriptionInfo.Subscription.TrialEndDate.Value > DateTime.UtcNow; subscriptionInfo.Subscription.TrialEndDate.Value > DateTime.UtcNow;