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
2021-10-18 19:46:09 +00:00
parent cb33d70107
commit 5fdd5c73ba
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/AyaNova/Controllers/FormCustomController.cs
View File

@@ -56,7 +56,7 @@ namespace AyaNova.Api.Controllers
[HttpGet("{formkey}")] [HttpGet("{formkey}")]
public async Task<IActionResult> GetFormCustom([FromRoute] string formkey, [FromQuery] uint? concurrency) public async Task<IActionResult> GetFormCustom([FromRoute] string formkey, [FromQuery] uint? concurrency)
{ {
if (serverState.IsClosed) if (serverState.IsClosed && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems
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 //Instantiate the business object handler
@@ -104,7 +104,7 @@ namespace AyaNova.Api.Controllers
[HttpGet("availablecustomtypes")] [HttpGet("availablecustomtypes")]
public ActionResult GetAvailableCustomTypes() public ActionResult GetAvailableCustomTypes()
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.FormCustom)) if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.FormCustom))
@@ -124,7 +124,7 @@ namespace AyaNova.Api.Controllers
[HttpGet("availablecustomizableformkeys")] [HttpGet("availablecustomizableformkeys")]
public ActionResult GetAvailableCustomizableFormKeys() public ActionResult GetAvailableCustomizableFormKeys()
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.FormCustom)) if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.FormCustom))
@@ -147,7 +147,7 @@ namespace AyaNova.Api.Controllers
[HttpPut("{formkey}")] [HttpPut("{formkey}")]
public async Task<IActionResult> PutFormCustom([FromRoute] string formkey, [FromBody] FormCustom inObj) public async Task<IActionResult> PutFormCustom([FromRoute] string formkey, [FromBody] FormCustom inObj)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
if (!ModelState.IsValid) if (!ModelState.IsValid)
@@ -186,7 +186,7 @@ namespace AyaNova.Api.Controllers
[HttpGet("form-key/{id}")] [HttpGet("form-key/{id}")]
public async Task<IActionResult> GetFormKeyFromId(long id) public async Task<IActionResult> GetFormKeyFromId(long id)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.FormCustom)) if (!Authorized.HasReadFullRole(HttpContext.Items, AyaType.FormCustom))

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

@@ -53,7 +53,7 @@ namespace AyaNova.Api.Controllers
[HttpGet("{id}")] [HttpGet("{id}")]
public async Task<IActionResult> GetUserOptions([FromRoute] long id) public async Task<IActionResult> GetUserOptions([FromRoute] long id)
{ {
if (!serverState.IsOpen) if (!serverState.IsOpen && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems
{ {
//Exception for SuperUser account to handle licensing issues //Exception for SuperUser account to handle licensing issues
if (UserIdFromContext.Id(HttpContext.Items) != 1) if (UserIdFromContext.Id(HttpContext.Items) != 1)
@@ -137,7 +137,7 @@ namespace AyaNova.Api.Controllers
[HttpPut("{id}")] [HttpPut("{id}")]
public async Task<IActionResult> PutUserOptions([FromRoute] long id, [FromBody] UserOptions inObj) public async Task<IActionResult> PutUserOptions([FromRoute] long id, [FromBody] UserOptions inObj)
{ {
if (serverState.IsClosed) if (serverState.IsClosed && UserIdFromContext.Id(HttpContext.Items) != 1)//bypass for superuser to fix fundamental problems
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
if (!ModelState.IsValid) if (!ModelState.IsValid)

14
server/AyaNova/biz/UserBiz.cs
View File

@@ -724,7 +724,19 @@ namespace AyaNova.Biz
//Remove the object //Remove the object
ct.User.Remove(dbObject); ct.User.Remove(dbObject);
await ct.SaveChangesAsync(); try
{
await ct.SaveChangesAsync();
}
catch (Microsoft.EntityFrameworkCore.DbUpdateException)
{
//SPECIAL EXCEPTION
//seeded data isn't always attributed to the user who would normally have created data so
//this could fail due to referential integrity as they wouldn't be in the event log check above
//easiest workaround to avoid having to check a whole host of items is to just check if this fails due to ref.integrity and return sane message
AddError(ApiErrorCode.INVALID_OPERATION, "generalerror", await Translate("ErrorDBForeignKeyViolation"));
return false;
}
await EventLogProcessor.DeleteObjectLogAsync(UserId, BizType, dbObject.Id, dbObject.Name, ct); await EventLogProcessor.DeleteObjectLogAsync(UserId, BizType, dbObject.Id, dbObject.Name, ct);
await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, BizType, ct); await Search.ProcessDeletedObjectKeywordsAsync(dbObject.Id, BizType, ct);