From 0be48bebb36edef51d4a84df0a16c47ce2016580 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 30 Apr 2019 19:25:22 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/LogFilesController.cs | 14 +++++++------- server/AyaNova/Controllers/MetricsController.cs | 2 +- server/AyaNova/Controllers/SearchController.cs | 2 +- .../AyaNova/Controllers/ServerStateController.cs | 2 +- server/AyaNova/Controllers/TagListController.cs | 4 ++-- server/AyaNova/Controllers/UserController.cs | 6 +++--- .../AyaNova/Controllers/UserOptionsController.cs | 6 +++--- server/AyaNova/Controllers/WidgetController.cs | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/server/AyaNova/Controllers/LogFilesController.cs b/server/AyaNova/Controllers/LogFilesController.cs index 5b8d194f..033c6105 100644 --- a/server/AyaNova/Controllers/LogFilesController.cs +++ b/server/AyaNova/Controllers/LogFilesController.cs @@ -54,7 +54,7 @@ namespace AyaNova.Api.Controllers [HttpGet("{logname}")] public ActionResult GetLog([FromRoute] string logname) { - //Open or opsOnly and user is opsadminfull or opsadminlimited + //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)); @@ -80,9 +80,9 @@ namespace AyaNova.Api.Controllers return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); } - - //Log - // EventLogProcessor.AddEntry(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.LogFile, AyaEvent.Retrieved,logname), ct); + + //Log + // EventLogProcessor.AddEntry(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.LogFile, AyaEvent.Retrieved,logname), ct); return Content(System.IO.File.ReadAllText(logFilePath)); @@ -101,7 +101,7 @@ namespace AyaNova.Api.Controllers [HttpGet()] public ActionResult ListLogs() { - //Open or opsOnly and user is opsadminfull or opsadminlimited + //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)); @@ -132,10 +132,10 @@ namespace AyaNova.Api.Controllers } }); - - return Ok(new ApiOkResponse(o)); + + return Ok(new ApiOkResponse(o, true)); } diff --git a/server/AyaNova/Controllers/MetricsController.cs b/server/AyaNova/Controllers/MetricsController.cs index ab1099ef..4dea99ef 100644 --- a/server/AyaNova/Controllers/MetricsController.cs +++ b/server/AyaNova/Controllers/MetricsController.cs @@ -101,7 +101,7 @@ namespace AyaNova.Api.Controllers //Log EventLogProcessor.LogEventToDatabase(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct); - return Ok(new ApiOkResponse(json)); + return Ok(new ApiOkResponse(json, true)); } /// diff --git a/server/AyaNova/Controllers/SearchController.cs b/server/AyaNova/Controllers/SearchController.cs index 660af5c1..ff9fc509 100644 --- a/server/AyaNova/Controllers/SearchController.cs +++ b/server/AyaNova/Controllers/SearchController.cs @@ -70,7 +70,7 @@ namespace AyaNova.Api.Controllers //Do the search var SearchResults = await Search.DoSearch(ct, UserLocaleIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items), searchParams); - return Ok(new ApiOkResponse(SearchResults)); + return Ok(new ApiOkResponse(SearchResults, true)); } diff --git a/server/AyaNova/Controllers/ServerStateController.cs b/server/AyaNova/Controllers/ServerStateController.cs index 9afe23d1..dbf2f2a0 100644 --- a/server/AyaNova/Controllers/ServerStateController.cs +++ b/server/AyaNova/Controllers/ServerStateController.cs @@ -48,7 +48,7 @@ namespace AyaNova.Api.Controllers [HttpGet] public ActionResult Get() { - return Ok(new ApiOkResponse(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason })); + return Ok(new ApiOkResponse(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason }, true)); } diff --git a/server/AyaNova/Controllers/TagListController.cs b/server/AyaNova/Controllers/TagListController.cs index cc7f6f3a..2394207c 100644 --- a/server/AyaNova/Controllers/TagListController.cs +++ b/server/AyaNova/Controllers/TagListController.cs @@ -55,7 +55,7 @@ namespace AyaNova.Api.Controllers return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); } - return Ok(new ApiOkResponse(TagUtil.PickListFiltered(ct, query))); + return Ok(new ApiOkResponse(TagUtil.PickListFiltered(ct, query),true)); } @@ -75,7 +75,7 @@ namespace AyaNova.Api.Controllers return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); } - return Ok(new ApiOkResponse(TagUtil.CloudListFiltered(ct, query))); + return Ok(new ApiOkResponse(TagUtil.CloudListFiltered(ct, query), true)); } diff --git a/server/AyaNova/Controllers/UserController.cs b/server/AyaNova/Controllers/UserController.cs index cfc1127b..003639b5 100644 --- a/server/AyaNova/Controllers/UserController.cs +++ b/server/AyaNova/Controllers/UserController.cs @@ -83,7 +83,7 @@ namespace AyaNova.Api.Controllers return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); } - return Ok(new ApiOkResponse(o)); + return Ok(new ApiOkResponse(o, !Authorized.IsAuthorizedToModify(HttpContext.Items, biz.BizType))); } @@ -240,7 +240,7 @@ namespace AyaNova.Api.Controllers return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } } - return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken })); + return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken }, true)); } @@ -303,7 +303,7 @@ namespace AyaNova.Api.Controllers } } - return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken })); + return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken }, true)); } diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs index b4dce60a..ca187106 100644 --- a/server/AyaNova/Controllers/UserOptionsController.cs +++ b/server/AyaNova/Controllers/UserOptionsController.cs @@ -83,7 +83,7 @@ namespace AyaNova.Api.Controllers return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); } - return Ok(new ApiOkResponse(o)); + return Ok(new ApiOkResponse(o, !Authorized.IsAuthorizedToModify(HttpContext.Items, biz.BizType))); } @@ -148,7 +148,7 @@ namespace AyaNova.Api.Controllers } } - return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken })); + return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken }, true)); } @@ -215,7 +215,7 @@ namespace AyaNova.Api.Controllers } } - return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken })); + return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken }, true)); } diff --git a/server/AyaNova/Controllers/WidgetController.cs b/server/AyaNova/Controllers/WidgetController.cs index 9d077918..16dd10c3 100644 --- a/server/AyaNova/Controllers/WidgetController.cs +++ b/server/AyaNova/Controllers/WidgetController.cs @@ -200,7 +200,7 @@ namespace AyaNova.Api.Controllers else return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } - return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken })); + return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken }, true)); } @@ -250,7 +250,7 @@ namespace AyaNova.Api.Controllers else return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } - return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken })); + return Ok(new ApiOkResponse(new { ConcurrencyToken = o.ConcurrencyToken }, true)); }