From c66bd98a614b0f3daede7ee72b9d6cd23f28b208 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 12 Jun 2018 13:39:36 -0700
Subject: [PATCH] Don't hook cancellation tokens by default (#1816)

---
 src/Core/IdentityBuilder.cs                         |  2 +-
 src/Core/IdentityServiceCollectionExtensions.cs     |  2 +-
 src/Identity/IdentityServiceCollectionExtensions.cs |  6 +++---
 test/Identity.Test/IdentityBuilderTest.cs           | 10 ++++++++--
 test/Shared/MockHelpers.cs                          |  3 +--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Core/IdentityBuilder.cs b/src/Core/IdentityBuilder.cs
index 2c75df148e..aa1f2af6d7 100644
--- a/src/Core/IdentityBuilder.cs
+++ b/src/Core/IdentityBuilder.cs
@@ -166,7 +166,7 @@ namespace Microsoft.AspNetCore.Identity
         {
             RoleType = typeof(TRole);
             AddRoleValidator<RoleValidator<TRole>>();
-            Services.TryAddScoped<RoleManager<TRole>, RoleManager<TRole>>();
+            Services.TryAddScoped<RoleManager<TRole>>();
             return this;
         }
 
diff --git a/src/Core/IdentityServiceCollectionExtensions.cs b/src/Core/IdentityServiceCollectionExtensions.cs
index b4730bcf59..bf9bf08e6b 100644
--- a/src/Core/IdentityServiceCollectionExtensions.cs
+++ b/src/Core/IdentityServiceCollectionExtensions.cs
@@ -42,7 +42,7 @@ namespace Microsoft.Extensions.DependencyInjection
             // No interface for the error describer so we can add errors without rev'ing the interface
             services.TryAddScoped<IdentityErrorDescriber>();
             services.TryAddScoped<IUserClaimsPrincipalFactory<TUser>, UserClaimsPrincipalFactory<TUser>>();
-            services.TryAddScoped<UserManager<TUser>, UserManager<TUser>>();
+            services.TryAddScoped<UserManager<TUser>>();
 
             if (setupAction != null)
             {
diff --git a/src/Identity/IdentityServiceCollectionExtensions.cs b/src/Identity/IdentityServiceCollectionExtensions.cs
index c941fdd201..fe655c31dc 100644
--- a/src/Identity/IdentityServiceCollectionExtensions.cs
+++ b/src/Identity/IdentityServiceCollectionExtensions.cs
@@ -88,9 +88,9 @@ namespace Microsoft.Extensions.DependencyInjection
             services.TryAddScoped<ISecurityStampValidator, SecurityStampValidator<TUser>>();
             services.TryAddScoped<ITwoFactorSecurityStampValidator, TwoFactorSecurityStampValidator<TUser>>();
             services.TryAddScoped<IUserClaimsPrincipalFactory<TUser>, UserClaimsPrincipalFactory<TUser, TRole>>();
-            services.TryAddScoped<UserManager<TUser>, AspNetUserManager<TUser>>();
-            services.TryAddScoped<SignInManager<TUser>, SignInManager<TUser>>();
-            services.TryAddScoped<RoleManager<TRole>, AspNetRoleManager<TRole>>();
+            services.TryAddScoped<UserManager<TUser>>();
+            services.TryAddScoped<SignInManager<TUser>>();
+            services.TryAddScoped<RoleManager<TRole>>();
 
             if (setupAction != null)
             {
diff --git a/test/Identity.Test/IdentityBuilderTest.cs b/test/Identity.Test/IdentityBuilderTest.cs
index e2cded94dc..28305bf857 100644
--- a/test/Identity.Test/IdentityBuilderTest.cs
+++ b/test/Identity.Test/IdentityBuilderTest.cs
@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Identity.Test
             var sp = services.BuildServiceProvider();
             Assert.NotNull(sp.GetRequiredService<IRoleValidator<PocoRole>>());
             Assert.IsType<NoopRoleStore>(sp.GetRequiredService<IRoleStore<PocoRole>>());
-            Assert.NotNull(sp.GetRequiredService<RoleManager<PocoRole>>());
+            Assert.IsType<RoleManager<PocoRole>>(sp.GetRequiredService<RoleManager<PocoRole>>());
         }
 
         [Fact]
@@ -153,7 +153,10 @@ namespace Microsoft.AspNetCore.Identity.Test
         {
             var services = new ServiceCollection()
                 .AddSingleton<IConfiguration>(new ConfigurationBuilder().Build());
-            services.AddIdentity<PocoUser,PocoRole>();
+            services.AddLogging()
+                .AddIdentity<PocoUser,PocoRole>()
+                .AddUserStore<NoopUserStore>()
+                .AddRoleStore<NoopRoleStore>();
 
             var provider = services.BuildServiceProvider();
             var userValidator = provider.GetRequiredService<IUserValidator<PocoUser>>() as UserValidator<PocoUser>;
@@ -164,6 +167,9 @@ namespace Microsoft.AspNetCore.Identity.Test
 
             var hasher = provider.GetRequiredService<IPasswordHasher<PocoUser>>() as PasswordHasher<PocoUser>;
             Assert.NotNull(hasher);
+
+            Assert.IsType<RoleManager<PocoRole>>(provider.GetRequiredService<RoleManager<PocoRole>>());
+            Assert.IsType<UserManager<PocoUser>>(provider.GetRequiredService<UserManager<PocoUser>>());
         }
 
         [Fact]
diff --git a/test/Shared/MockHelpers.cs b/test/Shared/MockHelpers.cs
index 1b563e1435..bb6c98699e 100644
--- a/test/Shared/MockHelpers.cs
+++ b/test/Shared/MockHelpers.cs
@@ -89,10 +89,9 @@ namespace Microsoft.AspNetCore.Identity.Test
             store = store ?? new Mock<IRoleStore<TRole>>().Object;
             var roles = new List<IRoleValidator<TRole>>();
             roles.Add(new RoleValidator<TRole>());
-            return new AspNetRoleManager<TRole>(store, roles,
+            return new RoleManager<TRole>(store, roles,
                 new UpperInvariantLookupNormalizer(),
                 new IdentityErrorDescriber(),
-                null,
                 null);
         }