React to AuthZ changes

Author: HaoK

src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeFilter.cs

@@ -44,10 +44,10 @@ public virtual async Task OnAuthorizationAsync(Filters.AuthorizationContext cont
             }
 
             // Build a ClaimsPrincipal with the Policy's required authentication types
-            if (Policy.ActiveAuthenticationSchemes != null && Policy.ActiveAuthenticationSchemes.Any())
+            if (Policy.AuthenticationSchemes != null && Policy.AuthenticationSchemes.Any())
             {
                 ClaimsPrincipal newPrincipal = null;
-                foreach (var scheme in Policy.ActiveAuthenticationSchemes)
+                foreach (var scheme in Policy.AuthenticationSchemes)
                 {
                     var result = await context.HttpContext.Authentication.AuthenticateAsync(scheme);
                     if (result != null)
@@ -77,7 +77,7 @@ public virtual async Task OnAuthorizationAsync(Filters.AuthorizationContext cont
                 !httpContext.User.Identities.Any(i => i.IsAuthenticated) ||
                 !await authService.AuthorizeAsync(httpContext.User, context, Policy))
             {
-                context.Result = new ChallengeResult(Policy.ActiveAuthenticationSchemes.ToArray());
+                context.Result = new ChallengeResult(Policy.AuthenticationSchemes.ToArray());
             }
         }
     }

test/WebSites/FiltersWebSite/BasicAuthenticationHandler.cs

@@ -13,7 +13,7 @@ namespace FiltersWebSite
 {
     public class BasicAuthenticationHandler : AuthenticationHandler<BasicOptions>
     {
-        protected override Task<AuthenticationTicket> HandleAuthenticateAsync()
+        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
         {
             var principal = new ClaimsPrincipal();
             principal.AddIdentity(new ClaimsIdentity(
@@ -24,8 +24,8 @@ protected override Task<AuthenticationTicket> HandleAuthenticateAsync()
                     new Claim(ClaimTypes.NameIdentifier, "John")
                 },
                 Options.AuthenticationScheme));
-            return Task.FromResult(new AuthenticationTicket(principal, 
-                new AuthenticationProperties(), Options.AuthenticationScheme));
+            return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(principal, 
+                new AuthenticationProperties(), Options.AuthenticationScheme)));
         }
     }
 }

test/WebSites/FiltersWebSite/Startup.cs

@@ -20,22 +20,22 @@ public void ConfigureServices(IServiceCollection services)
                 // This policy cannot succeed since the claim is never added
                 options.AddPolicy("Impossible", policy =>
                 {
-                    policy.ActiveAuthenticationSchemes.Add("Interactive");
+                    policy.AuthenticationSchemes.Add("Interactive");
                     policy.RequireClaim("Never");
                 });
                 options.AddPolicy("Api", policy =>
                 {
-                    policy.ActiveAuthenticationSchemes.Add("Api");
+                    policy.AuthenticationSchemes.Add("Api");
                     policy.RequireClaim(ClaimTypes.NameIdentifier);
                 });
                 options.AddPolicy("Api-Manager", policy =>
                 {
-                    policy.ActiveAuthenticationSchemes.Add("Api");
+                    policy.AuthenticationSchemes.Add("Api");
                     policy.Requirements.Add(Operations.Edit);
                 });
                 options.AddPolicy("Interactive", policy =>
                 {
-                    policy.ActiveAuthenticationSchemes.Add("Interactive");
+                    policy.AuthenticationSchemes.Add("Interactive");
                     policy.RequireClaim(ClaimTypes.NameIdentifier)
                           .RequireClaim("Permission", "CanViewPage");
                 });