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:36:22 +00:00
parent e7908a0776
commit dfe7d990ad
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/AyaNova/Controllers/AuthController.cs
View File

@@ -347,15 +347,11 @@ namespace AyaNova.Api.Controllers
log.LogInformation($"User \"{u.Name}\" logged in from \"{HttpContext.Connection.RemoteIpAddress.ToString()}\" ok"); log.LogInformation($"User \"{u.Name}\" logged in from \"{HttpContext.Connection.RemoteIpAddress.ToString()}\" ok");
//return appropriate data //return appropriate data for user type...
if (u.UserType == UserType.Customer | u.UserType == UserType.HeadOffice) if (u.UserType == UserType.Customer | u.UserType == UserType.HeadOffice)
{ {
//customer type has special rights restrictions for UI features so return them here so client UI can enable or disable //customer type has special rights restrictions for UI features so return them here so client UI can enable or disable
return Ok(ApiOkResponse.Response(new
return Ok(ApiOkResponse.Response(new
{ {
token = token, token = token,
name = u.Name, name = u.Name,
@@ -363,10 +359,8 @@ namespace AyaNova.Api.Controllers
roles = ((int)u.Roles).ToString(), roles = ((int)u.Roles).ToString(),
dlt = DownloadToken, dlt = DownloadToken,
tfa = u.TwoFactorEnabled, tfa = u.TwoFactorEnabled,
CustomerAllowCSR = AyaNova.Util.ServerGlobalBizSettings.Cache.CustomerDefaultWorkOrderReportId, CustomerRights = UserBiz.CustomerUserEffectiveRights(u.Id)
})); }));
} }
else else
{ {

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

@@ -173,7 +173,7 @@ namespace AyaNova.Biz
} }
internal static bool CustomerUserEffectiveRightsAllowed(bool allowed, List<string> contactTags, List<string> inTags, List<string> outTags) private 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, //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 //not the whole list, just any one of them which differs from how notifications are checked for example which need to *all* match