diff --git a/server/Controllers/RvrController.cs b/server/Controllers/RvrController.cs index 25c164f..81571ad 100644 --- a/server/Controllers/RvrController.cs +++ b/server/Controllers/RvrController.cs @@ -47,7 +47,7 @@ namespace Sockeye.Api.Controllers } #if (DEBUG) - private const string LICENSE_SERVER_URL = "http://localhost:3001/"; + private const string LICENSE_SERVER_URL = "http://localhost:7676/"; public const string SUPPORT_EMAIL = "cardjohn@ayanova.com"; #else private const string LICENSE_SERVER_URL = "https://rockfish.ayanova.com/"; diff --git a/server/biz/LicenseBiz.cs b/server/biz/LicenseBiz.cs index 2bc13c6..bc8c6b1 100644 --- a/server/biz/LicenseBiz.cs +++ b/server/biz/LicenseBiz.cs @@ -45,7 +45,7 @@ namespace Sockeye.Biz { //client can send a non expiring license key but internally it MUST have a date so the //raven default for non expiring keys is this - if (newObject.LicenseExpire == null) + if (newObject.LicenseExpire == null && !newObject.TrialMode) { newObject.LicenseExpire = DateUtil.EmptyDateValueForLicenseGeneration; } @@ -114,7 +114,7 @@ namespace Sockeye.Biz putObject.Tags = TagBiz.NormalizeTags(putObject.Tags); //client can send a non expiring license key but internally it MUST have a date so the //raven default for non expiring keys is this - if (putObject.LicenseExpire == null) + if (putObject.LicenseExpire == null && !putObject.TrialMode) { putObject.LicenseExpire = DateUtil.EmptyDateValueForLicenseGeneration; } @@ -861,6 +861,8 @@ MaximumDataGB: 20 return; } + + //RAVEN keys *always* expire if (proposedObj.LicenseExpire == null) diff --git a/server/biz/TrialLicenseRequestBiz.cs b/server/biz/TrialLicenseRequestBiz.cs index 729474b..02f5883 100644 --- a/server/biz/TrialLicenseRequestBiz.cs +++ b/server/biz/TrialLicenseRequestBiz.cs @@ -150,6 +150,7 @@ namespace Sockeye.Biz l.PGroup = putObject.PGroup; l.TrialMode = true; l.RegTo = putObject.CompanyName; + l.FetchEmail=putObject.Email; //perpet and sub both same number of users, covers seeded data values l.Users = RavenKeyFactory.TRIAL_KEY_USERS; @@ -169,7 +170,7 @@ namespace Sockeye.Biz if (newLicense == null) { //need to alert on error here - AddError(ApiErrorCode.INVALID_OPERATION, "generalerror", $"ERROR creating trial license on approved trial request:{licenseBiz.GetErrorsAsString}"); + AddError(ApiErrorCode.INVALID_OPERATION, "generalerror", $"ERROR creating trial license on approved trial request:{licenseBiz.GetErrorsAsString()}"); return null; }