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-02-16 00:04:03 +00:00
parent 98cb68850e
commit 9b0a6adbaa
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/Controllers/RvrController.cs
View File

@@ -47,7 +47,7 @@ namespace Sockeye.Api.Controllers
} }
#if (DEBUG) #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"; public const string SUPPORT_EMAIL = "cardjohn@ayanova.com";
#else #else
private const string LICENSE_SERVER_URL = "https://rockfish.ayanova.com/"; private const string LICENSE_SERVER_URL = "https://rockfish.ayanova.com/";

6
server/biz/LicenseBiz.cs
View File

@@ -45,7 +45,7 @@ namespace Sockeye.Biz
{ {
//client can send a non expiring license key but internally it MUST have a date so the //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 //raven default for non expiring keys is this
if (newObject.LicenseExpire == null) if (newObject.LicenseExpire == null && !newObject.TrialMode)
{ {
newObject.LicenseExpire = DateUtil.EmptyDateValueForLicenseGeneration; newObject.LicenseExpire = DateUtil.EmptyDateValueForLicenseGeneration;
} }
@@ -114,7 +114,7 @@ namespace Sockeye.Biz
putObject.Tags = TagBiz.NormalizeTags(putObject.Tags); putObject.Tags = TagBiz.NormalizeTags(putObject.Tags);
//client can send a non expiring license key but internally it MUST have a date so the //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 //raven default for non expiring keys is this
if (putObject.LicenseExpire == null) if (putObject.LicenseExpire == null && !putObject.TrialMode)
{ {
putObject.LicenseExpire = DateUtil.EmptyDateValueForLicenseGeneration; putObject.LicenseExpire = DateUtil.EmptyDateValueForLicenseGeneration;
} }
@@ -862,6 +862,8 @@ MaximumDataGB: 20
} }
//RAVEN keys *always* expire //RAVEN keys *always* expire
if (proposedObj.LicenseExpire == null) if (proposedObj.LicenseExpire == null)
{ {

3
server/biz/TrialLicenseRequestBiz.cs
View File

@@ -150,6 +150,7 @@ namespace Sockeye.Biz
l.PGroup = putObject.PGroup; l.PGroup = putObject.PGroup;
l.TrialMode = true; l.TrialMode = true;
l.RegTo = putObject.CompanyName; l.RegTo = putObject.CompanyName;
l.FetchEmail=putObject.Email;
//perpet and sub both same number of users, covers seeded data values //perpet and sub both same number of users, covers seeded data values
l.Users = RavenKeyFactory.TRIAL_KEY_USERS; l.Users = RavenKeyFactory.TRIAL_KEY_USERS;
@@ -169,7 +170,7 @@ namespace Sockeye.Biz
if (newLicense == null) if (newLicense == null)
{ {
//need to alert on error here //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; return null;
} }