From 2063ad5f67a626000a213288ea82253f24159883 Mon Sep 17 00:00:00 2001
From: Chris Ross <Tratcher@Outlook.com>
Date: Fri, 24 Apr 2015 12:03:19 -0700
Subject: [PATCH] React to Auth API changes.

---
 .../Controllers/AccountController.cs          |  2 +-
 test/MusicStore.Test/ManageControllerTest.cs  | 38 ++++++++++++++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/MusicStore/Controllers/AccountController.cs b/src/MusicStore/Controllers/AccountController.cs
index 9324179580..ebdb5c7107 100644
--- a/src/MusicStore/Controllers/AccountController.cs
+++ b/src/MusicStore/Controllers/AccountController.cs
@@ -444,7 +444,7 @@ namespace MusicStore.Controllers
             var appEnv = Context.RequestServices.GetService<IHostingEnvironment>();
             if (appEnv.EnvironmentName.StartsWith("OpenIdConnect"))
             {
-                Response.SignOut("OpenIdConnect");
+                Context.Authentication.SignOut("OpenIdConnect");
             }
 
             return RedirectToAction("Index", "Home");
diff --git a/test/MusicStore.Test/ManageControllerTest.cs b/test/MusicStore.Test/ManageControllerTest.cs
index a3bf295e5d..d95c72066e 100644
--- a/test/MusicStore.Test/ManageControllerTest.cs
+++ b/test/MusicStore.Test/ManageControllerTest.cs
@@ -29,10 +29,12 @@ namespace MusicStore.Controllers
                     .AddEntityFrameworkStores<MusicStoreContext>();
 
             // IHttpContextAccessor is required for SignInManager, and UserManager
+            var context = new DefaultHttpContext();
+            context.SetFeature<IHttpAuthenticationFeature>(new HttpAuthenticationFeature() { Handler = new TestAuthHandler() });
             services.AddInstance<IHttpContextAccessor>(
                 new HttpContextAccessor()
                     {
-                        HttpContext = new TestHttpContext(),
+                        HttpContext = context,
                     });
 
             _serviceProvider = services.BuildServiceProvider();
@@ -80,13 +82,37 @@ namespace MusicStore.Controllers
             Assert.True(model.HasPassword);
         }
 
-        private class TestHttpContext : DefaultHttpContext
+        private class TestAuthHandler : IAuthenticationHandler
         {
-            public override Task<AuthenticationResult>
-                AuthenticateAsync(string authenticationScheme)
+            public void Authenticate(AuthenticateContext context)
             {
-                return
-                    Task.FromResult(new AuthenticateContext(authenticationScheme).Result);
+                context.NotAuthenticated();
+            }
+
+            public Task AuthenticateAsync(AuthenticateContext context)
+            {
+                context.NotAuthenticated();
+                return Task.FromResult(0);
+            }
+
+            public void Challenge(ChallengeContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void GetDescriptions(DescribeSchemesContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void SignIn(SignInContext context)
+            {
+                throw new NotImplementedException();
+            }
+
+            public void SignOut(SignOutContext context)
+            {
+                throw new NotImplementedException();
             }
         }
     }