From 4d09b37e4c1abc9c601fbc68d5a362e19355f40f Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 17 Aug 2022 00:26:09 +0000
Subject: [PATCH] subscription license code additions

---
 Controllers/RvfController.cs |  4 ++--
 util/RavenKeyFactory.cs      | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Controllers/RvfController.cs b/Controllers/RvfController.cs
index 2eedb76..d71fe35 100644
--- a/Controllers/RvfController.cs
+++ b/Controllers/RvfController.cs
@@ -29,7 +29,7 @@ namespace rockfishCore.Controllers
 
         //### CUSTOMER ROUTE CALLED FROM RAVEN ####
         [HttpPost]
-        public async Task<IActionResult> PostLicenseFetchRequest([FromBody] dtoFetchRequest fetchRequest, [FromQuery] bool dtt)
+        public async Task<IActionResult> PostLicenseFetchRequest([FromBody] dtoFetchRequest fetchRequest, [FromQuery] bool dtt, [FromQuery] bool pp)
         {
             if (!ModelState.IsValid)
             {
@@ -44,7 +44,7 @@ namespace rockfishCore.Controllers
                 {
                     data = new
                     {
-                        key = RavenKeyFactory.GetRavenTestKey(FetchRequestDbId)
+                        key = RavenKeyFactory.GetRavenTestKey(FetchRequestDbId, pp)//pp means perpetual no pp means subcription
                     }
                 });
             }
diff --git a/util/RavenKeyFactory.cs b/util/RavenKeyFactory.cs
index 9df3fb0..6f8ce02 100644
--- a/util/RavenKeyFactory.cs
+++ b/util/RavenKeyFactory.cs
@@ -93,7 +93,7 @@ Plugins:
                         sb.AppendLine("Temporary license for evaluation");
                         continue;
                     }
-                 
+
                     // if (f.Feature == QBI_FEATURE_NAME)
                     // {
                     //     sb.AppendLine("QuickBooks desktop integration option");
@@ -277,14 +277,14 @@ Plugins:
             // k.Id = $"00-{sId}";
             k.RegisteredTo = CompanyName;
             k.DbId = dbid;
-            k.Perpetual=Perpetual;
+            k.Perpetual = Perpetual;
 
             //trial period time limit
             k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddDays(TRIAL_PERIOD_DAYS);
 
             //flag as trial key not regular key
             k.Features.Add(new LicenseFeature() { Feature = TRIAL_FEATURE_NAME, Count = 0 });
-        
+
 
             //add every possible feature
             //k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 });
@@ -341,6 +341,9 @@ Plugins:
                     w.WritePropertyName("DBID");
                     w.WriteValue(k.DbId);
 
+                    w.WritePropertyName("Perpetual");
+                    w.WriteValue(k.Perpetual);
+
                     w.WritePropertyName("LicenseExpiration");
                     w.WriteValue(k.LicenseExpiration);
 
@@ -458,8 +461,9 @@ oArP0E2Vbow3JMxq/oeXmHbrLMLQfYyXwFmciLFigOtkd45bfHdrbA==
 
 
 
-
-        public static string GetRavenTestKey(string dbid)
+        //this is for development purposes only
+        //No external usage
+        public static string GetRavenTestKey(string dbid, bool Perpetual)
         {
 
             //Build a sample test key, sign it and return it
@@ -467,13 +471,10 @@ oArP0E2Vbow3JMxq/oeXmHbrLMLQfYyXwFmciLFigOtkd45bfHdrbA==
             k.LicenseFormat = "8";
             k.RegisteredTo = "GZ TestCo Inc.";
             k.DbId = dbid;
-            // k.Features.Add(new LicenseFeature() { Feature = QBI_FEATURE_NAME, Count = 0 });
-            // k.Features.Add(new LicenseFeature() { Feature = QBOI_FEATURE_NAME, Count = 0 });
-            // k.Features.Add(new LicenseFeature() { Feature = OLI_FEATURE_NAME, Count = 0 });
+            k.Perpetual = Perpetual;
             k.Features.Add(new LicenseFeature() { Feature = SERVICE_TECHS_FEATURE_NAME, Count = 100 });
-            k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddMonths(1);
+            k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddDays(TRIAL_PERIOD_DAYS);
             k.Features.Add(new LicenseFeature() { Feature = TRIAL_FEATURE_NAME, Count = 0 });
-            // k.Features.Add(new LicenseFeature() { Feature = SUBSCRIPTION_FEATURE_NAME, Count = 0 });
             return GenerateRavenKey(k);
         }