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

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Browse Source 
Conflicts:
	src/Umbraco.Core/Configuration/GlobalSettings.cs
	src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
This commit is contained in:
Shannon
2014-03-14 19:33:53 +11:00
parent 3dcbcba9cf b5329ace3b
commit 64c126ea61
11 changed files with 405 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
View File

@@ -15,22 +15,22 @@ namespace Umbraco.Web.Security.Providers
/// </summary>
public class UsersMembershipProvider : UmbracoMembershipProvider<IMembershipUserService, IUser>, IUsersMembershipProvider
{
public UsersMembershipProvider()
: this(ApplicationContext.Current.Services.UserService)
{
{
}
public UsersMembershipProvider(IMembershipMemberService<IUser> memberService)
: base(memberService)
{
{
}
private string _defaultMemberTypeAlias = "writer";
private volatile bool _hasDefaultMember = false;
private static readonly object Locker = new object();
public override string ProviderName
public override string ProviderName
{
get { return Constants.Conventions.User.UmbracoUsersProviderName; }
}
@@ -46,7 +46,7 @@ namespace Umbraco.Web.Security.Providers
protected override MembershipUser ConvertToMembershipUser(IUser entity)
{
//the provider user key is always the int id
return entity.AsConcreteMembershipUser(Name);
return entity.AsConcreteMembershipUser(Name);
}
public override void Initialize(string name, System.Collections.Specialized.NameValueCollection config)
@@ -62,8 +62,8 @@ namespace Umbraco.Web.Security.Providers
throw new ProviderException("No default user type alias is specified in the web.config string. Please add a 'defaultUserTypeAlias' to the add element in the provider declaration in web.config");
}
_hasDefaultMember = true;
}
}
}
}
public override string DefaultMemberTypeAlias
{
@@ -81,9 +81,9 @@ namespace Umbraco.Web.Security.Providers
throw new ProviderException("No default user type alias is specified in the web.config string. Please add a 'defaultUserTypeAlias' to the add element in the provider declaration in web.config");
}
_hasDefaultMember = true;
}
}
}
}
}
return _defaultMemberTypeAlias;
}
}