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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web

Browse Source 
# Conflicts:
#	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
#	src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
This commit is contained in:
Bjarke Berg
2019-12-04 11:50:12 +01:00
parent 886a298b3d 13e04bcfe8
commit d2bf64195e
57 changed files with 436 additions and 1240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Web.Security.Providers
/// <summary>
/// Custom Membership Provider for Umbraco Members (User authentication for Frontend applications NOT umbraco CMS)
/// </summary>
public class MembersMembershipProvider : UmbracoMembershipProvider<IMembershipMemberService, IMember>, IUmbracoMemberTypeMembershipProvider
public class MembersMembershipProvider : UmbracoMembershipProvider<IMembershipMemberService, IMember>
{
public MembersMembershipProvider()
: this(Current.Services.MemberService, Current.Services.MemberTypeService, Current.UmbracoVersion, Current.HostingEnvironment, Current.IpResolver)

14
src/Umbraco.Web/Security/Providers/UmbracoMembershipProvider.cs
View File

@@ -44,16 +44,6 @@ namespace Umbraco.Web.Security.Providers
protected abstract MembershipUser ConvertToMembershipUser(TEntity entity);
private bool _allowManuallyChangingPassword = false;
/// <summary>
/// For backwards compatibility, this provider supports this option by default it is false
/// </summary>
public override bool AllowManuallyChangingPassword
{
get { return _allowManuallyChangingPassword; }
}
/// <summary>
/// Initializes the provider.
/// </summary>
@@ -72,8 +62,6 @@ namespace Umbraco.Web.Security.Providers
// Initialize base provider class
base.Initialize(name, config);
_allowManuallyChangingPassword = config.GetValue("allowManuallyChangingPassword", false);
}
/// <summary>
@@ -531,7 +519,7 @@ namespace Umbraco.Web.Security.Providers
};
}
var authenticated = PasswordSecurity.CheckPassword(password, member.RawPasswordValue);
var authenticated = PasswordSecurity.VerifyPassword(password, member.RawPasswordValue);
if (authenticated == false)
{