From 07390b6a310da660019c87c28686199cddcbaaec Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 18 May 2020 16:25:08 +0000 Subject: [PATCH] Removed unused readOnly property on return response --- devdocs/todo.txt | 1 - .../ControllerHelpers/ApiOkResponse.cs | 26 ++++++----- .../Controllers/AttachmentController.cs | 6 +-- server/AyaNova/Controllers/AuthController.cs | 4 +- .../AuthorizationRolesController.cs | 4 +- .../AyaNova/Controllers/ContractController.cs | 4 +- .../AyaNova/Controllers/CustomerController.cs | 4 +- .../AyaNova/Controllers/DataListController.cs | 4 +- .../Controllers/DataListViewController.cs | 8 ++-- .../AyaNova/Controllers/EnumListController.cs | 4 +- .../AyaNova/Controllers/EventLogController.cs | 4 +- .../Controllers/FormCustomController.cs | 8 ++-- .../FormFieldsDefinitionsController.cs | 2 +- .../GlobalBizSettingsController.cs | 4 +- .../Controllers/HeadOfficeController.cs | 4 +- .../Controllers/JobOperationsController.cs | 4 +- .../AyaNova/Controllers/LicenseController.cs | 8 ++-- .../AyaNova/Controllers/LoanUnitController.cs | 4 +- .../AyaNova/Controllers/LogFilesController.cs | 2 +- .../AyaNova/Controllers/MetricsController.cs | 2 +- .../AyaNova/Controllers/NotifyController.cs | 4 +- server/AyaNova/Controllers/PMController.cs | 4 +- .../Controllers/PMTemplateController.cs | 4 +- server/AyaNova/Controllers/PartController.cs | 4 +- .../AyaNova/Controllers/PickListController.cs | 8 ++-- .../AyaNova/Controllers/ProjectController.cs | 4 +- .../Controllers/PurchaseOrderController.cs | 4 +- server/AyaNova/Controllers/QuoteController.cs | 4 +- .../Controllers/QuoteTemplateController.cs | 4 +- .../AyaNova/Controllers/SearchController.cs | 8 ++-- .../Controllers/ServerStateController.cs | 4 +- server/AyaNova/Controllers/TagController.cs | 4 +- .../Controllers/TranslationController.cs | 12 ++--- server/AyaNova/Controllers/UnitController.cs | 4 +- .../Controllers/UnitModelController.cs | 4 +- server/AyaNova/Controllers/UserController.cs | 6 +-- .../Controllers/UserOptionsController.cs | 4 +- .../AyaNova/Controllers/VendorController.cs | 4 +- .../AyaNova/Controllers/WidgetController.cs | 4 +- .../Controllers/WorkOrderController.cs | 44 +++++++++---------- .../WorkOrderTemplateController.cs | 4 +- ...XXX_DEPRECATED_ImportAyaNova7Controller.cs | 2 +- 42 files changed, 126 insertions(+), 125 deletions(-) diff --git a/devdocs/todo.txt b/devdocs/todo.txt index d4924e71..2d57452e 100644 --- a/devdocs/todo.txt +++ b/devdocs/todo.txt @@ -1,7 +1,6 @@ PRIORITY - ALWAYS Lowest level stuff first =-=-=-=- -todo:aycontext clean up old block of weird definitions todo: apiokresponse returns readonly value every time, but I check it anyway at the client and biz object itself doesn't set it I don't think, so...should it be removed? todo: Is there a log that records past jobs, how long can they be viewed? todo: Rename the link to AyaNova App on the server page to just "AyaNova" diff --git a/server/AyaNova/ControllerHelpers/ApiOkResponse.cs b/server/AyaNova/ControllerHelpers/ApiOkResponse.cs index a3b014d6..77b28fa1 100644 --- a/server/AyaNova/ControllerHelpers/ApiOkResponse.cs +++ b/server/AyaNova/ControllerHelpers/ApiOkResponse.cs @@ -5,22 +5,24 @@ namespace AyaNova.Api.ControllerHelpers //return the response with optional readonly flag //this exists basically for consistency and to reduce the bandwidth if not readonly which is most common + //UPDATE: Actually, there's no way for the biz object to set the readonly status and the client doesn't really use it at this point 2020-05-18 09:09:29 + //in theory it should be a non db property of the model if it's going to be used at all so removing it entirely from response as a separate property public static class ApiOkResponse { - public static object Response(object result, bool isReadOnly) + public static object Response(object result) { - if (isReadOnly) - { - return new - { - Data = result, - ReadOnly = true - }; - } - else - { + // if (isReadOnly) + // { + // return new + // { + // Data = result, + // ReadOnly = true + // }; + // } + // else + // { return new { Data = result }; - } + //} } }//eoc diff --git a/server/AyaNova/Controllers/AttachmentController.cs b/server/AyaNova/Controllers/AttachmentController.cs index 5630771f..87445e88 100644 --- a/server/AyaNova/Controllers/AttachmentController.cs +++ b/server/AyaNova/Controllers/AttachmentController.cs @@ -136,7 +136,7 @@ namespace AyaNova.Api.Controllers //Normallyh wouldn't return a whole list but in this case the UI demands it because of reactivity issues var ret = await GetFileListForObjectAsync(dbObj.AttachToObjectType, dbObj.AttachToObjectId); - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } @@ -162,7 +162,7 @@ namespace AyaNova.Api.Controllers if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); var ret = await GetFileListForObjectAsync(ayaType, ayaId); - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } @@ -333,7 +333,7 @@ namespace AyaNova.Api.Controllers } //Return the list of attachment ids and filenames - return Ok(ApiOkResponse.Response(ret, false)); + return Ok(ApiOkResponse.Response(ret)); } /// diff --git a/server/AyaNova/Controllers/AuthController.cs b/server/AyaNova/Controllers/AuthController.cs index 2373bff5..3e112aba 100644 --- a/server/AyaNova/Controllers/AuthController.cs +++ b/server/AyaNova/Controllers/AuthController.cs @@ -140,7 +140,7 @@ namespace AyaNova.Api.Controllers token = TestToken, name = "Manager Account - TESTING", roles = "0" - }, true)); + })); } @@ -223,7 +223,7 @@ namespace AyaNova.Api.Controllers usertype = u.UserType, roles = ((int)u.Roles).ToString(), dlt = DownloadToken - }, true)); + })); } } diff --git a/server/AyaNova/Controllers/AuthorizationRolesController.cs b/server/AyaNova/Controllers/AuthorizationRolesController.cs index 21431952..7824418d 100644 --- a/server/AyaNova/Controllers/AuthorizationRolesController.cs +++ b/server/AyaNova/Controllers/AuthorizationRolesController.cs @@ -54,9 +54,9 @@ namespace AyaNova.Api.Controllers //as json for client end of things if (AsJson) - return Ok(ApiOkResponse.Response(Newtonsoft.Json.JsonConvert.SerializeObject(BizRoles.roles, Newtonsoft.Json.Formatting.None), true)); + return Ok(ApiOkResponse.Response(Newtonsoft.Json.JsonConvert.SerializeObject(BizRoles.roles, Newtonsoft.Json.Formatting.None))); else - return Ok(ApiOkResponse.Response(BizRoles.roles, true)); + return Ok(ApiOkResponse.Response(BizRoles.roles)); } diff --git a/server/AyaNova/Controllers/ContractController.cs b/server/AyaNova/Controllers/ContractController.cs index 4acd7398..5a52def1 100644 --- a/server/AyaNova/Controllers/ContractController.cs +++ b/server/AyaNova/Controllers/ContractController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/CustomerController.cs b/server/AyaNova/Controllers/CustomerController.cs index 38f02c1f..3a2bd3d1 100644 --- a/server/AyaNova/Controllers/CustomerController.cs +++ b/server/AyaNova/Controllers/CustomerController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/DataListController.cs b/server/AyaNova/Controllers/DataListController.cs index acfcd396..150aee70 100644 --- a/server/AyaNova/Controllers/DataListController.cs +++ b/server/AyaNova/Controllers/DataListController.cs @@ -97,7 +97,7 @@ namespace AyaNova.Api.Controllers if (!serverState.IsOpen) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - return Ok(ApiOkResponse.Response(DataListFactory.GetListOfAllDataListKeyNames(), true)); + return Ok(ApiOkResponse.Response(DataListFactory.GetListOfAllDataListKeyNames())); } @@ -118,7 +118,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ApiErrorCode.NOT_FOUND, "DataListKey", $"DataList \"{DataListKey}\" specified does not exist")); } - return Ok(ApiOkResponse.Response(DataList.FieldDefinitions, true)); + return Ok(ApiOkResponse.Response(DataList.FieldDefinitions)); } }//eoc diff --git a/server/AyaNova/Controllers/DataListViewController.cs b/server/AyaNova/Controllers/DataListViewController.cs index ca400db6..2aa57edd 100644 --- a/server/AyaNova/Controllers/DataListViewController.cs +++ b/server/AyaNova/Controllers/DataListViewController.cs @@ -69,7 +69,7 @@ namespace AyaNova.Api.Controllers if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -91,7 +91,7 @@ namespace AyaNova.Api.Controllers DataListViewBiz biz = DataListViewBiz.GetBiz(ct, HttpContext); var l = await biz.GetViewListAsync(ListKey); - return Ok(ApiOkResponse.Response(l, true)); + return Ok(ApiOkResponse.Response(l)); } @@ -133,7 +133,7 @@ namespace AyaNova.Api.Controllers else return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } @@ -257,7 +257,7 @@ namespace AyaNova.Api.Controllers if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o.DefaultListView, true)); + return Ok(ApiOkResponse.Response(o.DefaultListView)); } diff --git a/server/AyaNova/Controllers/EnumListController.cs b/server/AyaNova/Controllers/EnumListController.cs index 18ccf912..07e5c50a 100644 --- a/server/AyaNova/Controllers/EnumListController.cs +++ b/server/AyaNova/Controllers/EnumListController.cs @@ -200,7 +200,7 @@ namespace AyaNova.Api.Controllers - return Ok(ApiOkResponse.Response(ReturnList, true)); + return Ok(ApiOkResponse.Response(ReturnList)); } @@ -223,7 +223,7 @@ namespace AyaNova.Api.Controllers ret.Add(new KeyValuePair("Core", "All Core AyaNova business object types")); ret.Add(new KeyValuePair(StringUtil.TrimTypeName(typeof(UiFieldDataType).ToString()), "Types of data used in AyaNova for display and formatting UI purposes")); - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } diff --git a/server/AyaNova/Controllers/EventLogController.cs b/server/AyaNova/Controllers/EventLogController.cs index bb5374e0..3a757bf4 100644 --- a/server/AyaNova/Controllers/EventLogController.cs +++ b/server/AyaNova/Controllers/EventLogController.cs @@ -65,7 +65,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var ret = await EventLogProcessor.GetLogForObjectAsync(opt, ct); - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } @@ -95,7 +95,7 @@ namespace AyaNova.Api.Controllers } var ret = await EventLogProcessor.GetLogForUserAsync(opt, ct); - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } diff --git a/server/AyaNova/Controllers/FormCustomController.cs b/server/AyaNova/Controllers/FormCustomController.cs index 62e79f82..cee1b818 100644 --- a/server/AyaNova/Controllers/FormCustomController.cs +++ b/server/AyaNova/Controllers/FormCustomController.cs @@ -84,7 +84,7 @@ namespace AyaNova.Api.Controllers } } - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -112,7 +112,7 @@ namespace AyaNova.Api.Controllers if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - return Ok(ApiOkResponse.Response(CustomFieldType.ValidCustomFieldTypes, true)); + return Ok(ApiOkResponse.Response(CustomFieldType.ValidCustomFieldTypes)); } @@ -132,7 +132,7 @@ namespace AyaNova.Api.Controllers if (!ModelState.IsValid) return BadRequest(new ApiErrorResponse(ModelState)); - return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFieldDefinitionKeys, true)); + return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFieldDefinitionKeys)); } @@ -175,7 +175,7 @@ namespace AyaNova.Api.Controllers else return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } diff --git a/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs b/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs index 5b68c16d..d1644f83 100644 --- a/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs +++ b/server/AyaNova/Controllers/FormFieldsDefinitionsController.cs @@ -54,7 +54,7 @@ namespace AyaNova.Api.Controllers if (AyaFormFieldDefinitions.IsValidFormFieldDefinitionKey(FormFieldDefinitionKey)) { - return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFields(FormFieldDefinitionKey), true)); + return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFields(FormFieldDefinitionKey))); } else { diff --git a/server/AyaNova/Controllers/GlobalBizSettingsController.cs b/server/AyaNova/Controllers/GlobalBizSettingsController.cs index 45db0472..39bd8fb5 100644 --- a/server/AyaNova/Controllers/GlobalBizSettingsController.cs +++ b/server/AyaNova/Controllers/GlobalBizSettingsController.cs @@ -60,7 +60,7 @@ namespace AyaNova.Api.Controllers if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -126,7 +126,7 @@ namespace AyaNova.Api.Controllers SearchCaseSensitiveOnly = AyaNova.Util.ServerGlobalBizSettings.SearchCaseSensitiveOnly }; - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } }//eoc diff --git a/server/AyaNova/Controllers/HeadOfficeController.cs b/server/AyaNova/Controllers/HeadOfficeController.cs index e7d02784..45718c84 100644 --- a/server/AyaNova/Controllers/HeadOfficeController.cs +++ b/server/AyaNova/Controllers/HeadOfficeController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/JobOperationsController.cs b/server/AyaNova/Controllers/JobOperationsController.cs index 16d54e82..3045765e 100644 --- a/server/AyaNova/Controllers/JobOperationsController.cs +++ b/server/AyaNova/Controllers/JobOperationsController.cs @@ -70,7 +70,7 @@ namespace AyaNova.Api.Controllers JobOperationsBiz biz = new JobOperationsBiz(ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items)); List l = await biz.GetJobListAsync(); - return Ok(ApiOkResponse.Response(l, true)); + return Ok(ApiOkResponse.Response(l)); } @@ -101,7 +101,7 @@ namespace AyaNova.Api.Controllers JobOperationsBiz biz = new JobOperationsBiz(ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items)); List l = await biz.GetJobLogListAsync(gid); - return Ok(ApiOkResponse.Response(l, true)); + return Ok(ApiOkResponse.Response(l)); } diff --git a/server/AyaNova/Controllers/LicenseController.cs b/server/AyaNova/Controllers/LicenseController.cs index 734de8ba..1665f939 100644 --- a/server/AyaNova/Controllers/LicenseController.cs +++ b/server/AyaNova/Controllers/LicenseController.cs @@ -64,7 +64,7 @@ namespace AyaNova.Api.Controllers var ret = AyaNova.Core.License.LicenseInfoAsJson; - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } @@ -80,7 +80,7 @@ namespace AyaNova.Api.Controllers //note: this route is called by the client as the first action so it also acts like a ping to see if the server is up as well if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - return Ok(ApiOkResponse.Response(AyaNova.Core.License.ActiveKey.TrialLicense, true)); + return Ok(ApiOkResponse.Response(AyaNova.Core.License.ActiveKey.TrialLicense)); } @@ -135,7 +135,7 @@ namespace AyaNova.Api.Controllers //Log await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseFetch), ct); - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } @@ -180,7 +180,7 @@ namespace AyaNova.Api.Controllers //Log await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseTrialRequest), ct); - return Ok(ApiOkResponse.Response(ret, true)); + return Ok(ApiOkResponse.Response(ret)); } diff --git a/server/AyaNova/Controllers/LoanUnitController.cs b/server/AyaNova/Controllers/LoanUnitController.cs index 99bfd9ec..bf2198a2 100644 --- a/server/AyaNova/Controllers/LoanUnitController.cs +++ b/server/AyaNova/Controllers/LoanUnitController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/LogFilesController.cs b/server/AyaNova/Controllers/LogFilesController.cs index 6ce80a4d..981dcc72 100644 --- a/server/AyaNova/Controllers/LogFilesController.cs +++ b/server/AyaNova/Controllers/LogFilesController.cs @@ -123,7 +123,7 @@ namespace AyaNova.Api.Controllers - return Ok(ApiOkResponse.Response(o, true)); + return Ok(ApiOkResponse.Response(o)); } diff --git a/server/AyaNova/Controllers/MetricsController.cs b/server/AyaNova/Controllers/MetricsController.cs index 9caddcf3..673b6d86 100644 --- a/server/AyaNova/Controllers/MetricsController.cs +++ b/server/AyaNova/Controllers/MetricsController.cs @@ -90,7 +90,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)); + return Ok(ApiOkResponse.Response(json)); } /// diff --git a/server/AyaNova/Controllers/NotifyController.cs b/server/AyaNova/Controllers/NotifyController.cs index d8b5b387..5429de3f 100644 --- a/server/AyaNova/Controllers/NotifyController.cs +++ b/server/AyaNova/Controllers/NotifyController.cs @@ -46,7 +46,7 @@ namespace AyaNova.Api.Controllers //note: this route is called by the client as the first action so it also acts like a ping to see if the server is up as well if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - return Ok(ApiOkResponse.Response(!AyaNova.Core.License.ActiveKey.TrialLicense, true)); + return Ok(ApiOkResponse.Response(!AyaNova.Core.License.ActiveKey.TrialLicense)); } @@ -61,7 +61,7 @@ namespace AyaNova.Api.Controllers //STUB: https://rockfish.ayanova.com/default.htm#!/rfcaseEdit/3783 if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - return Ok(ApiOkResponse.Response(69, true)); + return Ok(ApiOkResponse.Response(69)); } //TODO: See new count case for gist of it diff --git a/server/AyaNova/Controllers/PMController.cs b/server/AyaNova/Controllers/PMController.cs index 3a06606f..46bb5b57 100644 --- a/server/AyaNova/Controllers/PMController.cs +++ b/server/AyaNova/Controllers/PMController.cs @@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers // NOTE: HERE would be the second check of biz rules before returning the object // in cases where there is also a business rule to affect retrieval on top of basic rights - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -109,7 +109,7 @@ namespace AyaNova.Api.Controllers else return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } diff --git a/server/AyaNova/Controllers/PMTemplateController.cs b/server/AyaNova/Controllers/PMTemplateController.cs index cadb1c75..e463f4de 100644 --- a/server/AyaNova/Controllers/PMTemplateController.cs +++ b/server/AyaNova/Controllers/PMTemplateController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/PartController.cs b/server/AyaNova/Controllers/PartController.cs index 340ea998..b23cd500 100644 --- a/server/AyaNova/Controllers/PartController.cs +++ b/server/AyaNova/Controllers/PartController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/PickListController.cs b/server/AyaNova/Controllers/PickListController.cs index a6898d0f..aa2cba91 100644 --- a/server/AyaNova/Controllers/PickListController.cs +++ b/server/AyaNova/Controllers/PickListController.cs @@ -87,7 +87,7 @@ namespace AyaNova.Api.Controllers if (o == null) return BadRequest(new ApiErrorResponse(biz.Errors)); else - return Ok(ApiOkResponse.Response(o, true)); + return Ok(ApiOkResponse.Response(o)); } @@ -116,7 +116,7 @@ namespace AyaNova.Api.Controllers if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -139,7 +139,7 @@ namespace AyaNova.Api.Controllers if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, true)); + return Ok(ApiOkResponse.Response(o)); } @@ -231,7 +231,7 @@ namespace AyaNova.Api.Controllers { return BadRequest(new ApiErrorResponse(ApiErrorCode.NOT_FOUND, "ayatype", $"PickList for type \"{ayaType.ToString()}\" not supported")); } - return Ok(ApiOkResponse.Response(PickList.ColumnDefinitions, true)); + return Ok(ApiOkResponse.Response(PickList.ColumnDefinitions)); } diff --git a/server/AyaNova/Controllers/ProjectController.cs b/server/AyaNova/Controllers/ProjectController.cs index 58f0e652..b857438c 100644 --- a/server/AyaNova/Controllers/ProjectController.cs +++ b/server/AyaNova/Controllers/ProjectController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/PurchaseOrderController.cs b/server/AyaNova/Controllers/PurchaseOrderController.cs index dfe227d4..6ee5d92b 100644 --- a/server/AyaNova/Controllers/PurchaseOrderController.cs +++ b/server/AyaNova/Controllers/PurchaseOrderController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/QuoteController.cs b/server/AyaNova/Controllers/QuoteController.cs index 15d22574..78483674 100644 --- a/server/AyaNova/Controllers/QuoteController.cs +++ b/server/AyaNova/Controllers/QuoteController.cs @@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers // NOTE: HERE would be the second check of biz rules before returning the object // in cases where there is also a business rule to affect retrieval on top of basic rights - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -109,7 +109,7 @@ namespace AyaNova.Api.Controllers else return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } diff --git a/server/AyaNova/Controllers/QuoteTemplateController.cs b/server/AyaNova/Controllers/QuoteTemplateController.cs index 47b1e224..11963d1c 100644 --- a/server/AyaNova/Controllers/QuoteTemplateController.cs +++ b/server/AyaNova/Controllers/QuoteTemplateController.cs @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers // NOTE: HERE would be the second check of biz rules before returning the object // in cases where there is also a business rule to affect retrieval on top of basic rights - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers else return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } diff --git a/server/AyaNova/Controllers/SearchController.cs b/server/AyaNova/Controllers/SearchController.cs index cb49d3ce..9e2f7a67 100644 --- a/server/AyaNova/Controllers/SearchController.cs +++ b/server/AyaNova/Controllers/SearchController.cs @@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers //Do the search var SearchResults = await Search.DoSearchAsync(ct, UserTranslationIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items), searchParams); - return Ok(ApiOkResponse.Response(SearchResults, true)); + return Ok(ApiOkResponse.Response(SearchResults)); } /// @@ -96,7 +96,7 @@ namespace AyaNova.Api.Controllers var res = await Search.GetInfoAsync(ct, UserTranslationIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items), UserIdFromContext.Id(HttpContext.Items), phrase, max, ayaType, id); - return Ok(ApiOkResponse.Response(res, true)); + return Ok(ApiOkResponse.Response(res)); } @@ -133,8 +133,8 @@ namespace AyaNova.Api.Controllers case AyaType.WorkOrderItemScheduledUser: case AyaType.WorkOrderItemTask: case AyaType.WorkOrderItemTravel: - AyaTypeId TypeId=await WorkOrderBiz.GetAncestor(ayaType, id, ct); - return Ok(ApiOkResponse.Response(new {AyaType=TypeId.ObjectTypeAsInt,Id=TypeId.ObjectId}, true)); + AyaTypeId TypeId = await WorkOrderBiz.GetAncestor(ayaType, id, ct); + return Ok(ApiOkResponse.Response(new { AyaType = TypeId.ObjectTypeAsInt, Id = TypeId.ObjectId })); default: return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_INVALID_VALUE, "ayaType", "Only types with ancestors are valid")); diff --git a/server/AyaNova/Controllers/ServerStateController.cs b/server/AyaNova/Controllers/ServerStateController.cs index 7360b0ea..0fb40429 100644 --- a/server/AyaNova/Controllers/ServerStateController.cs +++ b/server/AyaNova/Controllers/ServerStateController.cs @@ -47,7 +47,7 @@ namespace AyaNova.Api.Controllers [HttpGet] public ActionResult Get() { - return Ok(ApiOkResponse.Response(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason }, !Authorized.HasModifyRole(HttpContext.Items, AyaType.ServerState))); + return Ok(ApiOkResponse.Response(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason })); } @@ -86,7 +86,7 @@ namespace AyaNova.Api.Controllers //Log await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.ServerState, AyaEvent.ServerStateChange, $"{state.ServerState}-{state.Reason}"), ct); - return Ok(ApiOkResponse.Response(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason }, false)); + return Ok(ApiOkResponse.Response(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason })); } diff --git a/server/AyaNova/Controllers/TagController.cs b/server/AyaNova/Controllers/TagController.cs index 127206c1..fc2a5b6c 100644 --- a/server/AyaNova/Controllers/TagController.cs +++ b/server/AyaNova/Controllers/TagController.cs @@ -53,7 +53,7 @@ namespace AyaNova.Api.Controllers { if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - return Ok(ApiOkResponse.Response(await TagBiz.TagListFilteredAsync(ct, query), true)); + return Ok(ApiOkResponse.Response(await TagBiz.TagListFilteredAsync(ct, query))); } /// @@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers { if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); - return Ok(ApiOkResponse.Response(await TagBiz.CloudListFilteredAsync(ct, query), true)); + return Ok(ApiOkResponse.Response(await TagBiz.CloudListFilteredAsync(ct, query))); } diff --git a/server/AyaNova/Controllers/TranslationController.cs b/server/AyaNova/Controllers/TranslationController.cs index f377daf1..d22ac2e5 100644 --- a/server/AyaNova/Controllers/TranslationController.cs +++ b/server/AyaNova/Controllers/TranslationController.cs @@ -78,7 +78,7 @@ namespace AyaNova.Api.Controllers return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); } - return Ok(ApiOkResponse.Response(o, true)); + return Ok(ApiOkResponse.Response(o)); } @@ -97,7 +97,7 @@ namespace AyaNova.Api.Controllers TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext); var l = await biz.GetTranslationListAsync(); - return Ok(ApiOkResponse.Response(l, true)); + return Ok(ApiOkResponse.Response(l)); } @@ -116,7 +116,7 @@ namespace AyaNova.Api.Controllers TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext); var l = await biz.TranslationKeyCoverageAsync(); - return Ok(ApiOkResponse.Response(l, true)); + return Ok(ApiOkResponse.Response(l)); } #endif @@ -138,7 +138,7 @@ namespace AyaNova.Api.Controllers TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext); var l = await biz.GetSubsetAsync(inObj); - return Ok(ApiOkResponse.Response(l, true)); + return Ok(ApiOkResponse.Response(l)); } @@ -234,7 +234,7 @@ namespace AyaNova.Api.Controllers } - return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency })); } @@ -354,7 +354,7 @@ namespace AyaNova.Api.Controllers } } - return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency })); } diff --git a/server/AyaNova/Controllers/UnitController.cs b/server/AyaNova/Controllers/UnitController.cs index 55aa65db..eb55ab00 100644 --- a/server/AyaNova/Controllers/UnitController.cs +++ b/server/AyaNova/Controllers/UnitController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/UnitModelController.cs b/server/AyaNova/Controllers/UnitModelController.cs index 623676d8..234dc4b0 100644 --- a/server/AyaNova/Controllers/UnitModelController.cs +++ b/server/AyaNova/Controllers/UnitModelController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/UserController.cs b/server/AyaNova/Controllers/UserController.cs index da6e67f0..356a1a39 100644 --- a/server/AyaNova/Controllers/UserController.cs +++ b/server/AyaNova/Controllers/UserController.cs @@ -79,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)); } @@ -107,7 +107,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); ; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); ; } @@ -165,7 +165,7 @@ namespace AyaNova.Api.Controllers // return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); // } // } - // return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + // return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); // } diff --git a/server/AyaNova/Controllers/UserOptionsController.cs b/server/AyaNova/Controllers/UserOptionsController.cs index 93e3a56d..8250249e 100644 --- a/server/AyaNova/Controllers/UserOptionsController.cs +++ b/server/AyaNova/Controllers/UserOptionsController.cs @@ -79,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)); } @@ -138,7 +138,7 @@ namespace AyaNova.Api.Controllers } } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } diff --git a/server/AyaNova/Controllers/VendorController.cs b/server/AyaNova/Controllers/VendorController.cs index 7daccd9a..0e3447d0 100644 --- a/server/AyaNova/Controllers/VendorController.cs +++ b/server/AyaNova/Controllers/VendorController.cs @@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));; } /// diff --git a/server/AyaNova/Controllers/WidgetController.cs b/server/AyaNova/Controllers/WidgetController.cs index bfb75444..907c3524 100644 --- a/server/AyaNova/Controllers/WidgetController.cs +++ b/server/AyaNova/Controllers/WidgetController.cs @@ -107,7 +107,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -133,7 +133,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); ; + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); ; } /// diff --git a/server/AyaNova/Controllers/WorkOrderController.cs b/server/AyaNova/Controllers/WorkOrderController.cs index a168cccc..4dc3738b 100644 --- a/server/AyaNova/Controllers/WorkOrderController.cs +++ b/server/AyaNova/Controllers/WorkOrderController.cs @@ -115,7 +115,7 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.WorkOrderGetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -143,7 +143,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// @@ -245,7 +245,7 @@ namespace AyaNova.Api.Controllers var o = await biz.ItemGetAsync(WorkOrderItemId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItem))); + return Ok(ApiOkResponse.Response(o)); } @@ -274,7 +274,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } @@ -354,7 +354,7 @@ namespace AyaNova.Api.Controllers var o = await biz.ExpenseGetAsync(WorkOrderItemExpenseId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemExpense))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -381,7 +381,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// @@ -461,7 +461,7 @@ namespace AyaNova.Api.Controllers var o = await biz.LaborGetAsync(workOrderItemLaborId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemLabor))); + return Ok(ApiOkResponse.Response(o)); } @@ -489,7 +489,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } @@ -570,7 +570,7 @@ namespace AyaNova.Api.Controllers var o = await biz.LoanGetAsync(WorkOrderItemLoanId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemLoan))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -597,7 +597,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// @@ -676,7 +676,7 @@ namespace AyaNova.Api.Controllers var o = await biz.PartGetAsync(WorkOrderItemPartId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemPart))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -703,7 +703,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// @@ -782,7 +782,7 @@ namespace AyaNova.Api.Controllers var o = await biz.PartRequestGetAsync(WorkOrderItemPartRequestId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemPartRequest))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -809,7 +809,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// @@ -888,7 +888,7 @@ namespace AyaNova.Api.Controllers var o = await biz.ScheduledUserGetAsync(WorkOrderItemScheduledUserId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemScheduledUser))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -915,7 +915,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// @@ -994,7 +994,7 @@ namespace AyaNova.Api.Controllers var o = await biz.TaskGetAsync(WorkOrderItemTaskId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemTask))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -1021,7 +1021,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// @@ -1100,7 +1100,7 @@ namespace AyaNova.Api.Controllers var o = await biz.TravelGetAsync(WorkOrderItemTravelId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemTravel))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -1127,7 +1127,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// @@ -1206,7 +1206,7 @@ namespace AyaNova.Api.Controllers var o = await biz.UnitGetAsync(WorkOrderItemUnitId); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemUnit))); + return Ok(ApiOkResponse.Response(o)); } /// @@ -1233,7 +1233,7 @@ namespace AyaNova.Api.Controllers else return BadRequest(new ApiErrorResponse(biz.Errors)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } /// diff --git a/server/AyaNova/Controllers/WorkOrderTemplateController.cs b/server/AyaNova/Controllers/WorkOrderTemplateController.cs index ad8f1d99..d7514da5 100644 --- a/server/AyaNova/Controllers/WorkOrderTemplateController.cs +++ b/server/AyaNova/Controllers/WorkOrderTemplateController.cs @@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers // NOTE: HERE would be the second check of biz rules before returning the object // in cases where there is also a business rule to affect retrieval on top of basic rights - return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType))); + return Ok(ApiOkResponse.Response(o)); } @@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers else return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT)); } - return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); + return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); } diff --git a/server/AyaNova/Controllers/XXX_DEPRECATED_ImportAyaNova7Controller.cs b/server/AyaNova/Controllers/XXX_DEPRECATED_ImportAyaNova7Controller.cs index 52ea3e97..05c8787c 100644 --- a/server/AyaNova/Controllers/XXX_DEPRECATED_ImportAyaNova7Controller.cs +++ b/server/AyaNova/Controllers/XXX_DEPRECATED_ImportAyaNova7Controller.cs @@ -198,7 +198,7 @@ // //dump file name example: ayanova.data.dump.XXX.zip // List l = FileUtil.UtilityFileList("ayanova.data.dump.*.zip"); -// return Ok(ApiOkResponse.Response(l, true)); +// return Ok(ApiOkResponse.Response(l)); // }