diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index dc2675bd58..e02131325c 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -287,11 +287,11 @@ namespace Umbraco.Core.Configuration { get { - return IsConfiguredMembershipProviderUsingLegacyEncoding(Constants.Conventions.User.UmbracoUsersProviderName); + return IsConfiguredMembershipProviderUsingLegacyEncoding(UmbracoSettings.DefaultBackofficeProvider); } set { - SetMembershipProvidersLegacyEncoding(Constants.Conventions.User.UmbracoUsersProviderName, value); + SetMembershipProvidersLegacyEncoding(UmbracoSettings.DefaultBackofficeProvider, value); } } diff --git a/src/Umbraco.Core/Constants-Conventions.cs b/src/Umbraco.Core/Constants-Conventions.cs index 3f1b7a4823..ea0303eadc 100644 --- a/src/Umbraco.Core/Constants-Conventions.cs +++ b/src/Umbraco.Core/Constants-Conventions.cs @@ -93,16 +93,7 @@ namespace Umbraco.Core /// public const string Image = "Image"; } - - - /// - /// Constants for Umbraco user - /// - public static class User - { - public static readonly string UmbracoUsersProviderName = "UsersMembershipProvider"; - } - + /// /// Constants for Umbraco Member property aliases. /// diff --git a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs index afcedac65b..3e8fa1a568 100644 --- a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs +++ b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Web; using System.Web.Hosting; using System.Web.Security; +using Umbraco.Core.Configuration; using Umbraco.Core.Security; namespace Umbraco.Core.Security @@ -54,11 +55,11 @@ namespace Umbraco.Core.Security /// public static MembershipProvider GetUsersMembershipProvider() { - if (Membership.Providers[Constants.Conventions.User.UmbracoUsersProviderName] == null) + if (Membership.Providers[UmbracoSettings.DefaultBackofficeProvider] == null) { - throw new InvalidOperationException("No membership provider found with name " + Constants.Conventions.User.UmbracoUsersProviderName); + throw new InvalidOperationException("No membership provider found with name " + UmbracoSettings.DefaultBackofficeProvider); } - return Membership.Providers[Constants.Conventions.User.UmbracoUsersProviderName]; + return Membership.Providers[UmbracoSettings.DefaultBackofficeProvider]; } public static MembershipUser GetCurrentUser(this MembershipProvider membershipProvider) diff --git a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs index d1ec03c97d..49a3f01b57 100644 --- a/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs +++ b/src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs @@ -4,6 +4,7 @@ using System.Security.Cryptography; using System.Text; using System.Web.Security; using Umbraco.Core; +using Umbraco.Core.Configuration; using Umbraco.Core.Models.Membership; using Umbraco.Core.Security; using Umbraco.Core.Services; @@ -32,7 +33,7 @@ namespace Umbraco.Web.Security.Providers public override string ProviderName { - get { return Constants.Conventions.User.UmbracoUsersProviderName; } + get { return UmbracoSettings.DefaultBackofficeProvider; } } /// diff --git a/src/umbraco.providers/UsersMembershipProvider.cs b/src/umbraco.providers/UsersMembershipProvider.cs index 126f0de35c..df190a8ac0 100644 --- a/src/umbraco.providers/UsersMembershipProvider.cs +++ b/src/umbraco.providers/UsersMembershipProvider.cs @@ -55,7 +55,7 @@ namespace umbraco.providers public override void Initialize(string name, System.Collections.Specialized.NameValueCollection config) { if (config == null) throw new ArgumentNullException("config"); - if (string.IsNullOrEmpty(name)) name = Constants.Conventions.User.UmbracoUsersProviderName; + if (string.IsNullOrEmpty(name)) name = UmbracoSettings.DefaultBackofficeProvider; base.Initialize(name, config); }