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

Ensures all access to the users membership provider is done with our extension method

Browse Source
This commit is contained in:
Shannon
2014-03-18 17:22:25 +11:00
parent e2881e07d1
commit 8dd950bd52
16 changed files with 75 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI/install/steps/DefaultUser.ascx.cs
View File

@@ -19,15 +19,7 @@ namespace Umbraco.Web.UI.Install.Steps
protected MembershipProvider CurrentProvider
{
get
{
var provider = Membership.Providers[UmbracoSettings.DefaultBackofficeProvider];
if (provider == null)
{
throw new InvalidOperationException("No MembershipProvider found with name " + UmbracoSettings.DefaultBackofficeProvider);
}
return provider;
}
get { return MembershipProviderExtensions.GetUsersMembershipProvider(); }
}
protected void ChangePasswordClick(object sender, EventArgs e)

10
src/Umbraco.Web.UI/umbraco/create/User.ascx.cs
View File

@@ -28,7 +28,9 @@ namespace Umbraco.Web.UI.Umbraco.Create
/// <param name="e"></param>
protected void LoginExistsCheck(object sender, ServerValidateEventArgs e)
{
var user = Membership.Providers[UmbracoSettings.DefaultBackofficeProvider].GetUser(Login.Text.Replace(" ", "").ToLower(), false);
var provider = MembershipProviderExtensions.GetUsersMembershipProvider();
var user = provider.GetUser(Login.Text.Replace(" ", "").ToLower(), false);
if (Login.Text != "" && user != null)
e.IsValid = false;
@@ -44,9 +46,11 @@ namespace Umbraco.Web.UI.Umbraco.Create
/// <param name="e"></param>
protected void EmailExistsCheck(object sender, ServerValidateEventArgs e)
{
var found = Membership.Providers[UmbracoSettings.DefaultBackofficeProvider].GetUserNameByEmail(Email.Text.ToLower());
var provider = MembershipProviderExtensions.GetUsersMembershipProvider();
if (Email.Text != "" && found.IsNullOrWhiteSpace() == false && Membership.Providers[UmbracoSettings.DefaultBackofficeProvider].RequiresUniqueEmail)
var found = provider.GetUserNameByEmail(Email.Text.ToLower());
if (Email.Text != "" && found.IsNullOrWhiteSpace() == false && provider.RequiresUniqueEmail)
e.IsValid = false;
else
e.IsValid = true;