diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IProvidersSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IProvidersSection.cs deleted file mode 100644 index 6fdac94af1..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IProvidersSection.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - public interface IProvidersSection : IUmbracoConfigurationSection - { - string DefaultBackOfficeUserProvider { get; } - } -} diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs index db3f937a35..81d27e7bae 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs @@ -14,8 +14,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings ILoggingSection Logging { get; } - IProvidersSection Providers { get; } - IWebRoutingSection WebRouting { get; } } } diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/ProvidersElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/ProvidersElement.cs deleted file mode 100644 index 87876b1e0a..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/ProvidersElement.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class ProvidersElement : ConfigurationElement, IProvidersSection - { - [ConfigurationProperty("users")] - public UserProviderElement Users - { - get { return (UserProviderElement)base["users"]; } - } - - public string DefaultBackOfficeUserProvider - { - get { return Users.DefaultBackOfficeProvider; } - } - } -} diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs index 929babef83..7cf8096345 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs @@ -5,80 +5,34 @@ namespace Umbraco.Core.Configuration.UmbracoSettings public class UmbracoSettingsSection : ConfigurationSection, IUmbracoSettingsSection { [ConfigurationProperty("backOffice")] - internal BackOfficeElement BackOffice - { - get { return (BackOfficeElement)this["backOffice"]; } - } + internal BackOfficeElement BackOffice => (BackOfficeElement)this["backOffice"]; [ConfigurationProperty("content")] - internal ContentElement Content - { - get { return (ContentElement)this["content"]; } - } + internal ContentElement Content => (ContentElement)this["content"]; [ConfigurationProperty("security")] - internal SecurityElement Security - { - get { return (SecurityElement)this["security"]; } - } + internal SecurityElement Security => (SecurityElement)this["security"]; [ConfigurationProperty("requestHandler")] - internal RequestHandlerElement RequestHandler - { - get { return (RequestHandlerElement)this["requestHandler"]; } - } + internal RequestHandlerElement RequestHandler => (RequestHandlerElement)this["requestHandler"]; [ConfigurationProperty("logging")] - internal LoggingElement Logging - { - get { return (LoggingElement)this["logging"]; } - } + internal LoggingElement Logging => (LoggingElement)this["logging"]; - [ConfigurationProperty("providers")] - internal ProvidersElement Providers - { - get { return (ProvidersElement)this["providers"]; } - } [ConfigurationProperty("web.routing")] - internal WebRoutingElement WebRouting - { - get { return (WebRoutingElement)this["web.routing"]; } - } + internal WebRoutingElement WebRouting => (WebRoutingElement)this["web.routing"]; - IContentSection IUmbracoSettingsSection.Content - { - get { return Content; } - } + IContentSection IUmbracoSettingsSection.Content => Content; - ISecuritySection IUmbracoSettingsSection.Security - { - get { return Security; } - } + ISecuritySection IUmbracoSettingsSection.Security => Security; - IRequestHandlerSection IUmbracoSettingsSection.RequestHandler - { - get { return RequestHandler; } - } + IRequestHandlerSection IUmbracoSettingsSection.RequestHandler => RequestHandler; - IBackOfficeSection IUmbracoSettingsSection.BackOffice - { - get { return BackOffice; } - } + IBackOfficeSection IUmbracoSettingsSection.BackOffice => BackOffice; - ILoggingSection IUmbracoSettingsSection.Logging - { - get { return Logging; } - } + ILoggingSection IUmbracoSettingsSection.Logging => Logging; - IProvidersSection IUmbracoSettingsSection.Providers - { - get { return Providers; } - } - - IWebRoutingSection IUmbracoSettingsSection.WebRouting - { - get { return WebRouting; } - } + IWebRoutingSection IUmbracoSettingsSection.WebRouting => WebRouting; } } diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/UserProviderElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/UserProviderElement.cs deleted file mode 100644 index eedb7b4ccf..0000000000 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/UserProviderElement.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Configuration; - -namespace Umbraco.Core.Configuration.UmbracoSettings -{ - internal class UserProviderElement : ConfigurationElement - { - [ConfigurationProperty("DefaultBackofficeProvider")] - internal InnerTextConfigurationElement DefaultBackOfficeProvider - { - get - { - return new OptionalInnerTextConfigurationElement( - (InnerTextConfigurationElement)this["DefaultBackofficeProvider"], - //set the default - "UsersMembershipProvider"); - } - } - - - } -} diff --git a/src/Umbraco.Core/Constants-Security.cs b/src/Umbraco.Core/Constants-Security.cs index f1b9f5cce3..80f18eb2e0 100644 --- a/src/Umbraco.Core/Constants-Security.cs +++ b/src/Umbraco.Core/Constants-Security.cs @@ -7,6 +7,8 @@ namespace Umbraco.Core { public static class Security { + public const string UserMembershipProviderName = "UsersMembershipProvider"; + /// /// Gets the identifier of the 'super' user. /// diff --git a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs index 8fc2cb77e4..367e6f5c5a 100644 --- a/src/Umbraco.Core/Security/MembershipProviderExtensions.cs +++ b/src/Umbraco.Core/Security/MembershipProviderExtensions.cs @@ -88,11 +88,11 @@ namespace Umbraco.Core.Security /// public static MembershipProvider GetUsersMembershipProvider() { - if (Membership.Providers[Current.Configs.Settings().Providers.DefaultBackOfficeUserProvider] == null) + if (Membership.Providers[Constants.Security.UserMembershipProviderName] == null) { - throw new InvalidOperationException("No membership provider found with name " + Current.Configs.Settings().Providers.DefaultBackOfficeUserProvider); + throw new InvalidOperationException("No membership provider found with name " + Constants.Security.UserMembershipProviderName); } - return Membership.Providers[Current.Configs.Settings().Providers.DefaultBackOfficeUserProvider]; + return Membership.Providers[Constants.Security.UserMembershipProviderName]; } /// diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 049ca914d4..c90641adeb 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -262,7 +262,6 @@ - @@ -271,14 +270,12 @@ - - diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementDefaultTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementDefaultTests.cs deleted file mode 100644 index e01d2275b4..0000000000 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementDefaultTests.cs +++ /dev/null @@ -1,14 +0,0 @@ -using NUnit.Framework; - -namespace Umbraco.Tests.Configurations.UmbracoSettings -{ - [TestFixture] - public class ProvidersElementDefaultTests : ProvidersElementTests - { - protected override bool TestingDefaults - { - get { return true; } - } - - } -} diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementTests.cs b/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementTests.cs deleted file mode 100644 index d879b8dcb8..0000000000 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/ProvidersElementTests.cs +++ /dev/null @@ -1,15 +0,0 @@ -using NUnit.Framework; -using Umbraco.Core; - -namespace Umbraco.Tests.Configurations.UmbracoSettings -{ - [TestFixture] - public class ProvidersElementTests : UmbracoSettingsTests - { - [Test] - public void Users() - { - Assert.IsTrue(SettingsSection.Providers.DefaultBackOfficeUserProvider == "UsersMembershipProvider"); - } - } -} diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config index 7aeb779e0b..ac022a5489 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config @@ -110,14 +110,6 @@ 1440 - - - - - UsersMembershipProvider - - - - - - diff --git a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs index 86a767f84a..97fffe11dd 100644 --- a/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs +++ b/src/Umbraco.Tests/TestHelpers/SettingsForTests.cs @@ -38,14 +38,12 @@ namespace Umbraco.Tests.TestHelpers var security = new Mock(); var requestHandler = new Mock(); var logging = new Mock(); - var providers = new Mock(); var routing = new Mock(); settings.Setup(x => x.Content).Returns(content.Object); settings.Setup(x => x.Security).Returns(security.Object); settings.Setup(x => x.RequestHandler).Returns(requestHandler.Object); settings.Setup(x => x.Logging).Returns(logging.Object); - settings.Setup(x => x.Providers).Returns(providers.Object); settings.Setup(x => x.WebRouting).Returns(routing.Object); //Now configure some defaults - the defaults in the config section classes do NOT pertain to the mocked data!! @@ -54,7 +52,6 @@ namespace Umbraco.Tests.TestHelpers settings.Setup(x => x.RequestHandler.AddTrailingSlash).Returns(true); settings.Setup(x => x.RequestHandler.CharCollection).Returns(RequestHandlerElement.GetDefaultCharReplacements()); settings.Setup(x => x.WebRouting.UrlProviderMode).Returns("Auto"); - settings.Setup(x => x.Providers.DefaultBackOfficeUserProvider).Returns("UsersMembershipProvider"); return settings.Object; } diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 83d2e83d94..42e4aa28c7 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -298,8 +298,6 @@ - - diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config index fa60e31a08..668a98c7cf 100644 --- a/src/Umbraco.Web.UI/config/umbracoSettings.config +++ b/src/Umbraco.Web.UI/config/umbracoSettings.config @@ -118,14 +118,6 @@ - - - - - UsersMembershipProvider - - -