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

Move away from ILogger<> 

Busted for now see https://github.com/aspnet/Hosting/issues/180
This commit is contained in:
Hao Kung 2015-03-05 14:04:56 -08:00
parent c2e96fa570
commit 8542a676cb
5 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.Identity/RoleManager.cs
View File

@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Identity
IEnumerable<IRoleValidator<TRole>> roleValidators, IEnumerable<IRoleValidator<TRole>> roleValidators,
ILookupNormalizer keyNormalizer, ILookupNormalizer keyNormalizer,
IdentityErrorDescriber errors, IdentityErrorDescriber errors,
ILogger<RoleManager<TRole>> logger, ILoggerFactory logger,
IHttpContextAccessor contextAccessor) IHttpContextAccessor contextAccessor)
{ {
if (store == null) if (store == null)
@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Identity
} }
} }
Logger = logger ?? new Logger<RoleManager<TRole>>(new LoggerFactory()); Logger = logger?.CreateLogger<RoleManager<TRole>>() ?? new Logger<RoleManager<TRole>>(new LoggerFactory());
} }
/// <summary> /// <summary>
@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Identity
/// <summary> /// <summary>
/// Used to log results /// Used to log results
/// </summary> /// </summary>
internal ILogger<RoleManager<TRole>> Logger { get; set; } internal ILogger Logger { get; set; }
/// <summary> /// <summary>
/// Used to normalize user names, role names, emails for uniqueness /// Used to normalize user names, role names, emails for uniqueness

14
src/Microsoft.AspNet.Identity/SignInManager.cs
View File

@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Identity
IHttpContextAccessor contextAccessor, IHttpContextAccessor contextAccessor,
IUserClaimsPrincipalFactory<TUser> claimsFactory, IUserClaimsPrincipalFactory<TUser> claimsFactory,
IOptions<IdentityOptions> optionsAccessor = null, IOptions<IdentityOptions> optionsAccessor = null,
ILogger<SignInManager<TUser>> logger = null) ILoggerFactory logger = null)
{ {
if (userManager == null) if (userManager == null)
{ {
@ -45,14 +45,14 @@ namespace Microsoft.AspNet.Identity
ClaimsFactory = claimsFactory; ClaimsFactory = claimsFactory;
Options = optionsAccessor?.Options ?? new IdentityOptions(); Options = optionsAccessor?.Options ?? new IdentityOptions();
Logger = logger ?? new Logger<SignInManager<TUser>>(new LoggerFactory()); Logger = logger?.CreateLogger<SignInManager<TUser>>() ?? new Logger<SignInManager<TUser>>(new LoggerFactory());
} }
public UserManager<TUser> UserManager { get; private set; } internal UserManager<TUser> UserManager { get; private set; }
public HttpContext Context { get; private set; } internal HttpContext Context { get; private set; }
public IUserClaimsPrincipalFactory<TUser> ClaimsFactory { get; private set; } internal IUserClaimsPrincipalFactory<TUser> ClaimsFactory { get; private set; }
public IdentityOptions Options { get; private set; } internal IdentityOptions Options { get; private set; }
public ILogger<SignInManager<TUser>> Logger { get; set; } internal ILogger Logger { get; set; }
// Should this be a func? // Should this be a func?
public virtual async Task<ClaimsPrincipal> CreateUserPrincipalAsync(TUser user) public virtual async Task<ClaimsPrincipal> CreateUserPrincipalAsync(TUser user)

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

@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Identity
ILookupNormalizer keyNormalizer, ILookupNormalizer keyNormalizer,
IdentityErrorDescriber errors, IdentityErrorDescriber errors,
IEnumerable<IUserTokenProvider<TUser>> tokenProviders, IEnumerable<IUserTokenProvider<TUser>> tokenProviders,
ILogger<UserManager<TUser>> logger, ILoggerFactory logger,
IHttpContextAccessor contextAccessor) IHttpContextAccessor contextAccessor)
{ {
if (store == null) if (store == null)
@ -78,7 +78,7 @@ namespace Microsoft.AspNet.Identity
} }
} }
Logger = logger ?? new Logger<UserManager<TUser>>(new LoggerFactory()); Logger = logger?.CreateLogger<UserManager<TUser>>() ?? new Logger<UserManager<TUser>>(new LoggerFactory());
if (tokenProviders != null) if (tokenProviders != null)
{ {
@ -104,7 +104,7 @@ namespace Microsoft.AspNet.Identity
internal IdentityErrorDescriber ErrorDescriber { get; set; } internal IdentityErrorDescriber ErrorDescriber { get; set; }
internal ILogger<UserManager<TUser>> Logger { get; set; } internal ILogger Logger { get; set; }
internal IdentityOptions Options { get; set; } internal IdentityOptions Options { get; set; }

27
test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs
View File

@ -127,7 +127,8 @@ namespace Microsoft.AspNet.Identity.Test
var claimsFactory = new UserClaimsPrincipalFactory<TestUser, TestRole>(manager.Object, roleManager.Object, options.Object); var claimsFactory = new UserClaimsPrincipalFactory<TestUser, TestRole>(manager.Object, roleManager.Object, options.Object);
var logStore = new StringBuilder(); var logStore = new StringBuilder();
var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore); var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore);
var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object); var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory, options.Object, null);
helper.Logger = logger.Object;
string expected = string.Format("{0} for user: {1} : Result : {2}", "PasswordSignInAsync", user.Id, "Lockedout"); string expected = string.Format("{0} for user: {1} : Result : {2}", "PasswordSignInAsync", user.Id, "Lockedout");
// Act // Act
@ -175,7 +176,8 @@ namespace Microsoft.AspNet.Identity.Test
var claimsFactory = new UserClaimsPrincipalFactory<TestUser, TestRole>(manager.Object, roleManager.Object, options.Object); var claimsFactory = new UserClaimsPrincipalFactory<TestUser, TestRole>(manager.Object, roleManager.Object, options.Object);
var logStore = new StringBuilder(); var logStore = new StringBuilder();
var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore); var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore);
var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object); var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory, options.Object, null);
helper.Logger = logger.Object;
string expected = string.Format("{0} for user: {1} : Result : {2}", "PasswordSignInAsync", user.Id, "Succeeded"); string expected = string.Format("{0} for user: {1} : Result : {2}", "PasswordSignInAsync", user.Id, "Succeeded");
// Act // Act
@ -266,7 +268,8 @@ namespace Microsoft.AspNet.Identity.Test
contextAccessor.Object, contextAccessor.Object,
new UserClaimsPrincipalFactory<TestUser, TestRole>(manager.Object, roleManager.Object, options.Object), new UserClaimsPrincipalFactory<TestUser, TestRole>(manager.Object, roleManager.Object, options.Object),
options.Object, options.Object,
logger.Object); null);
helper.Logger = logger.Object;
string expected = string.Format("{0} for user: {1} : Result : {2}", "PasswordSignInAsync", user.Id, "RequiresTwoFactor"); string expected = string.Format("{0} for user: {1} : Result : {2}", "PasswordSignInAsync", user.Id, "RequiresTwoFactor");
// Act // Act
@ -315,7 +318,8 @@ namespace Microsoft.AspNet.Identity.Test
var claimsFactory = new UserClaimsPrincipalFactory<TestUser, TestRole>(manager.Object, roleManager.Object, options.Object); var claimsFactory = new UserClaimsPrincipalFactory<TestUser, TestRole>(manager.Object, roleManager.Object, options.Object);
var logStore = new StringBuilder(); var logStore = new StringBuilder();
var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore); var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore);
var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object); var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory, options.Object, null);
helper.Logger = logger.Object;
string expected = string.Format("{0} for user: {1} : Result : {2}", "ExternalLoginSignInAsync", user.Id.ToString(), "Succeeded"); string expected = string.Format("{0} for user: {1} : Result : {2}", "ExternalLoginSignInAsync", user.Id.ToString(), "Succeeded");
// Act // Act
@ -399,7 +403,8 @@ namespace Microsoft.AspNet.Identity.Test
contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); contextAccessor.Setup(a => a.HttpContext).Returns(context.Object);
var logStore = new StringBuilder(); var logStore = new StringBuilder();
var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore); var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore);
var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object); var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory, options.Object, null);
helper.Logger = logger.Object;
string expected = string.Format("{0} for user: {1} : Result : {2}", "TwoFactorSignInAsync", user.Id.ToString(), "Succeeded"); string expected = string.Format("{0} for user: {1} : Result : {2}", "TwoFactorSignInAsync", user.Id.ToString(), "Succeeded");
// Act // Act
@ -520,7 +525,8 @@ namespace Microsoft.AspNet.Identity.Test
var claimsFactory = new Mock<UserClaimsPrincipalFactory<TestUser, TestRole>>(manager.Object, roleManager.Object, options.Object); var claimsFactory = new Mock<UserClaimsPrincipalFactory<TestUser, TestRole>>(manager.Object, roleManager.Object, options.Object);
var logStore = new StringBuilder(); var logStore = new StringBuilder();
var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore); var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore);
var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory.Object, options.Object, logger.Object); var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory.Object, options.Object, null);
helper.Logger = logger.Object;
// Act // Act
helper.SignOut(); helper.SignOut();
@ -551,7 +557,8 @@ namespace Microsoft.AspNet.Identity.Test
var claimsFactory = new Mock<UserClaimsPrincipalFactory<TestUser, TestRole>>(manager.Object, roleManager.Object, options.Object); var claimsFactory = new Mock<UserClaimsPrincipalFactory<TestUser, TestRole>>(manager.Object, roleManager.Object, options.Object);
var logStore = new StringBuilder(); var logStore = new StringBuilder();
var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore); var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore);
var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory.Object, options.Object, logger.Object); var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory.Object, options.Object);
helper.Logger = logger.Object;
string expected = string.Format("{0} for user: {1} : Result : {2}", "PasswordSignInAsync", user.Id.ToString(), "Failed"); string expected = string.Format("{0} for user: {1} : Result : {2}", "PasswordSignInAsync", user.Id.ToString(), "Failed");
// Act // Act
var result = await helper.PasswordSignInAsync(user.UserName, "bogus", false, false); var result = await helper.PasswordSignInAsync(user.UserName, "bogus", false, false);
@ -655,7 +662,8 @@ namespace Microsoft.AspNet.Identity.Test
var claimsFactory = new Mock<UserClaimsPrincipalFactory<TestUser, TestRole>>(manager.Object, roleManager.Object, options.Object); var claimsFactory = new Mock<UserClaimsPrincipalFactory<TestUser, TestRole>>(manager.Object, roleManager.Object, options.Object);
var logStore = new StringBuilder(); var logStore = new StringBuilder();
var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore); var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore);
var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory.Object, options.Object, logger.Object); var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory.Object, options.Object);
helper.Logger = logger.Object;
string expected = string.Format("{0} for user: {1} : Result : {2}", "CanSignInAsync", user.Id.ToString(), confirmed.ToString()); string expected = string.Format("{0} for user: {1} : Result : {2}", "CanSignInAsync", user.Id.ToString(), confirmed.ToString());
// Act // Act
@ -709,7 +717,8 @@ namespace Microsoft.AspNet.Identity.Test
var claimsFactory = new Mock<UserClaimsPrincipalFactory<TestUser, TestRole>>(manager.Object, roleManager.Object, options.Object); var claimsFactory = new Mock<UserClaimsPrincipalFactory<TestUser, TestRole>>(manager.Object, roleManager.Object, options.Object);
var logStore = new StringBuilder(); var logStore = new StringBuilder();
var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore); var logger = MockHelpers.MockILogger<SignInManager<TestUser>>(logStore);
var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory.Object, options.Object, logger.Object); var helper = new SignInManager<TestUser>(manager.Object, contextAccessor.Object, claimsFactory.Object, options.Object, null);
helper.Logger = logger.Object;
string expected = string.Format("{0} for user: {1} : Result : {2}", "CanSignInAsync", user.Id.ToString(), confirmed.ToString()); string expected = string.Format("{0} for user: {1} : Result : {2}", "CanSignInAsync", user.Id.ToString(), confirmed.ToString());
// Act // Act

4
test/Shared/MockHelpers.cs
View File

@ -63,7 +63,7 @@ namespace Microsoft.AspNet.Identity.Test
var userManager = new UserManager<TUser>(store, options.Object, new PasswordHasher<TUser>(), var userManager = new UserManager<TUser>(store, options.Object, new PasswordHasher<TUser>(),
userValidators, pwdValidators, new UpperInvariantLookupNormalizer(), userValidators, pwdValidators, new UpperInvariantLookupNormalizer(),
new IdentityErrorDescriber(), Enumerable.Empty<IUserTokenProvider<TUser>>(), new IdentityErrorDescriber(), Enumerable.Empty<IUserTokenProvider<TUser>>(),
new Logger<UserManager<TUser>>(new LoggerFactory()), null,
null); null);
validator.Setup(v => v.ValidateAsync(userManager, It.IsAny<TUser>())) validator.Setup(v => v.ValidateAsync(userManager, It.IsAny<TUser>()))
.Returns(Task.FromResult(IdentityResult.Success)).Verifiable(); .Returns(Task.FromResult(IdentityResult.Success)).Verifiable();
@ -78,7 +78,7 @@ namespace Microsoft.AspNet.Identity.Test
return new RoleManager<TRole>(store, roles, return new RoleManager<TRole>(store, roles,
new UpperInvariantLookupNormalizer(), new UpperInvariantLookupNormalizer(),
new IdentityErrorDescriber(), new IdentityErrorDescriber(),
new Logger<RoleManager<TRole>>(new LoggerFactory()), null,
null); null);
} }