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
2019-04-30 19:25:22 +00:00
parent 7b9010b060
commit 0be48bebb3
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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));
}

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

@@ -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));
}
/// <summary>

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

@@ -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));
}

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

@@ -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));
}

4
server/AyaNova/Controllers/TagListController.cs
View File

@@ -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));
}

6
server/AyaNova/Controllers/UserController.cs
View File

@@ -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));
}

6
server/AyaNova/Controllers/UserOptionsController.cs
View File

@@ -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));
}

4
server/AyaNova/Controllers/WidgetController.cs
View File

@@ -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));
}