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

Revert "Fix back-office identity"

Browse Source 
This reverts commit 2d5f56cbff.

# Conflicts:
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
This commit is contained in:
Shannon
2017-07-28 14:01:45 +10:00
parent 6faadce477
commit 2eabcef69b
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
View File

@@ -132,14 +132,7 @@ namespace Umbraco.Core.Models.Identity
/// </summary>
public int[] AllStartContentIds
{
get
{
if (_allStartContentIds != null) return _allStartContentIds;
var gsn = Groups.Where(x => x.StartContentId.HasValue).Select(x => x.StartContentId.Value).Distinct().ToArray();
var usn = StartContentIds;
return _allStartContentIds = UserExtensions.CombineStartNodes(UmbracoObjectTypes.Document, gsn, usn, ApplicationContext.Current.Services.EntityService);
}
get { return _allStartContentIds ?? (_allStartContentIds = StartContentIds.Concat(Groups.Where(x => x.StartContentId.HasValue).Select(x => x.StartContentId.Value)).Distinct().ToArray()); }
}
/// <summary>
@@ -147,14 +140,7 @@ namespace Umbraco.Core.Models.Identity
/// </summary>
public int[] AllStartMediaIds
{
get
{
if (_allStartMediaIds != null) return _allStartMediaIds;
var gsn = Groups.Where(x => x.StartMediaId.HasValue).Select(x => x.StartMediaId.Value).Distinct().ToArray();
var usn = StartMediaIds;
return _allStartMediaIds = UserExtensions.CombineStartNodes(UmbracoObjectTypes.Media, gsn, usn, ApplicationContext.Current.Services.EntityService);
}
get { return _allStartMediaIds ?? (_allStartMediaIds = StartMediaIds.Concat(Groups.Where(x => x.StartMediaId.HasValue).Select(x => x.StartMediaId.Value)).Distinct().ToArray()); }
}
}
}

5
src/Umbraco.Core/Security/BackOfficeClaimsIdentityFactory.cs
View File

@@ -3,7 +3,6 @@ using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.AspNet.Identity;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Identity;
namespace Umbraco.Core.Security
@@ -40,8 +39,8 @@ namespace Umbraco.Core.Security
//For now, I'll fix this by using the user.Groups instead
//Roles = user.Roles.Select(x => x.RoleId).ToArray(),
Roles = user.Groups.Select(x => x.Alias).ToArray(),
StartContentNodes = user.AllStartContentIds,
StartMediaNodes = user.AllStartMediaIds,
StartContentNodes = user.StartContentIds,
StartMediaNodes = user.StartMediaIds,
SessionId = user.SecurityStamp
});