huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove UseUserNameAsEmail feature

This commit is contained in:
Hao Kung 2014-09-25 15:29:14 -07:00
parent 76a6c103ce
commit c5d3d32445
4 changed files with 0 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Microsoft.AspNet.Identity/UserManager.cs
View File

@ -1191,11 +1191,6 @@ namespace Microsoft.AspNet.Identity
CancellationToken cancellationToken = default(CancellationToken))
{
ThrowIfDisposed();
if (Options.User.UseUserNameAsEmail)
{
return await GetUserNameAsync(user, cancellationToken);
}
var store = GetEmailStore();
if (user == null)
{
@ -1216,11 +1211,6 @@ namespace Microsoft.AspNet.Identity
{
ThrowIfDisposed();
if (Options.User.UseUserNameAsEmail)
{
await UpdateUserName(user, email, cancellationToken);
}
var store = GetEmailStore();
if (user == null)
{
@ -1242,11 +1232,6 @@ namespace Microsoft.AspNet.Identity
CancellationToken cancellationToken = default(CancellationToken))
{
ThrowIfDisposed();
if (Options.User.UseUserNameAsEmail)
{
return FindByNameAsync(email, cancellationToken);
}
var store = GetEmailStore();
if (email == null)
{

5
src/Microsoft.AspNet.Identity/UserOptions.cs
View File

@ -18,10 +18,5 @@ namespace Microsoft.AspNet.Identity
/// If set, enforces that emails are non empty, valid, and unique
/// </summary>
public bool RequireUniqueEmail { get; set; }
/// <summary>
/// If set, the user name will also be considered the email
/// </summary>
public bool UseUserNameAsEmail { get; set; }
}
}

59
test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs
View File

@ -162,65 +162,6 @@ namespace Microsoft.AspNet.Identity.Test
store.VerifyAll();
}
[Fact]
public async Task UseUserNameAsEmailCallsStoreFindByName()
{
// Setup
var store = new Mock<IUserStore<TestUser>>();
var user = new TestUser {UserName="Foo"};
store.Setup(s => s.FindByNameAsync(user.UserName, CancellationToken.None)).Returns(Task.FromResult(user)).Verifiable();
var userManager = MockHelpers.TestUserManager(store.Object);
userManager.Options.User.UseUserNameAsEmail = true;
userManager.UserNameNormalizer = null;
// Act
var result = await userManager.FindByEmailAsync(user.UserName);
// Assert
Assert.Equal(user, result);
store.VerifyAll();
}
[Fact]
public async Task UseUserNameAsEmailReturnsName()
{
// Setup
var store = new Mock<IUserStore<TestUser>>();
var user = new TestUser { UserName = "Foo@email.com" };
store.Setup(s => s.GetUserNameAsync(user, CancellationToken.None)).ReturnsAsync(user.UserName).Verifiable();
var userManager = MockHelpers.TestUserManager(store.Object);
userManager.Options.User.UseUserNameAsEmail = true;
userManager.UserNameNormalizer = null;
// Act
var result = await userManager.GetEmailAsync(user);
// Assert
Assert.Equal(user.UserName, result);
store.VerifyAll();
}
[Fact]
public async Task UseUserNameAsEmailUpdatesNameAndEmail()
{
// Setup
var store = new Mock<IUserEmailStore<TestUser>>();
var user = new TestUser { UserName = "Foo" };
var email = "foo@foo.com";
store.Setup(s => s.SetUserNameAsync(user, email, CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetEmailAsync(user, email, CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
store.Setup(s => s.SetEmailConfirmedAsync(user, false, CancellationToken.None)).Returns(Task.FromResult(0)).Verifiable();
var userManager = MockHelpers.TestUserManager(store.Object);
userManager.Options.User.UseUserNameAsEmail = true;
userManager.UserNameNormalizer = null;
// Act
IdentityResultAssert.IsSuccess(await userManager.SetEmailAsync(user, email));
// Assert
store.VerifyAll();
}
[Fact]
public async Task AddToRolesCallsStore()
{

19
test/Shared/UserManagerTestBase.cs
View File

@ -387,25 +387,6 @@ namespace Microsoft.AspNet.Identity.Test
Assert.Equal(user, fetch);
}
[Fact]
public async Task UserNameAsEmailTest()
{
var manager = CreateManager();
manager.Options.User.UseUserNameAsEmail = true;
manager.Options.User.UserNameValidationRegex = null;
var user = CreateTestUser();
var email = user.UserName + "@test.com";
user.UserName = email;
IdentityResultAssert.IsSuccess(await manager.CreateAsync(user));
Assert.Equal(user, await manager.FindByEmailAsync(email));
Assert.Equal(email, await manager.GetEmailAsync(user));
const string newEmail = "modified@woot.com";
IdentityResultAssert.IsSuccess(await manager.SetEmailAsync(user, newEmail));
Assert.Equal(newEmail, user.UserName);
Assert.Equal(newEmail, user.Email);
Assert.False(user.EmailConfirmed);
}
[Fact]
public async Task CanFindUsersViaUserQuerable()
{