Merge remote-tracking branch 'origin/netcore/netcore' into netcore/bu…

…gfix/integration-tests-examine-indexes
umbraco · Sep 2, 2020 · 775360e · 775360e
2 parents a5772f1 + edca4af
commit 775360e
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 56 deletions.
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -1,60 +1,60 @@
 {
-    "ConnectionStrings": {
+  "ConnectionStrings": {
         "umbracoDbDSN": ""
-    },
-    "Umbraco": {
-        "CMS": {
-            "Content": {
-                "Notifications": {
-                    "Email": "[email protected]"
-                },
-                "MacroErrors": "throw"
-            },
-            "Global": {
-                "DefaultUILanguage": "en-us",
-                "HideTopLevelNodeFromPath": true,
-                "Path": "~/umbraco",
-                "TimeOutInMinutes": 20,
-                "UseHttps": false
-            },
-            "Hosting": {
-                "Debug": false
-            },
-            "KeepAlive": {
-                "DisableKeepAliveTask": false,
-                "KeepAlivePingUrl": "{umbracoApplicationUrl}/api/keepalive/ping"
-            },
-            "RequestHandler": {
-                "ConvertUrlsToAscii": "try"
-            },
-            "RuntimeMinification": {
-                "dataFolder": "App_Data\\Smidge",
-                "version": "1"
-            },
-            "Security": {
-                "KeepUserLoggedIn": false,
-                "UsernameIsEmail": true,
-                "HideDisabledUsersInBackoffice": false,
-                "UserPassword": {
-                    "RequiredLength": 10,
-                    "RequireNonLetterOrDigit": false,
-                    "RequireDigit": false,
-                    "RequireLowercase": false,
-                    "RequireUppercase": false,
-                    "MaxFailedAccessAttemptsBeforeLockout": 0
-                },
-                "MemberPassword": {
-                    "RequiredLength": 10,
-                    "RequireNonLetterOrDigit": false,
-                    "RequireDigit": false,
-                    "RequireLowercase": false,
-                    "RequireUppercase": false,
-                    "MaxFailedAccessAttemptsBeforeLockout": 0
-                }
-            },
-            "Tours": {
-                "EnableTours": true
-            }
+  },
+  "Umbraco": {
+    "CMS": {
+      "Content": {
+        "Notifications": {
+          "Email": "[email protected]"
+        },
+        "MacroErrors": "throw"
+      },
+      "Global": {
+        "DefaultUILanguage": "en-us",
+        "HideTopLevelNodeFromPath": true,
+        "Path": "~/umbraco",
+        "TimeOutInMinutes": 20,
+        "UseHttps": false
+      },
+      "Hosting": {
+        "Debug": false
+      },
+      "KeepAlive": {
+        "DisableKeepAliveTask": false,
+        "KeepAlivePingUrl": "{umbracoApplicationUrl}/api/keepalive/ping"
+      },
+      "RequestHandler": {
+        "ConvertUrlsToAscii": "try"
+      },
+      "RuntimeMinification": {
+        "dataFolder": "App_Data\\Smidge",
+        "version": "1"
+      },
+      "Security": {
+        "KeepUserLoggedIn": false,
+        "UsernameIsEmail": true,
+        "HideDisabledUsersInBackoffice": false,
+        "UserPassword": {
+          "RequiredLength": 10,
+          "RequireNonLetterOrDigit": false,
+          "RequireDigit": false,
+          "RequireLowercase": false,
+          "RequireUppercase": false,
+          "MaxFailedAccessAttemptsBeforeLockout": 5
+        },
+        "MemberPassword": {
+          "RequiredLength": 10,
+          "RequireNonLetterOrDigit": false,
+          "RequireDigit": false,
+          "RequireLowercase": false,
+          "RequireUppercase": false,
+          "MaxFailedAccessAttemptsBeforeLockout": 5
         }
+      },
+      "Tours": {
+        "EnableTours": true
+      }
     }
+  }
 }
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -73,7 +73,7 @@ internal Dictionary<string, object> BareMinimumServerVariables()
             //this is the filter for the keys that we'll keep based on the full version of the server vars
             var keepOnlyKeys = new Dictionary<string, string[]>
             {
-                {"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl"}},
+                {"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl", "iconApiBaseUrl"}},
                 {"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage", "canSendRequiredEmail", "usernameIsEmail"}},
                 {"application", new[] {"applicationPath", "cacheBuster"}},
                 {"isDebuggingEnabled", new string[] { }},