admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-06-10 14:40:12 +00:00
parent 7ffee42684
commit ff20c44710
5 changed files with 71 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Controllers/AuthController.cs
View File

@@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers
//so the only real barrier here would be a completely closed api
if (serverState.IsClosed && AyaNova.Core.License.ActiveKey.IsLicensed)
if (serverState.IsClosed && AyaNova.Core.License.ActiveKey.KeyDoesNotNeedAttention)
{
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
}

26
server/AyaNova/Controllers/GlobalBizSettingsController.cs
View File

@@ -46,9 +46,8 @@ namespace AyaNova.Api.Controllers
{
if (serverState.IsClosed)
{
//Exception for manager account to handle licensing issues
if (UserIdFromContext.Id(HttpContext.Items) != 1)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
}
//Instantiate the business object handler
@@ -102,7 +101,11 @@ namespace AyaNova.Api.Controllers
public ActionResult GetClientGlobalBizSettings()
{
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
{
//Exception for manager account to handle licensing issues
if (UserIdFromContext.Id(HttpContext.Items) != 1)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
}
//Instantiate the business object handler
// GlobalBizSettingsBiz biz = GlobalBizSettingsBiz.GetBiz(ct, HttpContext);
@@ -118,10 +121,23 @@ namespace AyaNova.Api.Controllers
// if (o == null)
// return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
// Return a license state enumeration value
// 0 = No license at all of any kind
// 1 = trial license key
// 2 = purchased license key
// 3 = purchased but expired key (license itself is expired, not the maintenance, that's seperate)
// Note: this has nothing to do with whether there is an active license or not, merely that it's of a type
// this is so client can display appropriate UI
//new object with only relevant items in it
var ret = new
{
SearchCaseSensitiveOnly = AyaNova.Util.ServerGlobalBizSettings.SearchCaseSensitiveOnly
SearchCaseSensitiveOnly = AyaNova.Util.ServerGlobalBizSettings.SearchCaseSensitiveOnly,
LicenseState = AyaNova.Core.License.ActiveKey.Status
};
return Ok(ApiOkResponse.Response(ret));

14
server/AyaNova/Controllers/NotifyController.cs
View File

@@ -43,10 +43,10 @@ namespace AyaNova.Api.Controllers
[HttpGet("hello")]
public ActionResult GetPreLoginPing()
{
//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));
//todo: check this route for dos attack potential??
//note: this route is called by the client to determine if it should display trial login ui
//and to see if the server is contactable
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
return Ok(ApiOkResponse.Response(!AyaNova.Core.License.ActiveKey.TrialLicense));
}
@@ -65,9 +65,9 @@ namespace AyaNova.Api.Controllers
return Ok(ApiOkResponse.Response(69));
}
//TODO: See new count case for gist of it
//todo: see the core-notification.txt spec doc for details and
//todo: see seemingly countless Notification related cases for details :)
//TODO: See new count case for gist of it
//todo: see the core-notification.txt spec doc for details and
//todo: see seemingly countless Notification related cases for details :)
//------------