diff --git a/server/AyaNova/Controllers/DataListController.cs b/server/AyaNova/Controllers/DataListController.cs
index 39d4969e..6c279eb3 100644
--- a/server/AyaNova/Controllers/DataListController.cs
+++ b/server/AyaNova/Controllers/DataListController.cs
@@ -43,7 +43,7 @@ namespace AyaNova.Api.Controllers
///
/// Get list of data for selection / viewing
///
- /// Required roles: Varies by list
+ /// Required roles: Varies by list, if not allowed will return 403 - Not Authorized
///
///
/// List key, Paging, filtering and sorting options
@@ -57,10 +57,9 @@ namespace AyaNova.Api.Controllers
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
-
-
- long UserId = UserIdFromContext.Id(HttpContext.Items);
+ var UserId = UserIdFromContext.Id(HttpContext.Items);
var UserRoles = UserRolesFromContext.Roles(HttpContext.Items);
+
try
{
ApiPagedResponse pr = await DataListFetcher.GetResponse(listOptions.DataListKey, ct, Url, nameof(List), listOptions, UserId, UserRoles);
diff --git a/server/AyaNova/Controllers/WidgetController.cs b/server/AyaNova/Controllers/WidgetController.cs
index d3a66dcf..22e36596 100644
--- a/server/AyaNova/Controllers/WidgetController.cs
+++ b/server/AyaNova/Controllers/WidgetController.cs
@@ -84,57 +84,57 @@ namespace AyaNova.Api.Controllers
}
- //COMMENTED OUT, FOR NOW UNTIL I GET THE FULLY WORKING TEST LIST BELOW THEN COME BACK AND LOOK AT THIS
- ///
- /// Get list for selection / viewing
- ///
- /// Required roles: Any in-house staff (some roles might have restrictions on exact fields that are returned)
- ///
- ///
- /// Paging, filtering and sorting options
- /// Collection with paging data
- [HttpGet("List", Name = nameof(List))]
- public ActionResult List([FromQuery] ListOptions pagingOptions)
- {
- if (serverState.IsClosed)
- return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
+
+ // ///
+ // /// Get list for selection / viewing
+ // ///
+ // /// Required roles: Any in-house staff (some roles might have restrictions on exact fields that are returned)
+ // ///
+ // ///
+ // /// Paging, filtering and sorting options
+ // /// Collection with paging data
+ // [HttpGet("List", Name = nameof(List))]
+ // public ActionResult List([FromQuery] ListOptions pagingOptions)
+ // {
+ // if (serverState.IsClosed)
+ // return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
- if (!ModelState.IsValid)
- return BadRequest(new ApiErrorResponse(ModelState));
+ // if (!ModelState.IsValid)
+ // return BadRequest(new ApiErrorResponse(ModelState));
- //Instantiate the business object handler
- WidgetBiz biz = WidgetBiz.GetBiz(ct, HttpContext);
+ // //Instantiate the business object handler
+ // WidgetBiz biz = WidgetBiz.GetBiz(ct, HttpContext);
- ApiPagedResponse pr = biz.GetList(Url, nameof(List), pagingOptions).Result;
- return Ok(new ApiOkWithPagingResponse(pr));
+ // ApiPagedResponse pr = biz.GetList(Url, nameof(List), pagingOptions).Result;
+ // return Ok(new ApiOkWithPagingResponse(pr));
- }
+ // }
- ///
- /// TEST list with relationships
- ///
- /// Required roles: Any in-house staff (some roles might have restrictions on exact fields that are returned)
- ///
- ///
- /// Paging, filtering and sorting options
- /// Collection with paging data
- [HttpGet("TestGetWidgetUserEmailList", Name = nameof(TestGetWidgetUserEmailList))]
- public ActionResult TestGetWidgetUserEmailList([FromQuery] ListOptions pagingOptions)
- {
- if (serverState.IsClosed)
- return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
+ // ///
+ // /// TEST list with relationships
+ // ///
+ // /// Required roles: Any in-house staff (some roles might have restrictions on exact fields that are returned)
+ // ///
+ // ///
+ // /// Paging, filtering and sorting options
+ // /// Collection with paging data
+ // [HttpGet("TestGetWidgetUserEmailList", Name = nameof(TestGetWidgetUserEmailList))]
+ // public ActionResult TestGetWidgetUserEmailList([FromQuery] ListOptions pagingOptions)
+ // {
+ // if (serverState.IsClosed)
+ // return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
- if (!ModelState.IsValid)
- return BadRequest(new ApiErrorResponse(ModelState));
+ // if (!ModelState.IsValid)
+ // return BadRequest(new ApiErrorResponse(ModelState));
- //Instantiate the business object handler
- WidgetBiz biz = WidgetBiz.GetBiz(ct, HttpContext);
+ // //Instantiate the business object handler
+ // WidgetBiz biz = WidgetBiz.GetBiz(ct, HttpContext);
- ApiPagedResponse pr = biz.TestGetWidgetUserEmailList(Url, nameof(TestGetWidgetUserEmailList), pagingOptions).Result;
- return Ok(new ApiOkWithPagingResponse(pr));
- // string ret= biz.GetList(Url, nameof(List), pagingOptions).Result;
- // return Ok(ret);
- }
+ // ApiPagedResponse pr = biz.TestGetWidgetUserEmailList(Url, nameof(TestGetWidgetUserEmailList), pagingOptions).Result;
+ // return Ok(new ApiOkWithPagingResponse(pr));
+ // // string ret= biz.GetList(Url, nameof(List), pagingOptions).Result;
+ // // return Ok(ret);
+ // }
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index d328a2eb..f29062de 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -273,20 +273,20 @@ namespace AyaNova.Biz
//Generic list of widgets
#region GetList
- //COMMENTED OUT, FOR NOW UNTIL I GET THE FULLY WORKING TEST LIST BELOW THEN COME BACK AND LOOK AT THIS
- internal async Task GetList(IUrlHelper Url, string routeName, ListOptions listOptions)
- {
+
+ // internal async Task GetList(IUrlHelper Url, string routeName, ListOptions listOptions)
+ // {
- //TODO: Get template (MOCKED FOR NOW UNTIL PROOF OF CONCEPT)
+ // //TODO: Get template (MOCKED FOR NOW UNTIL PROOF OF CONCEPT)
- var MOCK_WIDGET_DISPLAY_TEMPLATE_JSON = @"
- {
- ""full"":[""widgetname"",""widgetserial"",""widgetdollaramount"",""widgetroles"",""widgetstartdate"",""widgetactive"",""username""],
- ""mini"":[""widgetname"",""widgetserial""]
- }
- ";
- return await DataListFetcher.GetResponse(nameof(WidgetDataList), ct, Url, routeName, listOptions, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON, UserId);
- }
+ // var MOCK_WIDGET_DISPLAY_TEMPLATE_JSON = @"
+ // {
+ // ""full"":[""widgetname"",""widgetserial"",""widgetdollaramount"",""widgetroles"",""widgetstartdate"",""widgetactive"",""username""],
+ // ""mini"":[""widgetname"",""widgetserial""]
+ // }
+ // ";
+ // return await DataListFetcher.GetResponse(nameof(WidgetDataList), ct, Url, routeName, listOptions, MOCK_WIDGET_DISPLAY_TEMPLATE_JSON, UserId);
+ // }
#endregion
@@ -294,20 +294,20 @@ namespace AyaNova.Biz
//once this is working can replicate at will
#region TestGetWidgetUserEmailList
- internal async Task TestGetWidgetUserEmailList(IUrlHelper Url, string routeName, ListOptions listOptions)
- {
- //var dlist=AyaNova.DataList.DataListFactory.GetListOfAllDataListKeyNames();
+ // internal async Task TestGetWidgetUserEmailList(IUrlHelper Url, string routeName, ListOptions listOptions)
+ // {
+ // //var dlist=AyaNova.DataList.DataListFactory.GetListOfAllDataListKeyNames();
- //TODO: Get template (MOCKED FOR NOW UNTIL PROOF OF CONCEPT)
- var MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON = @"
- {
- ""full"":[""widgetname"",""username"",""emailaddress"",""widgetactive""],
- ""mini"":[""widgetname"",""username"",""emailaddress""]
- }
- ";
+ // //TODO: Get template (MOCKED FOR NOW UNTIL PROOF OF CONCEPT)
+ // var MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON = @"
+ // {
+ // ""full"":[""widgetname"",""username"",""emailaddress"",""widgetactive""],
+ // ""mini"":[""widgetname"",""username"",""emailaddress""]
+ // }
+ // ";
- return await DataListFetcher.GetResponse(nameof(TestWidgetUserEmailDataList), ct, Url, routeName, listOptions, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, UserId);
- }
+ // return await DataListFetcher.GetResponse(nameof(TestWidgetUserEmailDataList), ct, Url, routeName, listOptions, MOCK_WIDGET_USER_EMAIL_DISPLAY_TEMPLATE_JSON, UserId);
+ // }
#endregion