From b1443b4f9475424a313c48035bda5c86c27a637e Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 15 Aug 2017 14:58:17 -0400 Subject: [PATCH] added refresh date to license files --- src/Core/Models/Business/ILicense.cs | 1 + src/Core/Models/Business/OrganizationLicense.cs | 4 +++- src/Core/Models/Business/UserLicense.cs | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Core/Models/Business/ILicense.cs b/src/Core/Models/Business/ILicense.cs index b1388f04a4..7f79108abe 100644 --- a/src/Core/Models/Business/ILicense.cs +++ b/src/Core/Models/Business/ILicense.cs @@ -8,6 +8,7 @@ namespace Bit.Core.Models.Business string LicenseKey { get; set; } int Version { get; set; } DateTime Issued { get; set; } + DateTime? Refresh { get; set; } DateTime? Expires { get; set; } bool Trial { get; set; } string Signature { get; set; } diff --git a/src/Core/Models/Business/OrganizationLicense.cs b/src/Core/Models/Business/OrganizationLicense.cs index 0478dc66fb..6b5c61d92c 100644 --- a/src/Core/Models/Business/OrganizationLicense.cs +++ b/src/Core/Models/Business/OrganizationLicense.cs @@ -52,6 +52,7 @@ namespace Bit.Core.Models.Business public bool SelfHost { get; set; } public int Version { get; set; } public DateTime Issued { get; set; } + public DateTime? Refresh { get; set; } public DateTime? Expires { get; set; } public bool Trial { get; set; } public string Signature { get; set; } @@ -62,9 +63,10 @@ namespace Bit.Core.Models.Business string data = null; if(Version == 1) { - data = string.Format("organization:{0}_{1}_{2}_{3}_{4}_{5}_{6}_{7}_{8}_{9}_{10}_{11}_{12}_{13}_{14}", + data = string.Format("organization:{0}_{1}_{2}_{3}_{4}_{5}_{6}_{7}_{8}_{9}_{10}_{11}_{12}_{13}_{14}_{15}", Version, Utilities.CoreHelpers.ToEpocSeconds(Issued), + Refresh.HasValue ? Utilities.CoreHelpers.ToEpocSeconds(Refresh.Value).ToString() : null, Expires.HasValue ? Utilities.CoreHelpers.ToEpocSeconds(Expires.Value).ToString() : null, LicenseKey, InstallationId, diff --git a/src/Core/Models/Business/UserLicense.cs b/src/Core/Models/Business/UserLicense.cs index 492314ba6d..926ff91a69 100644 --- a/src/Core/Models/Business/UserLicense.cs +++ b/src/Core/Models/Business/UserLicense.cs @@ -35,6 +35,7 @@ namespace Bit.Core.Models.Business public short? MaxStorageGb { get; set; } public int Version { get; set; } public DateTime Issued { get; set; } + public DateTime? Refresh { get; set; } public DateTime? Expires { get; set; } public bool Trial { get; set; } public string Signature { get; set; } @@ -46,9 +47,10 @@ namespace Bit.Core.Models.Business string data = null; if(Version == 1) { - data = string.Format("user:{0}_{1}_{2}_{3}_{4}_{5}_{6}_{7}_{8}", + data = string.Format("user:{0}_{1}_{2}_{3}_{4}_{5}_{6}_{7}_{8}_{9}", Version, Utilities.CoreHelpers.ToEpocSeconds(Issued), + Refresh.HasValue ? Utilities.CoreHelpers.ToEpocSeconds(Refresh.Value).ToString() : null, Expires.HasValue ? Utilities.CoreHelpers.ToEpocSeconds(Expires.Value).ToString() : null, LicenseKey, Trial,