yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1796 from umbraco/temp-U4-6566

Browse Source 
U4-6566 Membership provider `useLegacyEncoding` should default to `false`
This commit is contained in:
Stephan
2017-03-15 12:37:09 +01:00
committed by GitHub
parent 1a0046df95 54afd3d954
commit eb42b9a4b6
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
View File

@@ -39,7 +39,7 @@ namespace Umbraco.Tests.Web
{
return Attempt.Succeed(1234);
});
//setup a mock url provider which we'll use fo rtesting
var testUrlProvider = new Mock<IUrlProvider>();
testUrlProvider.Setup(x => x.GetUrl(It.IsAny<UmbracoContext>(), It.IsAny<int>(), It.IsAny<Uri>(), It.IsAny<UrlProviderMode>()))
@@ -58,13 +58,12 @@ namespace Umbraco.Tests.Web
Mock.Of<IUmbracoSettingsSection>(section => section.WebRouting == Mock.Of<IWebRoutingSection>(routingSection => routingSection.UrlProviderMode == "AutoLegacy")),
//pass in the custom url provider
new[]{ testUrlProvider.Object },
false))
true))
{
var output = TemplateUtilities.ParseInternalLinks(input, umbCtx.UrlProvider);
Assert.AreEqual(result, output);
}
}
}
}

11
src/Umbraco.Web.UI/web.Template.Release.config
View File

@@ -13,17 +13,6 @@
<trace enabled="false" xdt:Transform="SetAttributes(enabled)" />
<customErrors mode="RemoteOnly" xdt:Transform="SetAttributes(mode)">
</customErrors>
<membership>
<providers>
<add xdt:Transform="SetAttributes(useLegacyEncoding,minRequiredPasswordLength)" xdt:Locator="Match(name)" name="UmbracoMembershipProvider"
minRequiredPasswordLength="8"
useLegacyEncoding="true" />
<add xdt:Transform="SetAttributes(useLegacyEncoding,minRequiredPasswordLength)" xdt:Locator="Match(name)" name="UsersMembershipProvider"
minRequiredPasswordLength="8"
useLegacyEncoding="true" />
</providers>
</membership>
</system.web>

4
src/Umbraco.Web.UI/web.Template.config
View File

@@ -248,8 +248,8 @@
<membership defaultProvider="UmbracoMembershipProvider" userIsOnlineTimeWindow="15">
<providers>
<clear />
<add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed" />
<add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="4" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" passwordFormat="Hashed" />
<add name="UmbracoMembershipProvider" type="Umbraco.Web.Security.Providers.MembersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" defaultMemberTypeAlias="Member" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
<add name="UsersMembershipProvider" type="Umbraco.Web.Security.Providers.UsersMembershipProvider, Umbraco" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="10" useLegacyEncoding="false" enablePasswordRetrieval="false" enablePasswordReset="false" requiresQuestionAndAnswer="false" passwordFormat="Hashed" allowManuallyChangingPassword="false" />
</providers>
</membership>
<!-- Role Provider -->