From abe0d2c82abdbe2e825420fd3a43e006c7667344 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 25 Oct 2022 19:54:35 +0000 Subject: [PATCH] case 4217 --- Controllers/RvfController.cs | 21 ++++++------- util/RavenKeyFactory.cs | 58 ++++++++++++++++++------------------ 2 files changed, 40 insertions(+), 39 deletions(-) diff --git a/Controllers/RvfController.cs b/Controllers/RvfController.cs index 18d37c7..f93f698 100644 --- a/Controllers/RvfController.cs +++ b/Controllers/RvfController.cs @@ -38,16 +38,17 @@ namespace rockfishCore.Controllers string FetchRequestDbId = fetchRequest.DbId; - if (dtt) - { - return Ok(new - { - data = new - { - key = RavenKeyFactory.GetRavenTestKey(FetchRequestDbId, pp)//pp means perpetual no pp means subcription - } - }); - } + //removed from release build 2022-10-25 + // if (dtt) + // { + // return Ok(new + // { + // data = new + // { + // key = RavenKeyFactory.GetRavenTestKey(FetchRequestDbId, pp)//pp means perpetual no pp means subcription + // } + // }); + // } string LicenseKey = null; //check for a key for this dbid, first check licensed then check trial diff --git a/util/RavenKeyFactory.cs b/util/RavenKeyFactory.cs index a4ff8de..18cf5b7 100644 --- a/util/RavenKeyFactory.cs +++ b/util/RavenKeyFactory.cs @@ -245,38 +245,38 @@ namespace rockfishCore.Util } - //TESTING ONLY 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 - AyaNovaLicenseKey k = new AyaNovaLicenseKey(); - k.LicenseFormat = "8"; - k.RegisteredTo = "GZ TestCo Inc."; - k.DbId = dbid; - k.Perpetual = Perpetual; - if (Perpetual) - { - k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddDays(TRIAL_PERIOD_DAYS); - //5k inside staff users will cover huge seeding level easily - k.Features.Add(new LicenseFeature() { Feature = ACTIVE_INTERNAL_USERS_FEATURE_NAME, Count = 5000 }); - } - else - { - //SUBSCRIPTION - k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddDays(TRIAL_PERIOD_DAYS); + // //TESTING ONLY 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 + // AyaNovaLicenseKey k = new AyaNovaLicenseKey(); + // k.LicenseFormat = "8"; + // k.RegisteredTo = "GZ TestCo Inc."; + // k.DbId = dbid; + // k.Perpetual = Perpetual; + // if (Perpetual) + // { + // k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddDays(TRIAL_PERIOD_DAYS); + // //5k inside staff users will cover huge seeding level easily + // k.Features.Add(new LicenseFeature() { Feature = ACTIVE_INTERNAL_USERS_FEATURE_NAME, Count = 5000 }); + // } + // else + // { + // //SUBSCRIPTION + // k.MaintenanceExpiration = k.LicenseExpiration = DateTime.UtcNow.AddDays(TRIAL_PERIOD_DAYS); - //20k customer contacts will cover huge seeding level easily - //5k inside staff users will cover huge seeding level easily - k.Features.Add(new LicenseFeature() { Feature = ACTIVE_INTERNAL_USERS_FEATURE_NAME, Count = 5000 }); - k.Features.Add(new LicenseFeature() { Feature = ACTIVE_CUSTOMER_USERS_FEATURE_NAME, Count = 20000 }); - k.Features.Add(new LicenseFeature() { Feature = MAXIMUM_DATA_GB_FEATURE_NAME, Count = 20 }); + // //20k customer contacts will cover huge seeding level easily + // //5k inside staff users will cover huge seeding level easily + // k.Features.Add(new LicenseFeature() { Feature = ACTIVE_INTERNAL_USERS_FEATURE_NAME, Count = 5000 }); + // k.Features.Add(new LicenseFeature() { Feature = ACTIVE_CUSTOMER_USERS_FEATURE_NAME, Count = 20000 }); + // k.Features.Add(new LicenseFeature() { Feature = MAXIMUM_DATA_GB_FEATURE_NAME, Count = 20 }); - } + // } - k.Features.Add(new LicenseFeature() { Feature = TRIAL_FEATURE_NAME, Count = 0 }); - return GenerateRavenKey(k); - } + // k.Features.Add(new LicenseFeature() { Feature = TRIAL_FEATURE_NAME, Count = 0 }); + // return GenerateRavenKey(k); + // } ///