From 694347e8d3383216c6c4f0795c8f60f5a2d720ff Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Fri, 19 Mar 2021 08:05:57 +1000
Subject: [PATCH] Fix no licence expiration date on self-hosted (#1217)

* Use our expiration date if no next billing date

* Remove unnecessary null checks

* Remove null check
---
 src/Core/Models/Business/UserLicense.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Core/Models/Business/UserLicense.cs b/src/Core/Models/Business/UserLicense.cs
index 1c301fc253..313b7223d9 100644
--- a/src/Core/Models/Business/UserLicense.cs
+++ b/src/Core/Models/Business/UserLicense.cs
@@ -26,7 +26,9 @@ namespace Bit.Core.Models.Business
             Premium = user.Premium;
             MaxStorageGb = user.MaxStorageGb;
             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;
             Trial = (subscriptionInfo?.Subscription?.TrialEndDate.HasValue ?? false) &&
                 subscriptionInfo.Subscription.TrialEndDate.Value > DateTime.UtcNow;