From ecca480334bf5dac1e937848d1ba86ccec7e5552 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sat, 29 Apr 2017 12:24:10 +0200
Subject: [PATCH] Get backoffice identity from cookie instead of grabbing it
 from database

---
 .../Auditing/IdentityAuditEventArgs.cs        | 22 +++++++++----------
 src/Umbraco.Core/Umbraco.Core.csproj          |  3 +++
 src/Umbraco.Core/packages.config              |  1 +
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs b/src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs
index 7fb01791ba..27e6dc69c3 100644
--- a/src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs
+++ b/src/Umbraco.Core/Auditing/IdentityAuditEventArgs.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Web;
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.Owin;
 using Umbraco.Core.Security;
 
 namespace Umbraco.Core.Auditing
@@ -43,18 +45,14 @@ namespace Umbraco.Core.Auditing
         /// <returns></returns>
         protected int GetCurrentRequestBackofficeUserId()
         {
-            if (HttpContext.Current == null) return 0;
-
-            var authenticationTicket = new HttpContextWrapper(HttpContext.Current).GetUmbracoAuthTicket();
-            if (authenticationTicket != null)
-            {
-                var currentBackofficeUser = ApplicationContext.Current.Services.UserService.GetByUsername(authenticationTicket.Name);
-                if (currentBackofficeUser != null)
-                    return currentBackofficeUser.Id;
-            }
-
-            // couldn't get auth ticket or current user, return default user (0)
-            return 0;
+            var userId = 0;
+            if (HttpContext.Current == null) return userId;
+            var owinContext = HttpContext.Current.GetOwinContext();
+            if (owinContext == null) return userId;
+            var backOfficeIdentity = owinContext.Authentication.User.GetUmbracoIdentity();
+            if (backOfficeIdentity != null)
+                int.TryParse(backOfficeIdentity.Id.ToString(), out userId);
+            return userId;
         }
     }
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 9603415025..8b785e1a2b 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -74,6 +74,9 @@
       <HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Owin.Security, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
       <Private>True</Private>
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index 191eb11c01..9268232097 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -8,6 +8,7 @@
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
   <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
+  <package id="Microsoft.Owin.Host.SystemWeb" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Security" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Security.Cookies" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net45" />