Forbid + obsolete context.Authentication

Author: HaoK

src/Microsoft.AspNetCore.Authentication.Abstractions/AuthenticationHttpContextExtensions.cs

@@ -64,18 +64,7 @@ public static Task ChallengeAsync(this HttpContext context, AuthenticationProper
         /// <param name="properties">The <see cref="AuthenticationProperties"/> properties.</param>
         /// <returns>The task.</returns>
         public static Task ChallengeAsync(this HttpContext context, string scheme, AuthenticationProperties properties) =>
-            context.ChallengeAsync(scheme, properties: properties, behavior: ChallengeBehavior.Automatic);
-
-        /// <summary>
-        /// Extension method for Challenge.
-        /// </summary>
-        /// <param name="context">The <see cref="HttpContext"/> context.</param>
-        /// <param name="scheme">The name of the authentication scheme.</param>
-        /// <param name="properties">The <see cref="AuthenticationProperties"/> properties.</param>
-        /// <param name="behavior">The <see cref="ChallengeBehavior"/> behavior.</param>
-        /// <returns>The task.</returns>
-        public static Task ChallengeAsync(this HttpContext context, string scheme, AuthenticationProperties properties, ChallengeBehavior behavior) =>
-            context.RequestServices.GetRequiredService<IAuthenticationService>().ChallengeAsync(context, scheme, properties, behavior);
+            context.RequestServices.GetRequiredService<IAuthenticationService>().ChallengeAsync(context, scheme, properties);
 
         /// <summary>
         /// Extension method for Forbid.
@@ -111,7 +100,7 @@ public static Task ForbidAsync(this HttpContext context, AuthenticationPropertie
         /// <param name="properties">The <see cref="AuthenticationProperties"/> properties.</param>
         /// <returns>The task.</returns>
         public static Task ForbidAsync(this HttpContext context, string scheme, AuthenticationProperties properties) =>
-            context.RequestServices.GetRequiredService<IAuthenticationService>().ChallengeAsync(context, scheme, properties, ChallengeBehavior.Forbidden);
+            context.RequestServices.GetRequiredService<IAuthenticationService>().ForbidAsync(context, scheme, properties);
 
         /// <summary>
         /// Extension method for SignIn.

src/Microsoft.AspNetCore.Authentication.Abstractions/AuthenticationOptions.cs

@@ -58,7 +58,7 @@ public void AddScheme(string name, Action<AuthenticationSchemeBuilder> configure
         public string DefaultSignInScheme { get; set; }
 
         /// <summary>
-        /// Used by as the default scheme by <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties, ChallengeBehavior)"/>.
+        /// Used by as the default scheme by <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties)"/>.
         /// </summary>
         public string DefaultChallengeScheme { get; set; }
     }

src/Microsoft.AspNetCore.Authentication.Abstractions/BaseAuthenticationContext.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
@@ -28,22 +29,30 @@ public interface IAuthenticationHandler
         /// <summary>
         /// Challenge behavior.
         /// </summary>
-        /// <param name="context">The <see cref="ChallengeContext"/> context.</param>
+        /// <param name="properties">The <see cref="AuthenticationProperties"/> that contains the extra meta-data arriving with the authentication.</param>
         /// <returns>A task.</returns>
-        Task ChallengeAsync(ChallengeContext context);
+        Task ChallengeAsync(AuthenticationProperties properties);
+
+        /// <summary>
+        /// Forbid behavior.
+        /// </summary>
+        /// <param name="properties">The <see cref="AuthenticationProperties"/> that contains the extra meta-data arriving with the authentication.</param>
+        /// <returns>A task.</returns>
+        Task ForbidAsync(AuthenticationProperties properties);
 
         /// <summary>
         /// Handle sign in.
         /// </summary>
-        /// <param name="context">The <see cref="SignInContext"/> context.</param>
+        /// <param name="user">The <see cref="ClaimsPrincipal"/> user.</param>
+        /// <param name="properties">The <see cref="AuthenticationProperties"/> that contains the extra meta-data arriving with the authentication.</param>
         /// <returns>A task.</returns>
-        Task SignInAsync(SignInContext context);
+        Task SignInAsync(ClaimsPrincipal user, AuthenticationProperties properties);
 
         /// <summary>
         /// Signout behavior.
         /// </summary>
-        /// <param name="context">The <see cref="SignOutContext"/> context.</param>
+        /// <param name="properties">The <see cref="AuthenticationProperties"/> that contains the extra meta-data arriving with the authentication.</param>
         /// <returns>A task.</returns>
-        Task SignOutAsync(SignOutContext context);
+        Task SignOutAsync(AuthenticationProperties properties);
     }
 }

src/Microsoft.AspNetCore.Authentication.Abstractions/BaseContext.cs

@@ -34,11 +34,11 @@ public interface IAuthenticationSchemeProvider
         Task<AuthenticationScheme> GetDefaultAuthenticateSchemeAsync();
 
         /// <summary>
-        /// Returns the scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties, ChallengeBehavior)"/>.
+        /// Returns the scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties)"/>.
         /// This is typically specified via <see cref="AuthenticationOptions.DefaultChallengeScheme"/>.
         /// Otherwise, if only a single scheme exists, that will be used, if more than one exists, null will be returned.
         /// </summary>
-        /// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties, ChallengeBehavior)"/>.</returns>
+        /// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties)"/>.</returns>
         Task<AuthenticationScheme> GetDefaultChallengeSchemeAsync();
 
         /// <summary>

src/Microsoft.AspNetCore.Authentication.Abstractions/ChallengeBehavior.cs

@@ -26,9 +26,17 @@ public interface IAuthenticationService
         /// <param name="context">The <see cref="HttpContext"/>.</param>
         /// <param name="scheme">The name of the authentication scheme.</param>
         /// <param name="properties">The <see cref="AuthenticationProperties"/>.</param>
-        /// <param name="behavior">The <see cref="ChallengeBehavior"/>.</param>
         /// <returns>A task.</returns>
-        Task ChallengeAsync(HttpContext context, string scheme, AuthenticationProperties properties, ChallengeBehavior behavior);
+        Task ChallengeAsync(HttpContext context, string scheme, AuthenticationProperties properties);
+
+        /// <summary>
+        /// Forbids the specified authentication scheme.
+        /// </summary>
+        /// <param name="context">The <see cref="HttpContext"/>.</param>
+        /// <param name="scheme">The name of the authentication scheme.</param>
+        /// <param name="properties">The <see cref="AuthenticationProperties"/>.</param>
+        /// <returns>A task.</returns>
+        Task ForbidAsync(HttpContext context, string scheme, AuthenticationProperties properties);
 
         /// <summary>
         /// Sign a principal in for the specified authentication scheme.

src/Microsoft.AspNetCore.Authentication.Abstractions/ChallengeContext.cs

@@ -57,11 +57,11 @@ public Task<AuthenticationScheme> GetDefaultAuthenticateSchemeAsync()
         }
 
         /// <summary>
-        /// Returns the scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties, ChallengeBehavior)"/>.
+        /// Returns the scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties)"/>.
         /// This is typically specified via <see cref="AuthenticationOptions.DefaultChallengeScheme"/>.
         /// Otherwise, if only a single scheme exists, that will be used, if more than one exists, null will be returned.
         /// </summary>
-        /// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties, ChallengeBehavior)"/>.</returns>
+        /// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties)"/>.</returns>
         public Task<AuthenticationScheme> GetDefaultChallengeSchemeAsync()
         {
             if (_options.DefaultChallengeScheme != null)