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-06-15 23:33:39 +00:00
parent 5ee1159a5c
commit e7908a0776
2 changed files with 71 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,14 +111,7 @@ namespace AyaNova.Biz
{
using (AyContext ct = ServiceProviderProvider.DBContext)
{
bool CSR = false;
bool WO = false;
bool WOWIKI = false;
bool UserSettings = false;
bool NotifyServiceImminent = false;
bool NotifyCSRAccepted = false;
bool NotifyCSRRejected = false;
bool NotifyWOCreated = false;
var UserInfo = await ct.User.AsNoTracking().Where(x => x.Id == userId).Select(x => new { x.UserType, x.HeadOfficeId, x.CustomerId, x.Tags }).FirstAsync();
@@ -127,22 +120,86 @@ namespace AyaNova.Biz
List<string> AllTags = new List<string>();
AllTags.AddRange(UserInfo.Tags);
if (UserInfo.CustomerId != null && UserInfo.CustomerId != 0)
AllTags.AddRange(await ct.Customer.AsNoTracking().Where(x => x.Id == UserInfo.CustomerId).Select(x => x.Tags).FirstAsync());
if (UserInfo.HeadOfficeId != null && UserInfo.HeadOfficeId != 0)
AllTags.AddRange(await ct.HeadOffice.AsNoTracking().Where(x => x.Id == UserInfo.HeadOfficeId).Select(x => x.Tags).FirstAsync());
return new CustomerRightsRecord(
CustomerUserEffectiveRightsAllowed(AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowCSR,
AllTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowCSRInTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowCSROutTags),
AyaNova.Util.ServerGlobalBizSettings.Cache.
CustomerUserEffectiveRightsAllowed(AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowViewWO,
AllTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowViewWOInTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowViewWOOutTags),
CustomerUserEffectiveRightsAllowed(AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowWOWiki,
AllTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowWOWikiInTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowWOWikiOutTags),
CustomerUserEffectiveRightsAllowed(AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowUserSettings,
AllTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowUserSettingsInTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowUserSettingsOutTags),
return new CustomerRightsRecord(CSR, WO, WOWIKI, UserSettings, NotifyServiceImminent, NotifyCSRAccepted, NotifyCSRRejected, NotifyWOCreated);
CustomerUserEffectiveRightsAllowed(AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyServiceImminent,
AllTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyServiceImminentInTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyServiceImminentOutTags),
CustomerUserEffectiveRightsAllowed(AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyCSRAccepted,
AllTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyCSRAcceptedInTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyCSRAcceptedOutTags),
CustomerUserEffectiveRightsAllowed(AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyCSRRejected,
AllTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyCSRRejectedInTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyCSRRejectedOutTags),
CustomerUserEffectiveRightsAllowed(AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyWOCreated,
AllTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyWOCreatedInTags,
AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerAllowNotifyWOCreatedOutTags)
);
}
}
internal static bool CustomerUserEffectiveRightsAllowed(bool allowed, List<string> contactTags, List<string> inTags, List<string> outTags)
{
//Note: tag match rule as planned and documented is that it's a match if *any* single tag in intags or outtags are a match to any single tag in contact tags,
//not the whole list, just any one of them which differs from how notifications are checked for example which need to *all* match
//if outright banned then quickest short circuit here
if (!allowed) return false;
//No tags to verify means allowed
if (inTags.Count == 0 && outTags.Count == 0) return true;
//if contact tags is empty and inclusive is empty then it's a match and can short circuit
if (contactTags.Count == 0 && inTags.Count == 0) return true;
//if contact tags is empty and inclusive is not empty then no match is possible
if (contactTags.Count == 0 && inTags.Count > 0) return false;
//any of the exclusive tags in contact tags?
if (contactTags.Intersect(outTags).Any()) return false;
//any of the inclusive tags in contact tags?
if (contactTags.Intersect(inTags).Any()) return true;
return false;//this is because there are contact and in tags but there is no match
}
internal static UserBiz GetBiz(AyContext ct, Microsoft.AspNetCore.Http.HttpContext httpContext = null)
{
if (httpContext != null)