From 243d0bba7bfe32f9d65d5d08411fd81ee1e9102f Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Mon, 11 Oct 2021 14:51:49 +0100
Subject: [PATCH 1/2] Implement IUserSessionStore<BackOfficeIdentityUser> to
 fix timeout bug #11350 (#11351)

---
 src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs b/src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
index e656e6819382..67e69c0788e0 100644
--- a/src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
+++ b/src/Umbraco.Infrastructure/Security/BackOfficeUserStore.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Cms.Core.Security
     /// <summary>
     /// The user store for back office users
     /// </summary>
-    public class BackOfficeUserStore : UmbracoUserStore<BackOfficeIdentityUser, IdentityRole<string>>
+    public class BackOfficeUserStore : UmbracoUserStore<BackOfficeIdentityUser, IdentityRole<string>>, IUserSessionStore<BackOfficeIdentityUser>
     {
         private readonly IScopeProvider _scopeProvider;
         private readonly IUserService _userService;

From 5fe30c746c5f3dd98a3b7776f41e6a97c8f36b11 Mon Sep 17 00:00:00 2001
From: Berg <mail@bergmania.dk>
Date: Tue, 12 Oct 2021 08:08:03 +0200
Subject: [PATCH 2/2] Fixed breaking change!

---
 src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
index 16b6590e576f..c4d6bac0fa1a 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/CurrentUserController.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Umbraco.Cms.Core;
@@ -93,6 +94,7 @@ public CurrentUserController(
             IUserService userService,
             IUmbracoMapper umbracoMapper,
             IBackOfficeUserManager backOfficeUserManager,
+            ILoggerFactory loggerFactory,
             ILocalizedTextService localizedTextService,
             AppCaches appCaches,
             IShortStringHelper shortStringHelper,