From 4af7664dce3ab912d32e474cba5a4125b35ababa Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Sun, 5 Apr 2020 23:02:18 +0000 Subject: [PATCH] server state cleanup --- .../AyaNova/Controllers/LicenseController.cs | 22 +++------ .../AyaNova/Controllers/LogFilesController.cs | 14 ++---- .../AyaNova/Controllers/MetricsController.cs | 16 +++---- .../AyaNova/Controllers/PickListController.cs | 18 +++----- .../AyaNova/Controllers/SearchController.cs | 4 +- .../AyaNova/Controllers/TagListController.cs | 12 ++--- .../Controllers/TranslationController.cs | 45 ++++++------------- server/AyaNova/Controllers/TrialController.cs | 6 +-- server/AyaNova/Controllers/UserController.cs | 30 +++++-------- .../Controllers/UserOptionsController.cs | 19 +++----- 10 files changed, 59 insertions(+), 127 deletions(-) diff --git a/server/AyaNova/Controllers/LicenseController.cs b/server/AyaNova/Controllers/LicenseController.cs index 5d3ed0a7..b0a889b4 100644 --- a/server/AyaNova/Controllers/LicenseController.cs +++ b/server/AyaNova/Controllers/LicenseController.cs @@ -54,11 +54,8 @@ namespace AyaNova.Api.Controllers [HttpGet()] public ActionResult GetLicenseInfo() { - //Open or opsOnly and user is opsadminfull or opsadminlimited - if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited))) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.License)) { @@ -83,11 +80,8 @@ namespace AyaNova.Api.Controllers [HttpPost] public async Task FetchLicense() { - //Open or opsOnly and user is opsadminfull - if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull))) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasCreateRole(HttpContext.Items, AyaType.License)) { @@ -142,12 +136,8 @@ namespace AyaNova.Api.Controllers [HttpPost("trial")] public async Task RequestTrial([FromBody] dtoTrialRequestData requestData) { - //Open or opsOnly and user is opsadminfull - if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull))) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - //return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasCreateRole(HttpContext.Items, AyaType.License)) { diff --git a/server/AyaNova/Controllers/LogFilesController.cs b/server/AyaNova/Controllers/LogFilesController.cs index 59423038..8ef6a687 100644 --- a/server/AyaNova/Controllers/LogFilesController.cs +++ b/server/AyaNova/Controllers/LogFilesController.cs @@ -52,11 +52,8 @@ namespace AyaNova.Api.Controllers [HttpGet("{logname}")] public ActionResult GetLog([FromRoute] string logname) { - //Open or opsOnly and user is opsadminfull or opsadminlimited - if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited))) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.LogFile)) { @@ -95,11 +92,8 @@ namespace AyaNova.Api.Controllers [HttpGet()] public ActionResult ListLogs() { - //Open or opsOnly and user is opsadminfull or opsadminlimited - if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited))) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.LogFile)) { diff --git a/server/AyaNova/Controllers/MetricsController.cs b/server/AyaNova/Controllers/MetricsController.cs index acc6ab69..3611b507 100644 --- a/server/AyaNova/Controllers/MetricsController.cs +++ b/server/AyaNova/Controllers/MetricsController.cs @@ -52,11 +52,8 @@ namespace AyaNova.Api.Controllers [HttpGet("TextSnapShot")] public async Task GetMetrics() { - //Open or opsOnly and user is opsadminfull or opsadminlimited - if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited))) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.Metrics)) { @@ -79,11 +76,8 @@ namespace AyaNova.Api.Controllers [HttpGet("JsonSnapShot")] public async Task GetJsonMetrics() { - //Open or opsOnly and user is opsadminfull or opsadminlimited - if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited))) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.Metrics)) { @@ -95,7 +89,7 @@ namespace AyaNova.Api.Controllers //Log await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct); - + return Ok(ApiOkResponse.Response(json, true)); } diff --git a/server/AyaNova/Controllers/PickListController.cs b/server/AyaNova/Controllers/PickListController.cs index 07a3116b..3c8b7428 100644 --- a/server/AyaNova/Controllers/PickListController.cs +++ b/server/AyaNova/Controllers/PickListController.cs @@ -60,8 +60,8 @@ namespace AyaNova.Api.Controllers [HttpGet("List")] public async Task GetList([FromQuery]AyaType ayaType, [FromQuery]string query, [FromQuery] bool inactive, [FromQuery]long? preId) { - if (!serverState.IsOpen) - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); @@ -101,7 +101,7 @@ namespace AyaNova.Api.Controllers public async Task GetPickListTemplate([FromRoute] AyaType ayaType) { if (serverState.IsClosed) - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //Instantiate the business object handler PickListBiz biz = PickListBiz.GetBiz(ct, HttpContext); @@ -129,9 +129,7 @@ namespace AyaNova.Api.Controllers public ActionResult GetTemplateList() { if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //Instantiate the business object handler PickListBiz biz = PickListBiz.GetBiz(ct, HttpContext); @@ -159,7 +157,7 @@ namespace AyaNova.Api.Controllers public async Task ReplacePickListTemplate([FromBody] PickListTemplate template) { if (!serverState.IsOpen) - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); @@ -198,7 +196,7 @@ namespace AyaNova.Api.Controllers public async Task DeletePickListTemplate([FromRoute] AyaType ayaType) { if (!serverState.IsOpen) - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); @@ -225,9 +223,7 @@ namespace AyaNova.Api.Controllers public ActionResult GetPickListFields([FromRoute] AyaType ayaType) { if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); var PickList = PickListFactory.GetAyaPickList(ayaType); //type might not be supported diff --git a/server/AyaNova/Controllers/SearchController.cs b/server/AyaNova/Controllers/SearchController.cs index 958d46bd..0c7e738c 100644 --- a/server/AyaNova/Controllers/SearchController.cs +++ b/server/AyaNova/Controllers/SearchController.cs @@ -56,9 +56,7 @@ namespace AyaNova.Api.Controllers public async Task PostSearch([FromBody] Search.SearchRequestParameters searchParams) { if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { diff --git a/server/AyaNova/Controllers/TagListController.cs b/server/AyaNova/Controllers/TagListController.cs index 230324c5..69e51c5b 100644 --- a/server/AyaNova/Controllers/TagListController.cs +++ b/server/AyaNova/Controllers/TagListController.cs @@ -48,10 +48,8 @@ namespace AyaNova.Api.Controllers [HttpGet("list")] public async Task GetList([FromQuery]string query) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return Ok(ApiOkResponse.Response(await TagUtil.TagListFilteredAsync(ct, query), true)); } @@ -66,10 +64,8 @@ namespace AyaNova.Api.Controllers [HttpGet("cloudlist")] public async Task GetCloudList([FromQuery]string query) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return Ok(ApiOkResponse.Response(await TagUtil.CloudListFilteredAsync(ct, query), true)); } diff --git a/server/AyaNova/Controllers/TranslationController.cs b/server/AyaNova/Controllers/TranslationController.cs index dd15b0de..bfbf5b27 100644 --- a/server/AyaNova/Controllers/TranslationController.cs +++ b/server/AyaNova/Controllers/TranslationController.cs @@ -60,9 +60,7 @@ namespace AyaNova.Api.Controllers public async Task GetTranslation([FromRoute] long id) { if (serverState.IsClosed) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) @@ -93,9 +91,7 @@ namespace AyaNova.Api.Controllers public async Task TranslationList() { if (serverState.IsClosed) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //Instantiate the business object handler TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext); @@ -114,13 +110,11 @@ namespace AyaNova.Api.Controllers public async Task TranslationKeyCoverage() { if (serverState.IsClosed) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //Instantiate the business object handler TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext); - + var l = await biz.TranslationKeyCoverageAsync(); return Ok(ApiOkResponse.Response(l, true)); } @@ -136,12 +130,10 @@ namespace AyaNova.Api.Controllers public async Task SubSet([FromBody] List inObj) { if (serverState.IsClosed) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //Instantiate the business object handler - + //Instantiate the business object handler TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext); @@ -160,9 +152,7 @@ namespace AyaNova.Api.Controllers public async Task Duplicate([FromBody] NameIdItem inObj, ApiVersion apiVersion) { if (serverState.IsClosed) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //Instantiate the business object handler TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext); @@ -191,10 +181,8 @@ namespace AyaNova.Api.Controllers [HttpPut("UpdateTranslationItemDisplayText")] public async Task PutTranslationItemDisplayText([FromBody] NewTextIdConcurrencyTokenItem inObj) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { @@ -258,10 +246,8 @@ namespace AyaNova.Api.Controllers [HttpPut("UpdateTranslationName")] public async Task PutTranslationName([FromBody] NewTextIdConcurrencyTokenItem inObj) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { @@ -319,11 +305,8 @@ namespace AyaNova.Api.Controllers [HttpDelete("{id}")] public async Task DeleteTranslation([FromRoute] long id) { - - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { @@ -351,7 +334,7 @@ namespace AyaNova.Api.Controllers { return BadRequest(new ApiErrorResponse(biz.Errors)); } - + return NoContent(); } diff --git a/server/AyaNova/Controllers/TrialController.cs b/server/AyaNova/Controllers/TrialController.cs index bdc56c55..24b78297 100644 --- a/server/AyaNova/Controllers/TrialController.cs +++ b/server/AyaNova/Controllers/TrialController.cs @@ -54,10 +54,8 @@ namespace AyaNova.Api.Controllers [HttpPost("seed/{size}/{timeZoneOffset}")] public async Task SeedTrialDatabase([FromRoute] string size, [FromRoute] decimal timeZoneOffset) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { diff --git a/server/AyaNova/Controllers/UserController.cs b/server/AyaNova/Controllers/UserController.cs index 1b553b9f..9c8b3732 100644 --- a/server/AyaNova/Controllers/UserController.cs +++ b/server/AyaNova/Controllers/UserController.cs @@ -55,10 +55,8 @@ namespace AyaNova.Api.Controllers [HttpGet("{id}")] public async Task GetUser([FromRoute] long id) { - if (serverState.IsClosed) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (!serverState.IsOpen) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //Instantiate the business object handler UserBiz biz = UserBiz.GetBiz(ct, HttpContext); @@ -95,10 +93,8 @@ namespace AyaNova.Api.Controllers [HttpPut("{id}")] public async Task PutUser([FromRoute] long id, [FromBody] User inObj) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (!serverState.IsOpen) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { @@ -156,10 +152,8 @@ namespace AyaNova.Api.Controllers [HttpPatch("{id}/{concurrencyToken}")] public async Task PatchUser([FromRoute] long id, [FromRoute] uint concurrencyToken, [FromBody]JsonPatchDocument objectPatch) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (!serverState.IsOpen) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { @@ -213,10 +207,8 @@ namespace AyaNova.Api.Controllers [HttpPost] public async Task PostUser([FromBody] User inObj, ApiVersion apiVersion) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (!serverState.IsOpen) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); //Instantiate the business object handler UserBiz biz = UserBiz.GetBiz(ct, HttpContext); @@ -263,10 +255,8 @@ namespace AyaNova.Api.Controllers [HttpDelete("{id}")] public async Task DeleteUser([FromRoute] long id) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (!serverState.IsOpen) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs index d2acc9c6..f91800f3 100644 --- a/server/AyaNova/Controllers/UserOptionsController.cs +++ b/server/AyaNova/Controllers/UserOptionsController.cs @@ -54,9 +54,7 @@ namespace AyaNova.Api.Controllers public async Task GetUserOptions([FromRoute] long id) { if (serverState.IsClosed) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { @@ -81,7 +79,7 @@ namespace AyaNova.Api.Controllers return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); } - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); } @@ -96,10 +94,8 @@ namespace AyaNova.Api.Controllers [HttpPut("{id}")] public async Task PutUserOptions([FromRoute] long id, [FromBody] UserOptions inObj) { - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) { @@ -157,11 +153,8 @@ namespace AyaNova.Api.Controllers [HttpPatch("{id}/{concurrencyToken}")] public async Task PatchUserOptions([FromRoute] long id, [FromRoute] uint concurrencyToken, [FromBody]JsonPatchDocument objectPatch) { - - if (!serverState.IsOpen) - { - return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); - } + if (!serverState.IsClosed) + return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); if (!ModelState.IsValid) {