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

Refactor and fix tests

Browse Source
This commit is contained in:
Stephan
2017-09-20 20:06:46 +02:00
parent bcf3916e54
commit dca3b74542
61 changed files with 924 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,8 @@
using System.Collections.Specialized;
using System.ComponentModel.DataAnnotations;
using System.Configuration.Provider;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Web.Hosting;
using System.Web.Security;
using Umbraco.Core;
using Umbraco.Core.Models;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Security;
using Umbraco.Core.Services;
using Umbraco.Core.Models.Membership;
@@ -23,8 +17,7 @@ namespace Umbraco.Web.Security.Providers
{
public MembersMembershipProvider()
: this(Current.Services.MemberService, Current.Services.MemberTypeService)
{
}
{ }
public MembersMembershipProvider(IMembershipMemberService<IMember> memberService, IMemberTypeService memberTypeService)
: base(memberService)
@@ -43,29 +36,26 @@ namespace Umbraco.Web.Security.Providers
private readonly IMemberTypeService _memberTypeService;
private string _defaultMemberTypeAlias = "Member";
private volatile bool _hasDefaultMember = false;
private volatile bool _hasDefaultMember;
private static readonly object Locker = new object();
private bool _providerKeyAsGuid = false;
private bool _providerKeyAsGuid;
public override string ProviderName
{
get { return "MembersMembershipProvider"; }
}
public override string ProviderName => "MembersMembershipProvider";
protected override MembershipUser ConvertToMembershipUser(IMember entity)
{
return entity.AsConcreteMembershipUser(Name, _providerKeyAsGuid);
}
public string LockPropertyTypeAlias { get; private set; }
public string LastLockedOutPropertyTypeAlias { get; private set; }
public string FailedPasswordAttemptsPropertyTypeAlias { get; private set; }
public string ApprovedPropertyTypeAlias { get; private set; }
public string CommentPropertyTypeAlias { get; private set; }
public string LastLoginPropertyTypeAlias { get; private set; }
public string LastPasswordChangedPropertyTypeAlias { get; private set; }
public string PasswordRetrievalQuestionPropertyTypeAlias { get; private set; }
public string PasswordRetrievalAnswerPropertyTypeAlias { get; private set; }
public string LockPropertyTypeAlias { get; }
public string LastLockedOutPropertyTypeAlias { get; }
public string FailedPasswordAttemptsPropertyTypeAlias { get; }
public string ApprovedPropertyTypeAlias { get; }
public string CommentPropertyTypeAlias { get; }
public string LastLoginPropertyTypeAlias { get; }
public string LastPasswordChangedPropertyTypeAlias { get; }
public string PasswordRetrievalQuestionPropertyTypeAlias { get; }
public string PasswordRetrievalAnswerPropertyTypeAlias { get; }
public override void Initialize(string name, NameValueCollection config)
{
@@ -94,7 +84,7 @@ namespace Umbraco.Web.Security.Providers
protected override Attempt<string> GetRawPassword(string username)
{
var found = MemberService.GetByUsername(username);
var found = MemberService.GetByUsername(username);
if (found == null) return Attempt<string>.Fail();
return Attempt.Succeed(found.RawPasswordValue);
}