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-09-08 20:13:25 +00:00
parent 87d5ef188e
commit c37bddbfe1
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
server/AyaNova/Controllers/DataListController.cs
View File

@@ -115,21 +115,6 @@ namespace AyaNova.Api.Controllers
private async Task<bool> HandleCustomerTypeUserDataListRequest(long currentUserId, DataListTableRequest tableRequest)
{
// //ClientCriteria format for this list is "OBJECTID,AYATYPE"
// var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray();
// if (crit.Length < 3)
// return false;
// int nType = 0;
// if (!int.TryParse(crit[1], out nType)) return false;
// AyaType forType = (AyaType)nType;
// if (forType != AyaType.Customer && forType != AyaType.HeadOffice) return false;
// long lId = 0;
// if (!long.TryParse(crit[0], out lId)) return false;
// if (lId == 0) return false;
//Is this list allowed for a customer user and also enabled in global settings
switch (tableRequest.DataListKey)
{
@@ -142,21 +127,21 @@ namespace AyaNova.Api.Controllers
return false;
}
//Have valid type, have an id, is this User actually connected to the entity they are requesting data for
//Build client criteria if user is of correct type
var UserInfo = await ct.User.AsNoTracking().Select(x => new { x.UserType, x.CustomerId, x.HeadOfficeId }).FirstOrDefaultAsync();
switch (UserInfo.UserType)
{
case UserType.Customer:
if (UserInfo.CustomerId == null || UserInfo.CustomerId == 0) return false;
tableRequest.ClientCriteria = $"{UserInfo.CustomerId},{(int)AyaType.Customer}";
break;
case UserType.HeadOffice:
if (UserInfo.HeadOfficeId == null || UserInfo.HeadOfficeId == 0) return false;
tableRequest.ClientCriteria = $"{UserInfo.HeadOfficeId},{(int)AyaType.HeadOffice}";
break;
default://other user types can fuck right off!
return false;
}
return true;
}