yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

larger refactor so we don't need to worry about 'loading' a users groups, it will all just be done, updated queries to fetch a user, it's groups and it's sections all at once, it might be a little heavy but we'll see. Adds/removes a few other methods that didn't seem right and uses group aliases for most things, adds Datbase unique indexes for group aliases and names (need to fix tests though)

Browse Source
This commit is contained in:
Shannon
2017-05-10 21:00:30 +10:00
parent f594006b95
commit 512f3237f0
26 changed files with 502 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Umbraco.Core/Security/BackOfficeUserStore.cs
View File

@@ -404,11 +404,11 @@ namespace Umbraco.Core.Security
}
var foundUser = _userService.GetUserById(asInt.Result);
var foundGroup = _userService.GetUserGroupByName(roleName);
var foundGroup = _userService.GetUserGroupByAlias(roleName);
if (foundUser != null && foundGroup != null)
{
foundUser.AddGroup(foundGroup);
foundUser.AddGroup(foundGroup.Alias);
}
return Task.FromResult(0);
@@ -433,11 +433,11 @@ namespace Umbraco.Core.Security
}
var foundUser = _userService.GetUserById(asInt.Result);
var foundGroup = _userService.GetUserGroupByName(roleName);
var foundGroup = _userService.GetUserGroupByAlias(roleName);
if (foundUser != null && foundGroup != null)
{
foundUser.RemoveGroup(foundGroup);
foundUser.RemoveGroup(foundGroup.Alias);
}
return Task.FromResult(0);
@@ -689,21 +689,21 @@ namespace Umbraco.Core.Security
user.SecurityStamp = identityUser.SecurityStamp;
}
if (user.Groups.Select(x => x.Name).ContainsAll(identityUser.Groups) == false
|| identityUser.Groups.ContainsAll(user.Groups.Select(x => x.Name)) == false)
if (user.Groups.ContainsAll(identityUser.Groups) == false
|| identityUser.Groups.ContainsAll(user.Groups) == false)
{
anythingChanged = true;
foreach (var group in user.Groups)
//clear out the current groups (need to ToArray since we are modifying the iterator)
foreach (var group in user.Groups.ToArray())
{
user.RemoveGroup(group);
}
foreach (var group in identityUser.Groups)
//get all of the ones found by alias and add them
var foundGroups = _userService.GetUserGroupsByAlias(identityUser.Groups);
foreach (var group in foundGroups)
{
var foundGroup = _userService.GetUserGroupByName(group);
if (foundGroup != null)
{
user.AddGroup(foundGroup);
}
user.AddGroup(group.Alias);
}
}