From 747f4137c6ec37e4f1eadd8281a65684e7bf42c8 Mon Sep 17 00:00:00 2001 From: Praburaj Date: Mon, 2 Mar 2015 11:56:44 -0800 Subject: [PATCH] Reacting to Hosting API changes --- src/Microsoft.AspNet.Identity/RoleManager.cs | 2 +- .../SignInManager.cs | 4 +-- src/Microsoft.AspNet.Identity/UserManager.cs | 2 +- .../HttpSignInTest.cs | 2 +- .../SecurityStampValidatorTest.cs | 8 ++--- .../SignInManagerTest.cs | 30 +++++++++---------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Microsoft.AspNet.Identity/RoleManager.cs b/src/Microsoft.AspNet.Identity/RoleManager.cs index 9b3d5f52b3..892d7afc22 100644 --- a/src/Microsoft.AspNet.Identity/RoleManager.cs +++ b/src/Microsoft.AspNet.Identity/RoleManager.cs @@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Identity Store = store; KeyNormalizer = keyNormalizer ?? new UpperInvariantLookupNormalizer(); ErrorDescriber = errors ?? new IdentityErrorDescriber(); - _context = contextAccessor?.Value; + _context = contextAccessor?.HttpContext; if (roleValidators != null) { diff --git a/src/Microsoft.AspNet.Identity/SignInManager.cs b/src/Microsoft.AspNet.Identity/SignInManager.cs index 12e4b9d027..d05a706a26 100644 --- a/src/Microsoft.AspNet.Identity/SignInManager.cs +++ b/src/Microsoft.AspNet.Identity/SignInManager.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Identity { throw new ArgumentNullException(nameof(userManager)); } - if (contextAccessor == null || contextAccessor.Value == null) + if (contextAccessor == null || contextAccessor.HttpContext == null) { throw new ArgumentNullException(nameof(contextAccessor)); } @@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Identity } UserManager = userManager; - Context = contextAccessor.Value; + Context = contextAccessor.HttpContext; ClaimsFactory = claimsFactory; Options = optionsAccessor?.Options ?? new IdentityOptions(); diff --git a/src/Microsoft.AspNet.Identity/UserManager.cs b/src/Microsoft.AspNet.Identity/UserManager.cs index a1477d493d..3bb502c2a1 100644 --- a/src/Microsoft.AspNet.Identity/UserManager.cs +++ b/src/Microsoft.AspNet.Identity/UserManager.cs @@ -62,7 +62,7 @@ namespace Microsoft.AspNet.Identity } Store = store; Options = optionsAccessor?.Options ?? new IdentityOptions(); - _context = contextAccessor?.Value; + _context = contextAccessor?.HttpContext; PasswordHasher = passwordHasher; KeyNormalizer = keyNormalizer; ErrorDescriber = errors; diff --git a/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs b/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs index 9f922d9a3b..f765f8c162 100644 --- a/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs +++ b/test/Microsoft.AspNet.Identity.InMemory.Test/HttpSignInTest.cs @@ -32,7 +32,7 @@ namespace Microsoft.AspNet.Identity.InMemory.Test context.Setup(c => c.Response).Returns(response.Object).Verifiable(); response.Setup(r => r.SignIn(It.Is(v => v.IsPersistent == isPersistent), It.IsAny())).Verifiable(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); app.UseServices(services => { services.AddInstance(contextAccessor.Object); diff --git a/test/Microsoft.AspNet.Identity.Test/SecurityStampValidatorTest.cs b/test/Microsoft.AspNet.Identity.Test/SecurityStampValidatorTest.cs index e0dd40bc5a..6d5e605e4b 100644 --- a/test/Microsoft.AspNet.Identity.Test/SecurityStampValidatorTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/SecurityStampValidatorTest.cs @@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Identity.Test options.Setup(a => a.Options).Returns(identityOptions); var httpContext = new Mock(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(httpContext.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, contextAccessor.Object, claimsManager.Object, options.Object, null); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny(), user.Id)).ReturnsAsync(user).Verifiable(); @@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Identity.Test options.Setup(a => a.Options).Returns(identityOptions); var httpContext = new Mock(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(httpContext.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, contextAccessor.Object, claimsManager.Object, options.Object, null); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny(), user.Id)).ReturnsAsync(null).Verifiable(); @@ -114,7 +114,7 @@ namespace Microsoft.AspNet.Identity.Test var options = new Mock>(); options.Setup(a => a.Options).Returns(identityOptions); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(httpContext.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, contextAccessor.Object, claimsManager.Object, options.Object, null); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny(), user.Id)).ReturnsAsync(null).Verifiable(); @@ -148,7 +148,7 @@ namespace Microsoft.AspNet.Identity.Test var options = new Mock>(); options.Setup(a => a.Options).Returns(identityOptions); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(httpContext.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(httpContext.Object); var signInManager = new Mock>(userManager.Object, contextAccessor.Object, claimsManager.Object, options.Object, null); signInManager.Setup(s => s.ValidateSecurityStampAsync(It.IsAny(), user.Id)).Throws(new Exception("Shouldn't be called")); diff --git a/test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs b/test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs index c53cf80b8d..701fbd715b 100644 --- a/test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs +++ b/test/Microsoft.AspNet.Identity.Test/SignInManagerTest.cs @@ -75,7 +75,7 @@ namespace Microsoft.AspNet.Identity.Test var contextAccessor = new Mock(); Assert.Throws("contextAccessor", () => new SignInManager(userManager, contextAccessor.Object, null, null)); var context = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); Assert.Throws("claimsFactory", () => new SignInManager(userManager, contextAccessor.Object, null, null)); } @@ -122,7 +122,7 @@ namespace Microsoft.AspNet.Identity.Test var context = new Mock(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -163,7 +163,7 @@ namespace Microsoft.AspNet.Identity.Test context.Setup(c => c.Response).Returns(response.Object).Verifiable(); response.Setup(r => r.SignIn(It.Is(v => v.IsPersistent == isPersistent), It.IsAny())).Verifiable(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -206,7 +206,7 @@ namespace Microsoft.AspNet.Identity.Test response.Setup(r => r.SignIn(It.IsAny(), It.IsAny())).Verifiable(); context.Setup(c => c.Response).Returns(response.Object).Verifiable(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -255,7 +255,7 @@ namespace Microsoft.AspNet.Identity.Test response.Setup(r => r.SignIn(It.Is(id => id.Name == user.Id))).Verifiable(); context.Setup(c => c.Response).Returns(response.Object).Verifiable(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -305,7 +305,7 @@ namespace Microsoft.AspNet.Identity.Test It.Is(v => v.IsPersistent == isPersistent), It.Is(i => i.FindFirstValue(ClaimTypes.AuthenticationMethod) == loginProvider))).Verifiable(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); response.Setup(r => r.SignOut(IdentityOptions.ExternalCookieAuthenticationType)).Verifiable(); @@ -400,7 +400,7 @@ namespace Microsoft.AspNet.Identity.Test } context.Setup(c => c.Response).Returns(response.Object).Verifiable(); context.Setup(c => c.AuthenticateAsync(IdentityOptions.TwoFactorUserIdCookieAuthenticationType)).ReturnsAsync(authResult).Verifiable(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var logStore = new StringBuilder(); var logger = MockHelpers.MockILogger>(logStore); var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object, logger.Object); @@ -439,7 +439,7 @@ namespace Microsoft.AspNet.Identity.Test It.Is(v => v.IsPersistent == true), It.Is(i => i.FindFirstValue(ClaimTypes.Name) == user.Id && i.AuthenticationType == IdentityOptions.TwoFactorRememberMeCookieAuthenticationType))).Verifiable(); - contextAccessor.Setup(a => a.Value).Returns(context.Object).Verifiable(); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object).Verifiable(); options.Setup(a => a.Options).Returns(identityOptions).Verifiable(); var helper = new SignInManager(manager.Object, contextAccessor.Object, claimsFactory, options.Object); @@ -482,7 +482,7 @@ namespace Microsoft.AspNet.Identity.Test var authResult = new AuthenticationResult(id, new AuthenticationProperties(), new AuthenticationDescription()); context.Setup(c => c.AuthenticateAsync(IdentityOptions.TwoFactorRememberMeCookieAuthenticationType)).ReturnsAsync(authResult).Verifiable(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -517,7 +517,7 @@ namespace Microsoft.AspNet.Identity.Test response.Setup(r => r.SignOut(IdentityOptions.TwoFactorUserIdCookieAuthenticationType)).Verifiable(); response.Setup(r => r.SignOut(IdentityOptions.ExternalCookieAuthenticationType)).Verifiable(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -551,7 +551,7 @@ namespace Microsoft.AspNet.Identity.Test manager.Setup(m => m.GetUserIdAsync(user)).ReturnsAsync(user.Id.ToString()).Verifiable(); var context = new Mock(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -580,7 +580,7 @@ namespace Microsoft.AspNet.Identity.Test manager.Setup(m => m.FindByNameAsync("bogus")).ReturnsAsync(null).Verifiable(); var context = new Mock(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -616,7 +616,7 @@ namespace Microsoft.AspNet.Identity.Test manager.Setup(m => m.CheckPasswordAsync(user, "bogus")).ReturnsAsync(false).Verifiable(); var context = new Mock(); var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); var options = new Mock>(); @@ -656,7 +656,7 @@ namespace Microsoft.AspNet.Identity.Test response.Setup(r => r.SignIn(It.Is(v => v.IsPersistent == false), It.IsAny())).Verifiable(); } var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); identityOptions.SignIn.RequireConfirmedEmail = true; @@ -702,7 +702,7 @@ namespace Microsoft.AspNet.Identity.Test } var contextAccessor = new Mock(); - contextAccessor.Setup(a => a.Value).Returns(context.Object); + contextAccessor.Setup(a => a.HttpContext).Returns(context.Object); var roleManager = MockHelpers.MockRoleManager(); var identityOptions = new IdentityOptions(); identityOptions.SignIn.RequireConfirmedPhoneNumber = true;