This commit is contained in:
2019-04-30 19:25:22 +00:00
parent 7b9010b060
commit 0be48bebb3
8 changed files with 20 additions and 20 deletions

View File

@@ -54,7 +54,7 @@ namespace AyaNova.Api.Controllers
[HttpGet("{logname}")] [HttpGet("{logname}")]
public ActionResult GetLog([FromRoute] string 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))) if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited)))
{ {
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); 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)); return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
} }
//Log //Log
// EventLogProcessor.AddEntry(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.LogFile, AyaEvent.Retrieved,logname), ct); // EventLogProcessor.AddEntry(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.LogFile, AyaEvent.Retrieved,logname), ct);
return Content(System.IO.File.ReadAllText(logFilePath)); return Content(System.IO.File.ReadAllText(logFilePath));
@@ -101,7 +101,7 @@ namespace AyaNova.Api.Controllers
[HttpGet()] [HttpGet()]
public ActionResult ListLogs() 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))) if (!serverState.IsOpenOrOpsOnly || (serverState.IsOpsOnly && !Authorized.HasAnyRole(HttpContext.Items, AuthorizationRoles.OpsAdminFull | AuthorizationRoles.OpsAdminLimited)))
{ {
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); 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));
} }

View File

@@ -101,7 +101,7 @@ namespace AyaNova.Api.Controllers
//Log //Log
EventLogProcessor.LogEventToDatabase(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct); 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));
} }
/// <summary> /// <summary>

View File

@@ -70,7 +70,7 @@ namespace AyaNova.Api.Controllers
//Do the search //Do the search
var SearchResults = await Search.DoSearch(ct, UserLocaleIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items), searchParams); 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));
} }

View File

@@ -48,7 +48,7 @@ namespace AyaNova.Api.Controllers
[HttpGet] [HttpGet]
public ActionResult Get() 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));
} }

View File

@@ -55,7 +55,7 @@ namespace AyaNova.Api.Controllers
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason)); 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 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));
} }

View File

@@ -83,7 +83,7 @@ namespace AyaNova.Api.Controllers
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); 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 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));
} }

View File

@@ -83,7 +83,7 @@ namespace AyaNova.Api.Controllers
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); 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));
} }

View File

@@ -200,7 +200,7 @@ namespace AyaNova.Api.Controllers
else else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); 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 else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); 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));
} }