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

Switch to new default config options support

This commit is contained in:
Hao Kung 2017-05-25 18:39:55 -07:00
parent d78e986bcf
commit 34e7a8df27
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Microsoft.AspNetCore.Identity/IdentityServiceCollectionExtensions.cs
View File

@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options.Infrastructure;
namespace Microsoft.Extensions.DependencyInjection namespace Microsoft.Extensions.DependencyInjection
{ {
@ -17,10 +17,10 @@ namespace Microsoft.Extensions.DependencyInjection
/// </summary> /// </summary>
public static class IdentityServiceCollectionExtensions public static class IdentityServiceCollectionExtensions
{ {
internal class IdentityConfigureOptions : ConfigureOptions<IdentityOptions> internal class IdentityConfigureOptions : ConfigureDefaultOptions<IdentityOptions>
{ {
public IdentityConfigureOptions(IConfiguration config) : public IdentityConfigureOptions(IConfiguration config) :
base(options => config.GetSection("Identity").Bind(options)) base(options => config.GetSection("Microsoft:AspNetCore:Identity").Bind(options))
{ } { }
} }
@ -119,7 +119,7 @@ namespace Microsoft.Extensions.DependencyInjection
services.TryAddScoped<SignInManager<TUser>, SignInManager<TUser>>(); services.TryAddScoped<SignInManager<TUser>, SignInManager<TUser>>();
services.TryAddScoped<RoleManager<TRole>, AspNetRoleManager<TRole>>(); services.TryAddScoped<RoleManager<TRole>, AspNetRoleManager<TRole>>();
services.AddSingleton<IConfigureOptions<IdentityOptions>, IdentityConfigureOptions>(); services.AddSingleton<ConfigureDefaultOptions<IdentityOptions>, IdentityConfigureOptions>();
if (setupAction != null) if (setupAction != null)
{ {
services.Configure(setupAction); services.Configure(setupAction);

51
test/Microsoft.AspNetCore.Identity.Test/IdentityOptionsTest.cs
View File

@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.Extensions.Options.Infrastructure;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Identity.Test namespace Microsoft.AspNetCore.Identity.Test
@ -48,27 +49,28 @@ namespace Microsoft.AspNetCore.Identity.Test
var dic = new Dictionary<string, string> var dic = new Dictionary<string, string>
{ {
{"identity:claimsidentity:roleclaimtype", roleClaimType}, {"microsoft:aspnetcore:identity:claimsidentity:roleclaimtype", roleClaimType},
{"identity:claimsidentity:usernameclaimtype", usernameClaimType}, {"microsoft:aspnetcore:identity:claimsidentity:usernameclaimtype", usernameClaimType},
{"identity:claimsidentity:useridclaimtype", useridClaimType}, {"microsoft:aspnetcore:identity:claimsidentity:useridclaimtype", useridClaimType},
{"identity:claimsidentity:securitystampclaimtype", securityStampClaimType}, {"microsoft:aspnetcore:identity:claimsidentity:securitystampclaimtype", securityStampClaimType},
{"identity:user:requireUniqueEmail", "true"}, {"microsoft:aspnetcore:identity:user:requireUniqueEmail", "true"},
{"identity:password:RequiredLength", "10"}, {"microsoft:aspnetcore:identity:password:RequiredLength", "10"},
{"identity:password:RequiredUniqueChars", "5"}, {"microsoft:aspnetcore:identity:password:RequiredUniqueChars", "5"},
{"identity:password:RequireNonAlphanumeric", "false"}, {"microsoft:aspnetcore:identity:password:RequireNonAlphanumeric", "false"},
{"identity:password:RequireUpperCase", "false"}, {"microsoft:aspnetcore:identity:password:RequireUpperCase", "false"},
{"identity:password:RequireDigit", "false"}, {"microsoft:aspnetcore:identity:password:RequireDigit", "false"},
{"identity:password:RequireLowerCase", "false"}, {"microsoft:aspnetcore:identity:password:RequireLowerCase", "false"},
{"identity:lockout:AllowedForNewUsers", "FALSe"}, {"microsoft:aspnetcore:identity:lockout:AllowedForNewUsers", "FALSe"},
{"identity:lockout:MaxFailedAccessAttempts", "1000"} {"microsoft:aspnetcore:identity:lockout:MaxFailedAccessAttempts", "1000"}
}; };
var builder = new ConfigurationBuilder(); var builder = new ConfigurationBuilder();
builder.AddInMemoryCollection(dic); builder.AddInMemoryCollection(dic);
var config = builder.Build(); var config = builder.Build();
Assert.Equal(roleClaimType, config["identity:claimsidentity:roleclaimtype"]); Assert.Equal(roleClaimType, config["microsoft:aspnetcore:identity:claimsidentity:roleclaimtype"]);
var services = new ServiceCollection(); var services = new ServiceCollection()
services.AddSingleton<IConfiguration>(config); .AddSingleton<IConfiguration>(config)
.AddSingleton<IConfigureOptions<IdentityOptions>, ConfigureDefaults<IdentityOptions>>();
services.AddIdentity<TestUser,TestRole>(); services.AddIdentity<TestUser,TestRole>();
var accessor = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityOptions>>(); var accessor = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityOptions>>();
Assert.NotNull(accessor); Assert.NotNull(accessor);
@ -94,14 +96,14 @@ namespace Microsoft.AspNetCore.Identity.Test
{ {
var dic = new Dictionary<string, string> var dic = new Dictionary<string, string>
{ {
{"identity:user:requireUniqueEmail", "true"}, {"microsoft:aspnetcore:identity:user:requireUniqueEmail", "true"},
{"identity:lockout:MaxFailedAccessAttempts", "1000"} {"microsoft:aspnetcore:identity:lockout:MaxFailedAccessAttempts", "1000"}
}; };
var builder = new ConfigurationBuilder(); var builder = new ConfigurationBuilder();
builder.AddInMemoryCollection(dic); builder.AddInMemoryCollection(dic);
var config = builder.Build(); var services = new ServiceCollection()
var services = new ServiceCollection(); .AddSingleton<IConfiguration>(builder.Build())
services.AddSingleton<IConfiguration>(config); .AddSingleton<IConfigureOptions<IdentityOptions>, ConfigureDefaults<IdentityOptions>>();
services.AddIdentity<TestUser, TestRole>(o => { o.User.RequireUniqueEmail = false; o.Lockout.MaxFailedAccessAttempts++; }); services.AddIdentity<TestUser, TestRole>(o => { o.User.RequireUniqueEmail = false; o.Lockout.MaxFailedAccessAttempts++; });
var accessor = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityOptions>>(); var accessor = services.BuildServiceProvider().GetRequiredService<IOptions<IdentityOptions>>();
Assert.NotNull(accessor); Assert.NotNull(accessor);
@ -113,9 +115,7 @@ namespace Microsoft.AspNetCore.Identity.Test
[Fact] [Fact]
public void CanCustomizeIdentityOptions() public void CanCustomizeIdentityOptions()
{ {
var services = new ServiceCollection() var services = new ServiceCollection().Configure<IdentityOptions>(options => options.Password.RequiredLength = -1);
.AddSingleton<IConfiguration>(new ConfigurationBuilder().Build())
.Configure<IdentityOptions>(options => options.Password.RequiredLength = -1);
services.AddIdentity<TestUser,TestRole>(); services.AddIdentity<TestUser,TestRole>();
var serviceProvider = services.BuildServiceProvider(); var serviceProvider = services.BuildServiceProvider();
@ -135,8 +135,7 @@ namespace Microsoft.AspNetCore.Identity.Test
[Fact] [Fact]
public void CanSetupIdentityOptions() public void CanSetupIdentityOptions()
{ {
var services = new ServiceCollection() var services = new ServiceCollection();
.AddSingleton<IConfiguration>(new ConfigurationBuilder().Build());
services.AddIdentity<TestUser,TestRole>(options => options.User.RequireUniqueEmail = true); services.AddIdentity<TestUser,TestRole>(options => options.User.RequireUniqueEmail = true);
var serviceProvider = services.BuildServiceProvider(); var serviceProvider = services.BuildServiceProvider();