From c5d3d32445d9d3dbca3d74c9033df8fd760795cd Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 25 Sep 2014 15:29:14 -0700 Subject: [PATCH] Remove UseUserNameAsEmail feature --- src/Microsoft.AspNet.Identity/UserManager.cs | 15 ----- src/Microsoft.AspNet.Identity/UserOptions.cs | 5 -- .../UserManagerTest.cs | 59 ------------------- test/Shared/UserManagerTestBase.cs | 19 ------ 4 files changed, 98 deletions(-) diff --git a/src/Microsoft.AspNet.Identity/UserManager.cs b/src/Microsoft.AspNet.Identity/UserManager.cs index 247410f2a6..3a8ac70643 100644 --- a/src/Microsoft.AspNet.Identity/UserManager.cs +++ b/src/Microsoft.AspNet.Identity/UserManager.cs @@ -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) { diff --git a/src/Microsoft.AspNet.Identity/UserOptions.cs b/src/Microsoft.AspNet.Identity/UserOptions.cs index 214d7f9e1e..a96ba9bd96 100644 --- a/src/Microsoft.AspNet.Identity/UserOptions.cs +++ b/src/Microsoft.AspNet.Identity/UserOptions.cs @@ -18,10 +18,5 @@ namespace Microsoft.AspNet.Identity /// If set, enforces that emails are non empty, valid, and unique /// public bool RequireUniqueEmail { get; set; } - - /// - /// If set, the user name will also be considered the email - /// - public bool UseUserNameAsEmail { get; set; } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs b/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs index 2eae6335bf..980f9027c9 100644 --- a/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/UserManagerTest.cs @@ -162,65 +162,6 @@ namespace Microsoft.AspNet.Identity.Test store.VerifyAll(); } - [Fact] - public async Task UseUserNameAsEmailCallsStoreFindByName() - { - // Setup - var store = new Mock>(); - 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>(); - 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>(); - 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() { diff --git a/test/Shared/UserManagerTestBase.cs b/test/Shared/UserManagerTestBase.cs index f17e77ba4f..10a0672338 100644 --- a/test/Shared/UserManagerTestBase.cs +++ b/test/Shared/UserManagerTestBase.cs @@ -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() {