Merge branch 'v9/dev' into v9/contrib

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/pages/login.less

src/Umbraco.Core/Configuration/Models/ContentDashboardSettings.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel;
+using Umbraco.Cms.Core.Configuration.Models;
 
-namespace Umbraco.Cms.Core.Configuration.Models
+namespace Umbraco.Cms.Core.Configuration
 {
     /// <summary>
     /// Typed configuration options for content dashboard settings.

src/Umbraco.Core/Configuration/Models/ContentSettings.cs

@@ -156,6 +156,7 @@ namespace Umbraco.Cms.Core.Configuration.Models
         internal const bool StaticShowDeprecatedPropertyEditors = false;
         internal const string StaticLoginBackgroundImage = "assets/img/login.jpg";
         internal const string StaticLoginLogoImage = "assets/img/application/umbraco_logo_white.svg";
+        internal const bool StaticHideBackOfficeLogo = false;
 
         /// <summary>
         /// Gets or sets a value for the content notification settings.
@@ -219,6 +220,12 @@ namespace Umbraco.Cms.Core.Configuration.Models
         [DefaultValue(StaticLoginLogoImage)]
         public string LoginLogoImage { get; set; } = StaticLoginLogoImage;
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to hide the backoffice umbraco logo or not.
+        /// </summary>
+        [DefaultValue(StaticHideBackOfficeLogo)]
+        public bool HideBackOfficeLogo { get; set; } = StaticHideBackOfficeLogo;
+
         /// <summary>
         /// Get or sets the model representing the global content version cleanup policy
         /// </summary>

src/Umbraco.Core/Configuration/Models/HelpPageSettings.cs

@@ -0,0 +1,11 @@
+namespace Umbraco.Cms.Core.Configuration.Models
+{
+    [UmbracoOptions(Constants.Configuration.ConfigHelpPage)]
+    public class HelpPageSettings
+    {
+        /// <summary>
+        /// Gets or sets the allowed addresses to retrieve data for the content dashboard.
+        /// </summary>
+        public string[] HelpPageUrlAllowList { get; set; }
+    }
+}

src/Umbraco.Core/Configuration/Models/HostingSettings.cs

@@ -22,7 +22,7 @@ namespace Umbraco.Cms.Core.Configuration.Models
         /// <summary>
         /// Gets or sets a value for the location of temporary files.
         /// </summary>
-        [DefaultValue(StaticLocalTempStorageLocation)] 
+        [DefaultValue(StaticLocalTempStorageLocation)]
         public LocalTempStorage LocalTempStorageLocation { get; set; } = Enum<LocalTempStorage>.Parse(StaticLocalTempStorageLocation);
 
         /// <summary>
@@ -31,5 +31,10 @@ namespace Umbraco.Cms.Core.Configuration.Models
         /// <value><c>true</c> if [debug mode]; otherwise, <c>false</c>.</value>
         [DefaultValue(StaticDebug)]
         public bool Debug { get; set; } = StaticDebug;
+
+        /// <summary>
+        /// Gets or sets a value specifying the name of the site.
+        /// </summary>
+        public string SiteName { get; set; }
     }
 }

src/Umbraco.Core/Configuration/Models/RequestHandlerSettings.cs

@@ -19,7 +19,7 @@ namespace Umbraco.Cms.Core.Configuration.Models
         internal const string StaticConvertUrlsToAscii = "try";
         internal const bool StaticEnableDefaultCharReplacements = true;
 
-        internal static readonly CharItem[] DefaultCharCollection =
+        internal static readonly Umbraco.Cms.Core.Configuration.Models.CharItem[] DefaultCharCollection =
         {
             new () { Char = " ", Replacement = "-" },
             new () { Char = "\"", Replacement = string.Empty },
@@ -84,6 +84,16 @@ namespace Umbraco.Cms.Core.Configuration.Models
         /// <summary>
         /// Add additional character replacements, or override defaults
         /// </summary>
-        public IEnumerable<CharItem> UserDefinedCharCollection { get; set; }
+        public IEnumerable<Umbraco.Cms.Core.Configuration.Models.CharItem> UserDefinedCharCollection { get; set; }
+
+        [Obsolete("Use CharItem in the Umbraco.Cms.Core.Configuration.Models namespace instead. Scheduled for removal in V10.")]
+        public class CharItem : IChar
+        {
+            /// <inheritdoc/>
+            public string Char { get; set; }
+
+            /// <inheritdoc/>
+            public string Replacement { get; set; }
+        }
     }
 }

src/Umbraco.Core/Configuration/Models/SecuritySettings.cs

@@ -11,6 +11,8 @@ namespace Umbraco.Cms.Core.Configuration.Models
     [UmbracoOptions(Constants.Configuration.ConfigSecurity)]
     public class SecuritySettings
     {
+        internal const bool StaticMemberBypassTwoFactorForExternalLogins = true;
+        internal const bool StaticUserBypassTwoFactorForExternalLogins = true;
         internal const bool StaticKeepUserLoggedIn = false;
         internal const bool StaticHideDisabledUsersInBackOffice = false;
         internal const bool StaticAllowPasswordReset = true;
@@ -66,5 +68,17 @@ namespace Umbraco.Cms.Core.Configuration.Models
         /// Gets or sets a value for the member password settings.
         /// </summary>
         public MemberPasswordConfigurationSettings MemberPassword { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to bypass the two factor requirement in Umbraco when using external login for members. Thereby rely on the External login and potential 2FA at that provider.
+        /// </summary>
+        [DefaultValue(StaticMemberBypassTwoFactorForExternalLogins)]
+        public bool MemberBypassTwoFactorForExternalLogins { get; set; } = StaticMemberBypassTwoFactorForExternalLogins;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to bypass the two factor requirement in Umbraco when using external login for users. Thereby rely on the External login and potential 2FA at that provider.
+        /// </summary>
+        [DefaultValue(StaticUserBypassTwoFactorForExternalLogins)]
+        public bool UserBypassTwoFactorForExternalLogins { get; set; } = StaticUserBypassTwoFactorForExternalLogins;
     }
 }