From 1e480abfc83942a4a60a4c635790c7d3d46e0a6e Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 10 Mar 2021 14:40:25 +0100
Subject: [PATCH 1/2] Remove duplicated TreeAccessDocumentTypes policy and
 fixed the one for TreeAccessDictionary

---
 .../DependencyInjection/ServiceCollectionExtensions.cs    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs b/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
index 5ebada2c98..9c4caac73e 100644
--- a/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.BackOffice/DependencyInjection/ServiceCollectionExtensions.cs
@@ -365,16 +365,10 @@ namespace Umbraco.Extensions
                 policy.Requirements.Add(new TreeRequirement(Constants.Trees.Languages));
             });
 
-            options.AddPolicy(AuthorizationPolicies.TreeAccessDocumentTypes, policy =>
-            {
-                policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-                policy.Requirements.Add(new TreeRequirement(Constants.Trees.Dictionary));
-            });
-
             options.AddPolicy(AuthorizationPolicies.TreeAccessDictionary, policy =>
             {
                 policy.AuthenticationSchemes.Add(backOfficeAuthenticationScheme);
-                policy.Requirements.Add(new TreeRequirement(Constants.Trees.Dictionary, Constants.Trees.Dictionary));
+                policy.Requirements.Add(new TreeRequirement(Constants.Trees.Dictionary));
             });
 
             options.AddPolicy(AuthorizationPolicies.TreeAccessDictionaryOrTemplates, policy =>

From 63d7d23cd7ec3d8765e7ff92ff2a91e95bddac9c Mon Sep 17 00:00:00 2001
From: Elitsa Marinovska <elm@umbraco.dk>
Date: Wed, 10 Mar 2021 14:42:31 +0100
Subject: [PATCH 2/2] Revert changes to default appsettings.json

---
 src/Umbraco.Web.UI.NetCore/appsettings.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index f5d4ecf67e..a3e57978da 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "umbracoDbDSN": "Server=(LocalDB)\\Umbraco;Database=Netcore;Integrated Security=true"
+    "umbracoDbDSN": ""
   },
   "Serilog": {
     "MinimumLevel": {
@@ -25,8 +25,7 @@
         "HideTopLevelNodeFromPath": true,
         "UmbracoPath": "~/umbraco",
         "TimeOutInMinutes": 20,
-        "UseHttps": false,
-        "Id": "ddc95ed0-565b-4a63-bcdc-841f312f3e12"
+        "UseHttps": false
       },
       "Hosting": {
         "Debug": false
@@ -43,7 +42,7 @@
         "version": "637432008251409860"
       },
       "Security": {
-        "KeepUserLoggedIn": true,
+        "KeepUserLoggedIn": false,
         "UsernameIsEmail": true,
         "HideDisabledUsersInBackoffice": false,
         "UserPassword": {