From aae0156430afdcf1ad847b8a5b800ddb6151bfcf Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 8 Jun 2020 18:13:07 +0000 Subject: [PATCH] --- .../AyaNova/Controllers/LicenseController.cs | 26 +++++++++---------- server/AyaNova/util/License.cs | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/server/AyaNova/Controllers/LicenseController.cs b/server/AyaNova/Controllers/LicenseController.cs index 1665f939..c85ab9f6 100644 --- a/server/AyaNova/Controllers/LicenseController.cs +++ b/server/AyaNova/Controllers/LicenseController.cs @@ -69,19 +69,19 @@ namespace AyaNova.Api.Controllers - /// - /// Get Trial status of license - /// - /// True if a trial license - [AllowAnonymous] - [HttpGet("trial")] - public ActionResult GetTrialFlag() - { - //note: this route is called by the client as the first action so it also acts like a ping to see if the server is up as well - if (serverState.IsClosed) - return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - return Ok(ApiOkResponse.Response(AyaNova.Core.License.ActiveKey.TrialLicense)); - } + // /// + // /// Get Trial status of license + // /// + // /// True if a trial license + // [AllowAnonymous] + // [HttpGet("trial")] + // public ActionResult GetTrialFlag() + // { + // //note: this route is called by the client as the first action so it also acts like a ping to see if the server is up as well + // if (serverState.IsClosed) + // return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); + // return Ok(ApiOkResponse.Response(AyaNova.Core.License.ActiveKey.TrialLicense)); + // } diff --git a/server/AyaNova/util/License.cs b/server/AyaNova/util/License.cs index 55eafc00..ada7a78b 100644 --- a/server/AyaNova/util/License.cs +++ b/server/AyaNova/util/License.cs @@ -480,7 +480,7 @@ namespace AyaNova.Core if (ldb == null) { ldb = new Models.License(); - ldb.DbId = Guid.NewGuid(); + ldb.DbId = Guid.NewGuid();//<--Permanent and unchanging DB ID for this database, the license must match this ldb.Key = "none"; ct.License.Add(ldb); await ct.SaveChangesAsync(); @@ -489,7 +489,7 @@ namespace AyaNova.Core //ensure DB ID if (ldb.DbId == Guid.Empty) { - ldb.DbId = Guid.NewGuid(); + ldb.DbId = Guid.NewGuid();//<--Permanent and unchanging DB ID for this database, the license must match this //Convert the no tracking record fetched above to tracking //this is required because a prior call to initialize before dumping the db would mean the license is still in memory in the context ct.Entry(ldb).State = Microsoft.EntityFrameworkCore.EntityState.Modified;