Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions src/Identity/Extensions.Core/src/UserManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public class UserManager<TUser> : IDisposable where TUser : class
private readonly Dictionary<string, IUserTwoFactorTokenProvider<TUser>> _tokenProviders =
new Dictionary<string, IUserTwoFactorTokenProvider<TUser>>();

private readonly List<IUserValidator<TUser>> _userValidators = new List<IUserValidator<TUser>>();
private readonly List<IPasswordValidator<TUser>> _passwordValidators = new List<IPasswordValidator<TUser>>();

private bool _disposed;
#if NETSTANDARD2_0 || NETFRAMEWORK
private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
Expand Down Expand Up @@ -91,24 +94,19 @@ public UserManager(IUserStore<TUser> store,

if (userValidators != null)
{
foreach (var v in userValidators)
{
UserValidators.Add(v);
}
AddRange(_userValidators, userValidators);
}
if (passwordValidators != null)
{
foreach (var v in passwordValidators)
{
PasswordValidators.Add(v);
}
AddRange(_passwordValidators, passwordValidators);
}

if (services != null)
{
foreach (var providerName in Options.Tokens.ProviderMap.Keys)
foreach (var entry in Options.Tokens.ProviderMap)
{
var description = Options.Tokens.ProviderMap[providerName];
var providerName = entry.Key;
var description = entry.Value;

var provider = description.ProviderInstance as IUserTwoFactorTokenProvider<TUser>;
if (provider == null && description.GetProviderType<IUserTwoFactorTokenProvider<TUser>>() is Type providerType)
Expand Down Expand Up @@ -136,6 +134,16 @@ public UserManager(IUserStore<TUser> store,
}
}

private static void AddRange<T>(List<T> list, IEnumerable<T> items)
{
// Size the list exactly when the count is known (DI injects arrays) instead of growing it to the default capacity.
if (list.Count == 0 && items is ICollection<T> collection)
{
list.Capacity = collection.Count;
}
list.AddRange(items);
}

/// <summary>
/// Gets or sets the persistence store the manager operates over.
/// </summary>
Expand All @@ -158,12 +166,12 @@ public UserManager(IUserStore<TUser> store,
/// <summary>
/// The <see cref="IUserValidator{TUser}"/> used to validate users.
/// </summary>
public IList<IUserValidator<TUser>> UserValidators { get; } = new List<IUserValidator<TUser>>();
public IList<IUserValidator<TUser>> UserValidators => _userValidators;

/// <summary>
/// The <see cref="IPasswordValidator{TUser}"/> used to validate passwords.
/// </summary>
public IList<IPasswordValidator<TUser>> PasswordValidators { get; } = new List<IPasswordValidator<TUser>>();
public IList<IPasswordValidator<TUser>> PasswordValidators => _passwordValidators;

/// <summary>
/// The <see cref="ILookupNormalizer"/> used to normalize things like user and role names.
Expand Down
48 changes: 48 additions & 0 deletions src/Identity/test/Identity.Test/UserManagerTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Diagnostics.Metrics.Testing;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;

namespace Microsoft.AspNetCore.Identity.Test;
Expand Down Expand Up @@ -62,6 +64,52 @@ public CustomRoleManager() : base(new Mock<IRoleStore<PocoRole>>().Object, null,
{ }
}

[Fact]
public void ConstructorCopiesValidatorsInOrderAndCollectionsAreAvailableToVirtualMembers()
{
var userValidators = new[] { new Mock<IUserValidator<PocoUser>>().Object, new Mock<IUserValidator<PocoUser>>().Object };
var passwordValidators = new[] { new Mock<IPasswordValidator<PocoUser>>().Object };

var manager = new ValidatorObservingUserManager(userValidators, passwordValidators);

Assert.Equal(0, manager.UserValidatorCountInLoggerSetter);
Assert.Equal(0, manager.PasswordValidatorCountInLoggerSetter);
Assert.Equal(userValidators, manager.UserValidators);
Assert.Equal(passwordValidators, manager.PasswordValidators);

// The collections remain mutable.
var extra = new Mock<IUserValidator<PocoUser>>().Object;
manager.UserValidators.Add(extra);
Assert.Equal(3, manager.UserValidators.Count);
Assert.Same(extra, manager.UserValidators[2]);

var empty = new ValidatorObservingUserManager(null, null);
Assert.Empty(empty.UserValidators);
Assert.Empty(empty.PasswordValidators);
}

private sealed class ValidatorObservingUserManager : UserManager<PocoUser>
{
public ValidatorObservingUserManager(IEnumerable<IUserValidator<PocoUser>> userValidators, IEnumerable<IPasswordValidator<PocoUser>> passwordValidators)
: base(new Mock<IUserStore<PocoUser>>().Object, null, null, userValidators, passwordValidators, null, null, null, NullLogger<UserManager<PocoUser>>.Instance)
{ }

public int UserValidatorCountInLoggerSetter { get; private set; } = -1;

public int PasswordValidatorCountInLoggerSetter { get; private set; } = -1;

public override ILogger Logger
{
get => base.Logger;
set
{
UserValidatorCountInLoggerSetter = UserValidators.Count;
PasswordValidatorCountInLoggerSetter = PasswordValidators.Count;
base.Logger = value;
}
}
}

[Fact]
public async Task CreateCallsStore()
{
Expand Down
Loading