From 2eabcef69ba96e73cb9d42e81708d57db2904190 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 28 Jul 2017 14:01:45 +1000
Subject: [PATCH] Revert "Fix back-office identity"

This reverts commit 2d5f56cbff93b143467f856c91051d44e84a8454.

# Conflicts:
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
---
 .../Models/Identity/BackOfficeIdentityUser.cs  | 18 ++----------------
 .../BackOfficeClaimsIdentityFactory.cs         |  5 ++---
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
index d66ed5bfda..e2ab9ec692 100644
--- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
@@ -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()); }
         }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Security/BackOfficeClaimsIdentityFactory.cs b/src/Umbraco.Core/Security/BackOfficeClaimsIdentityFactory.cs
index 87f793e816..3725e84969 100644
--- a/src/Umbraco.Core/Security/BackOfficeClaimsIdentityFactory.cs
+++ b/src/Umbraco.Core/Security/BackOfficeClaimsIdentityFactory.cs
@@ -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
                 });