admin/sockeye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2023-01-07 01:33:33 +00:00
parent bf12cdb9ba
commit 248d82b42e
2 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/biz/GlobalBizSettingsBiz.cs
View File

@@ -541,7 +541,7 @@ namespace Sockeye.Biz
*/ */
string keyNoWS = System.Text.RegularExpressions.Regex.Replace(StringUtil.Extract(KeyText, "[KEY", "KEY]").Trim(), "(\"(?:[^\"\\\\]|\\\\.)*\")|\\s+", "$1"); string keyNoWS = System.Text.RegularExpressions.Regex.Replace(StringUtil.Extract(KeyText, "[KEY", "KEY]").Trim(), "(\"(?:[^\"\\\\]|\\\\.)*\")|\\s+", "$1");
var jKey = JObject.Parse(keyNoWS); var jKey = JObject.Parse(keyNoWS);
l.LicenseExpire = DateTime.MaxValue.ToUniversalTime(); l.LicenseExpire = null;
l.MaintenanceExpire = jKey["AyaNovaLicenseKey"]["Expires"].Value<DateTime>().ToUniversalTime(); l.MaintenanceExpire = jKey["AyaNovaLicenseKey"]["Expires"].Value<DateTime>().ToUniversalTime();
l.PGroup = ProductGroup.AyaNova7; l.PGroup = ProductGroup.AyaNova7;
l.FetchCode = jLicense["code"].Value<string>(); l.FetchCode = jLicense["code"].Value<string>();
@@ -559,7 +559,7 @@ namespace Sockeye.Biz
*/ */
string keyNoWS = System.Text.RegularExpressions.Regex.Replace(StringUtil.Extract(KeyText, "[KEY", "KEY]").Trim(), "(\"(?:[^\"\\\\]|\\\\.)*\")|\\s+", "$1"); string keyNoWS = System.Text.RegularExpressions.Regex.Replace(StringUtil.Extract(KeyText, "[KEY", "KEY]").Trim(), "(\"(?:[^\"\\\\]|\\\\.)*\")|\\s+", "$1");
var jKey = JObject.Parse(keyNoWS); var jKey = JObject.Parse(keyNoWS);
l.LicenseExpire = DateTime.MaxValue.ToUniversalTime(); l.LicenseExpire = null;
l.MaintenanceExpire = jKey["AyaNovaLiteLicenseKey"]["Expires"].Value<DateTime>().ToUniversalTime(); l.MaintenanceExpire = jKey["AyaNovaLiteLicenseKey"]["Expires"].Value<DateTime>().ToUniversalTime();
l.PGroup = ProductGroup.AyaNova7; l.PGroup = ProductGroup.AyaNova7;
l.FetchCode = jLicense["code"].Value<string>(); l.FetchCode = jLicense["code"].Value<string>();

53
server/models/License.cs
View File

@@ -21,16 +21,65 @@ namespace Sockeye.Models
[NotMapped] [NotMapped]
public string CustomerViz { get; set; } public string CustomerViz { get; set; }
[Required] [Required]
public ProductGroup PGroup {get;set;} public ProductGroup PGroup { get; set; }
public string RegTo { get; set; } public string RegTo { get; set; }
public string Key { get; set; } public string Key { get; set; }
public string FetchCode { get; set; }//v7 uses public string FetchCode { get; set; }//v7 uses
public string FetchEmail { get; set; }//v7 uses public string FetchEmail { get; set; }//v7 uses
public DateTime? FetchedOn { get; set; } public DateTime? FetchedOn { get; set; }
public string DbId { get; set; }//v8 uses public string DbId { get; set; }//v8 uses
public DateTime LicenseExpire { get; set; } public DateTime? LicenseExpire { get; set; }
public DateTime MaintenanceExpire { get; set; } public DateTime MaintenanceExpire { get; set; }
//V7 props for dto
//not stored in db, hydrated if v7 license and
//used to do the generation from selections at client
[NotMapped]
public bool WBI { get; set; }
[NotMapped]
public DateTime? WBIExpires { get; set; }
[NotMapped]
public bool MBI { get; set; }
[NotMapped]
public DateTime? MBIExpires { get; set; }
[NotMapped]
public bool RI { get; set; }
[NotMapped]
public DateTime? RIExpires { get; set; }
[NotMapped]
public bool QBI { get; set; }
[NotMapped]
public DateTime? QBIExpires { get; set; }
[NotMapped]
public bool QBOI { get; set; }
[NotMapped]
public DateTime? QBOIExpires { get; set; }
[NotMapped]
public bool PTI { get; set; }
[NotMapped]
public DateTime? PTIExpires { get; set; }
[NotMapped]
public bool QuickNotification { get; set; }
[NotMapped]
public DateTime? QuickNotificationExpires { get; set; }
[NotMapped]
public bool ExportToXLS { get; set; }
[NotMapped]
public DateTime? ExportToXLSExpires { get; set; }
[NotMapped]
public bool OutlookSchedule { get; set; }
[NotMapped]
public DateTime? OutlookScheduleExpires { get; set; }
[NotMapped]
public bool OLI { get; set; }
[NotMapped]
public DateTime? OLIExpires { get; set; }
[NotMapped]
public bool ImportExportCSVDuplicate { get; set; }
[NotMapped]
public DateTime? ImportExportCSVDuplicateExpires { get; set; }
public string Wiki { get; set; } public string Wiki { get; set; }
public List<string> Tags { get; set; } public List<string> Tags { get; set; }