Refactor IAuthenticationHandler/Result

HaoK · HaoK · commit 271faf11bbd5 · 2017-06-29T16:25:24.000-07:00
diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/AuthenticateResult.cs b/src/Microsoft.AspNetCore.Authentication.Abstractions/AuthenticateResult.cs
@@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Authentication
     /// </summary>
     public class AuthenticateResult
     {
-        private AuthenticateResult() { }
+        protected AuthenticateResult() { }
 
         /// <summary>
         /// If a ticket was produced, authenticate was successful.
@@ -21,7 +21,7 @@ private AuthenticateResult() { }
         /// <summary>
         /// The authentication ticket.
         /// </summary>
-        public AuthenticationTicket Ticket { get; private set; }
+        public AuthenticationTicket Ticket { get; protected set; }
 
         /// <summary>
         /// Gets the claims-principal with authenticated user identities.
@@ -36,18 +36,12 @@ private AuthenticateResult() { }
         /// <summary>
         /// Holds failure information from the authentication.
         /// </summary>
-        public Exception Failure { get; private set; }
-
-        /// <summary>
-        /// Indicates that stage of authentication was directly handled by user intervention and no
-        /// further processing should be attempted.
-        /// </summary>
-        public bool Handled { get; private set; }
+        public Exception Failure { get; protected set; }
 
         /// <summary>
         /// Indicates that there was no information returned for this authentication scheme.
         /// </summary>
-        public bool Nothing { get; private set; }
+        public bool None { get; protected set; }
 
         /// <summary>
         /// Indicates that authentication was successful.
@@ -63,23 +57,13 @@ public static AuthenticateResult Success(AuthenticationTicket ticket)
             return new AuthenticateResult() { Ticket = ticket };
         }
 
-        /// <summary>
-        /// Indicates that stage of authentication was directly handled by user intervention and no
-        /// further processing should be attempted.
-        /// </summary>
-        /// <returns>The result.</returns>
-        public static AuthenticateResult Handle()
-        {
-            return new AuthenticateResult() { Handled = true };
-        }
-
         /// <summary>
         /// Indicates that there was no information returned for this authentication scheme.
         /// </summary>
         /// <returns>The result.</returns>
-        public static AuthenticateResult None()
+        public static AuthenticateResult NoResult()
         {
-            return new AuthenticateResult() { Nothing = true };
+            return new AuthenticateResult() { None = true };
         }
 
         /// <summary>
diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/AuthenticationHttpContextExtensions.cs b/src/Microsoft.AspNetCore.Authentication.Abstractions/AuthenticationHttpContextExtensions.cs
@@ -76,7 +76,7 @@ public static Task ForbidAsync(this HttpContext context, string scheme) =>
             context.ForbidAsync(scheme, properties: null);
 
         /// <summary>
-        /// Extension method for Forbid.
+        /// Extension method for Forbid using the <see cref="AuthenticationOptions.DefaultForbidScheme"/> scheme..
         /// </summary>
         /// <param name="context">The <see cref="HttpContext"/> context.</param>
         /// <returns>The task.</returns>
@@ -142,6 +142,21 @@ public static Task SignInAsync(this HttpContext context, ClaimsPrincipal princip
         public static Task SignInAsync(this HttpContext context, string scheme, ClaimsPrincipal principal, AuthenticationProperties properties) =>
             context.RequestServices.GetRequiredService<IAuthenticationService>().SignInAsync(context, scheme, principal, properties);
 
+        /// <summary>
+        /// Extension method for SignOut using the <see cref="AuthenticationOptions.DefaultSignOutScheme"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="HttpContext"/> context.</param>
+        /// <returns>The task.</returns>
+        public static Task SignOutAsync(this HttpContext context) => context.SignOutAsync(scheme: null, properties: null);
+
+        /// <summary>
+        /// Extension method for SignOut using the <see cref="AuthenticationOptions.DefaultSignOutScheme"/>.
+        /// </summary>
+        /// <param name="context">The <see cref="HttpContext"/> context.</param>
+        /// <param name="properties">The <see cref="AuthenticationProperties"/> properties.</param>
+        /// <returns>The task.</returns>
+        public static Task SignOutAsync(this HttpContext context, AuthenticationProperties properties) => context.SignOutAsync(scheme: null, properties: properties);
+
         /// <summary>
         /// Extension method for SignOut.
         /// </summary>
diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/IAuthenticationHandler.cs b/src/Microsoft.AspNetCore.Authentication.Abstractions/IAuthenticationHandler.cs
@@ -1,7 +1,6 @@
 // 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;
 
@@ -39,20 +38,5 @@ public interface IAuthenticationHandler
         /// <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="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(ClaimsPrincipal user, AuthenticationProperties properties);
-
-        /// <summary>
-        /// Signout 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 SignOutAsync(AuthenticationProperties properties);
     }
 }
diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/IAuthenticationRequestHandler.cs b/src/Microsoft.AspNetCore.Authentication.Abstractions/IAuthenticationRequestHandler.cs
@@ -10,7 +10,6 @@ namespace Microsoft.AspNetCore.Authentication
     /// </summary>
     public interface IAuthenticationRequestHandler : IAuthenticationHandler
     {
-
         /// <summary>
         /// Returns true if request processing should stop.
         /// </summary>
diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/IAuthenticationSignInHandler.cs b/src/Microsoft.AspNetCore.Authentication.Abstractions/IAuthenticationSignInHandler.cs
@@ -0,0 +1,22 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Authentication
+{
+    /// <summary>
+    /// Used to determine if a handler supports SignIn.
+    /// </summary>
+    public interface IAuthenticationSignInHandler : IAuthenticationSignOutHandler
+    {
+        /// <summary>
+        /// Handle sign in.
+        /// </summary>
+        /// <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(ClaimsPrincipal user, AuthenticationProperties properties);
+    }
+}
diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/IAuthenticationSignOutHandler.cs b/src/Microsoft.AspNetCore.Authentication.Abstractions/IAuthenticationSignOutHandler.cs
@@ -0,0 +1,21 @@
+// 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.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Authentication
+{
+    /// <summary>
+    /// Used to determine if a handler supports SignOut.
+    /// </summary>
+    public interface IAuthenticationSignOutHandler : IAuthenticationHandler
+    {
+        /// <summary>
+        /// Signout 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 SignOutAsync(AuthenticationProperties properties);
+    }
+
+}
diff --git a/src/Microsoft.AspNetCore.Authentication.Abstractions/IClaimsTransformation.cs b/src/Microsoft.AspNetCore.Authentication.Abstractions/IClaimsTransformation.cs
@@ -18,4 +18,4 @@ public interface IClaimsTransformation
         /// <returns>The transformed principal.</returns>
         Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal);
     }
-}
+}
diff --git a/src/Microsoft.AspNetCore.Authentication.Core/AuthenticationSchemeProvider.cs b/src/Microsoft.AspNetCore.Authentication.Core/AuthenticationSchemeProvider.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
@@ -36,14 +35,16 @@ public AuthenticationSchemeProvider(IOptions<AuthenticationOptions> options)
 
         private IDictionary<string, AuthenticationScheme> _map = new Dictionary<string, AuthenticationScheme>(StringComparer.Ordinal);
         private List<AuthenticationScheme> _requestHandlers = new List<AuthenticationScheme>();
+        private List<AuthenticationScheme> _signOutHandlers = new List<AuthenticationScheme>();
+        private List<AuthenticationScheme> _signInHandlers = new List<AuthenticationScheme>();
 
         /// <summary>
         /// Returns the scheme that will be used by default for <see cref="IAuthenticationService.AuthenticateAsync(HttpContext, string)"/>.
         /// This is typically specified via <see cref="AuthenticationOptions.DefaultAuthenticateScheme"/>.
         /// 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.AuthenticateAsync(HttpContext, string)"/>.</returns>
-        public Task<AuthenticationScheme> GetDefaultAuthenticateSchemeAsync()
+        public virtual Task<AuthenticationScheme> GetDefaultAuthenticateSchemeAsync()
         {
             if (_options.DefaultAuthenticateScheme != null)
             {
@@ -59,20 +60,16 @@ public Task<AuthenticationScheme> GetDefaultAuthenticateSchemeAsync()
         /// <summary>
         /// 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.
+        /// Otherwise, this will fallback to <see cref="GetDefaultAuthenticateSchemeAsync"/>.
         /// </summary>
         /// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties)"/>.</returns>
-        public Task<AuthenticationScheme> GetDefaultChallengeSchemeAsync()
+        public virtual Task<AuthenticationScheme> GetDefaultChallengeSchemeAsync()
         {
             if (_options.DefaultChallengeScheme != null)
             {
                 return GetSchemeAsync(_options.DefaultChallengeScheme);
             }
-            if (_map.Count == 1)
-            {
-                return Task.FromResult(_map.Values.First());
-            }
-            return Task.FromResult<AuthenticationScheme>(null);
+            return GetDefaultAuthenticateSchemeAsync();
         }
 
         /// <summary>
@@ -81,7 +78,7 @@ public Task<AuthenticationScheme> GetDefaultChallengeSchemeAsync()
         /// Otherwise, this will fallback to <see cref="GetDefaultChallengeSchemeAsync"/> .
         /// </summary>
         /// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.ForbidAsync(HttpContext, string, AuthenticationProperties)"/>.</returns>
-        public Task<AuthenticationScheme> GetDefaultForbidSchemeAsync()
+        public virtual Task<AuthenticationScheme> GetDefaultForbidSchemeAsync()
         {
             if (_options.DefaultForbidScheme != null)
             {
@@ -93,34 +90,40 @@ public Task<AuthenticationScheme> GetDefaultForbidSchemeAsync()
         /// <summary>
         /// Returns the scheme that will be used by default for <see cref="IAuthenticationService.SignInAsync(HttpContext, string, System.Security.Claims.ClaimsPrincipal, AuthenticationProperties)"/>.
         /// This is typically specified via <see cref="AuthenticationOptions.DefaultSignInScheme"/>.
-        /// Otherwise, if only a single scheme exists, that will be used, if more than one exists, null will be returned.
+        /// If only a single sign in handler scheme exists, that will be used, if more than one exists,
+        /// this will fallback to <see cref="GetDefaultAuthenticateSchemeAsync"/>.
         /// </summary>
         /// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.SignInAsync(HttpContext, string, System.Security.Claims.ClaimsPrincipal, AuthenticationProperties)"/>.</returns>
-        public Task<AuthenticationScheme> GetDefaultSignInSchemeAsync()
+        public virtual Task<AuthenticationScheme> GetDefaultSignInSchemeAsync()
         {
             if (_options.DefaultSignInScheme != null)
             {
                 return GetSchemeAsync(_options.DefaultSignInScheme);
             }
-            if (_map.Count == 1)
+            if (_signInHandlers.Count == 1)
             {
-                return Task.FromResult(_map.Values.First());
+                return Task.FromResult(_signInHandlers[0]);
             }
-            return Task.FromResult<AuthenticationScheme>(null);
+            return GetDefaultAuthenticateSchemeAsync();
         }
 
         /// <summary>
         /// Returns the scheme that will be used by default for <see cref="IAuthenticationService.SignOutAsync(HttpContext, string, AuthenticationProperties)"/>.
         /// This is typically specified via <see cref="AuthenticationOptions.DefaultSignOutScheme"/>.
-        /// Otherwise, this will fallback to <see cref="GetDefaultSignInSchemeAsync"/> .
+        /// If only a single sign out handler scheme exists, that will be used, if more than one exists,
+        /// this will fallback to <see cref="GetDefaultSignInSchemeAsync"/> if that supoorts sign out.
         /// </summary>
         /// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.SignOutAsync(HttpContext, string, AuthenticationProperties)"/>.</returns>
-        public Task<AuthenticationScheme> GetDefaultSignOutSchemeAsync()
+        public virtual Task<AuthenticationScheme> GetDefaultSignOutSchemeAsync()
         {
             if (_options.DefaultSignOutScheme != null)
             {
                 return GetSchemeAsync(_options.DefaultSignOutScheme);
             }
+            if (_signOutHandlers.Count == 1)
+            {
+                return Task.FromResult(_signOutHandlers[0]);
+            }
             return GetDefaultSignInSchemeAsync();
         }
 
@@ -129,7 +132,7 @@ public Task<AuthenticationScheme> GetDefaultSignOutSchemeAsync()
         /// </summary>
         /// <param name="name">The name of the authenticationScheme.</param>
         /// <returns>The scheme or null if not found.</returns>
-        public Task<AuthenticationScheme> GetSchemeAsync(string name)
+        public virtual Task<AuthenticationScheme> GetSchemeAsync(string name)
         {
             if (_map.ContainsKey(name))
             {
@@ -142,7 +145,7 @@ public Task<AuthenticationScheme> GetSchemeAsync(string name)
         /// Returns the schemes in priority order for request handling.
         /// </summary>
         /// <returns>The schemes in priority order for request handling</returns>
-        public Task<IEnumerable<AuthenticationScheme>> GetRequestHandlerSchemesAsync()
+        public virtual Task<IEnumerable<AuthenticationScheme>> GetRequestHandlerSchemesAsync()
         {
             return Task.FromResult<IEnumerable<AuthenticationScheme>>(_requestHandlers);
         }
@@ -151,7 +154,7 @@ public Task<IEnumerable<AuthenticationScheme>> GetRequestHandlerSchemesAsync()
         /// Registers a scheme for use by <see cref="IAuthenticationService"/>. 
         /// </summary>
         /// <param name="scheme">The scheme.</param>
-        public void AddScheme(AuthenticationScheme scheme)
+        public virtual void AddScheme(AuthenticationScheme scheme)
         {
             if (_map.ContainsKey(scheme.Name))
             {
@@ -167,6 +170,14 @@ public void AddScheme(AuthenticationScheme scheme)
                 {
                     _requestHandlers.Add(scheme);
                 }
+                if (typeof(IAuthenticationSignInHandler).IsAssignableFrom(scheme.HandlerType))
+                {
+                    _signInHandlers.Add(scheme);
+                }
+                if (typeof(IAuthenticationSignOutHandler).IsAssignableFrom(scheme.HandlerType))
+                {
+                    _signOutHandlers.Add(scheme);
+                }
                 _map[scheme.Name] = scheme;
             }
         }
@@ -175,7 +186,7 @@ public void AddScheme(AuthenticationScheme scheme)
         /// Removes a scheme, preventing it from being used by <see cref="IAuthenticationService"/>.
         /// </summary>
         /// <param name="name">The name of the authenticationScheme being removed.</param>
-        public void RemoveScheme(string name)
+        public virtual void RemoveScheme(string name)
         {
             if (!_map.ContainsKey(name))
             {
@@ -186,15 +197,15 @@ public void RemoveScheme(string name)
                 if (_map.ContainsKey(name))
                 {
                     var scheme = _map[name];
-                    _requestHandlers.Remove(_requestHandlers.Where(s => s.Name == name).FirstOrDefault());
+                    _requestHandlers.Remove(scheme);
+                    _signInHandlers.Remove(scheme);
+                    _signOutHandlers.Remove(scheme);
                     _map.Remove(name);
                 }
             }
         }
 
-        public Task<IEnumerable<AuthenticationScheme>> GetAllSchemesAsync()
-        {
-            return Task.FromResult<IEnumerable<AuthenticationScheme>>(_map.Values);
-        }
+        public virtual Task<IEnumerable<AuthenticationScheme>> GetAllSchemesAsync()
+            => Task.FromResult<IEnumerable<AuthenticationScheme>>(_map.Values);
     }
 }
diff --git a/src/Microsoft.AspNetCore.Authentication.Core/AuthenticationService.cs b/src/Microsoft.AspNetCore.Authentication.Core/AuthenticationService.cs
diff --git a/test/Microsoft.AspNetCore.Authentication.Core.Test/AuthenticationSchemeProviderTests.cs b/test/Microsoft.AspNetCore.Authentication.Core.Test/AuthenticationSchemeProviderTests.cs
diff --git a/test/Microsoft.AspNetCore.Authentication.Core.Test/AuthenticationServiceTests.cs b/test/Microsoft.AspNetCore.Authentication.Core.Test/AuthenticationServiceTests.cs

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ namespace Microsoft.AspNetCore.Authentication`
`10`	`10`	`/// </summary>`
`11`	`11`	`public interface IAuthenticationRequestHandler : IAuthenticationHandler`
`12`	`12`	`{`
`13`		`-`
`14`	`13`	`/// <summary>`
`15`	`14`	`/// Returns true if request processing should stop.`
`16`	`15`	`/// </summary>`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@ public interface IClaimsTransformation`
`18`	`18`	`/// <returns>The transformed principal.</returns>`
`19`	`19`	`Task<ClaimsPrincipal> TransformAsync(ClaimsPrincipal principal);`
`20`	`20`	`}`
`21`		`-}`
	`21`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Linq;`
`7`		`-using System.Reflection;`
`8`	`7`	`using System.Threading.Tasks;`
`9`	`8`	`using Microsoft.AspNetCore.Http;`
`10`	`9`	`using Microsoft.Extensions.Options;`
`@@ -36,14 +35,16 @@ public AuthenticationSchemeProvider(IOptions<AuthenticationOptions> options)`
`36`	`35`
`37`	`36`	`private IDictionary<string, AuthenticationScheme> _map = new Dictionary<string, AuthenticationScheme>(StringComparer.Ordinal);`
`38`	`37`	`private List<AuthenticationScheme> _requestHandlers = new List<AuthenticationScheme>();`
	`38`	`+ private List<AuthenticationScheme> _signOutHandlers = new List<AuthenticationScheme>();`
	`39`	`+ private List<AuthenticationScheme> _signInHandlers = new List<AuthenticationScheme>();`
`39`	`40`
`40`	`41`	`/// <summary>`
`41`	`42`	`/// Returns the scheme that will be used by default for <see cref="IAuthenticationService.AuthenticateAsync(HttpContext, string)"/>.`
`42`	`43`	`/// This is typically specified via <see cref="AuthenticationOptions.DefaultAuthenticateScheme"/>.`
`43`	`44`	`/// Otherwise, if only a single scheme exists, that will be used, if more than one exists, null will be returned.`
`44`	`45`	`/// </summary>`
`45`	`46`	`/// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.AuthenticateAsync(HttpContext, string)"/>.</returns>`
`46`		`- public Task<AuthenticationScheme> GetDefaultAuthenticateSchemeAsync()`
	`47`	`+ public virtual Task<AuthenticationScheme> GetDefaultAuthenticateSchemeAsync()`
`47`	`48`	`{`
`48`	`49`	`if (_options.DefaultAuthenticateScheme != null)`
`49`	`50`	`{`
`@@ -59,20 +60,16 @@ public Task<AuthenticationScheme> GetDefaultAuthenticateSchemeAsync()`
`59`	`60`	`/// <summary>`
`60`	`61`	`/// Returns the scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties)"/>.`
`61`	`62`	`/// This is typically specified via <see cref="AuthenticationOptions.DefaultChallengeScheme"/>.`
`62`		`- /// Otherwise, if only a single scheme exists, that will be used, if more than one exists, null will be returned.`
	`63`	`+ /// Otherwise, this will fallback to <see cref="GetDefaultAuthenticateSchemeAsync"/>.`
`63`	`64`	`/// </summary>`
`64`	`65`	`/// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.ChallengeAsync(HttpContext, string, AuthenticationProperties)"/>.</returns>`
`65`		`- public Task<AuthenticationScheme> GetDefaultChallengeSchemeAsync()`
	`66`	`+ public virtual Task<AuthenticationScheme> GetDefaultChallengeSchemeAsync()`
`66`	`67`	`{`
`67`	`68`	`if (_options.DefaultChallengeScheme != null)`
`68`	`69`	`{`
`69`	`70`	`return GetSchemeAsync(_options.DefaultChallengeScheme);`
`70`	`71`	`}`
`71`		`- if (_map.Count == 1)`
`72`		`- {`
`73`		`- return Task.FromResult(_map.Values.First());`
`74`		`- }`
`75`		`- return Task.FromResult<AuthenticationScheme>(null);`
	`72`	`+ return GetDefaultAuthenticateSchemeAsync();`
`76`	`73`	`}`
`77`	`74`
`78`	`75`	`/// <summary>`
`@@ -81,7 +78,7 @@ public Task<AuthenticationScheme> GetDefaultChallengeSchemeAsync()`
`81`	`78`	`/// Otherwise, this will fallback to <see cref="GetDefaultChallengeSchemeAsync"/> .`
`82`	`79`	`/// </summary>`
`83`	`80`	`/// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.ForbidAsync(HttpContext, string, AuthenticationProperties)"/>.</returns>`
`84`		`- public Task<AuthenticationScheme> GetDefaultForbidSchemeAsync()`
	`81`	`+ public virtual Task<AuthenticationScheme> GetDefaultForbidSchemeAsync()`
`85`	`82`	`{`
`86`	`83`	`if (_options.DefaultForbidScheme != null)`
`87`	`84`	`{`
`@@ -93,34 +90,40 @@ public Task<AuthenticationScheme> GetDefaultForbidSchemeAsync()`
`93`	`90`	`/// <summary>`
`94`	`91`	`/// Returns the scheme that will be used by default for <see cref="IAuthenticationService.SignInAsync(HttpContext, string, System.Security.Claims.ClaimsPrincipal, AuthenticationProperties)"/>.`
`95`	`92`	`/// This is typically specified via <see cref="AuthenticationOptions.DefaultSignInScheme"/>.`
`96`		`- /// Otherwise, if only a single scheme exists, that will be used, if more than one exists, null will be returned.`
	`93`	`+ /// If only a single sign in handler scheme exists, that will be used, if more than one exists,`
	`94`	`+ /// this will fallback to <see cref="GetDefaultAuthenticateSchemeAsync"/>.`
`97`	`95`	`/// </summary>`
`98`	`96`	`/// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.SignInAsync(HttpContext, string, System.Security.Claims.ClaimsPrincipal, AuthenticationProperties)"/>.</returns>`
`99`		`- public Task<AuthenticationScheme> GetDefaultSignInSchemeAsync()`
	`97`	`+ public virtual Task<AuthenticationScheme> GetDefaultSignInSchemeAsync()`
`100`	`98`	`{`
`101`	`99`	`if (_options.DefaultSignInScheme != null)`
`102`	`100`	`{`
`103`	`101`	`return GetSchemeAsync(_options.DefaultSignInScheme);`
`104`	`102`	`}`
`105`		`- if (_map.Count == 1)`
	`103`	`+ if (_signInHandlers.Count == 1)`
`106`	`104`	`{`
`107`		`- return Task.FromResult(_map.Values.First());`
	`105`	`+ return Task.FromResult(_signInHandlers[0]);`
`108`	`106`	`}`
`109`		`- return Task.FromResult<AuthenticationScheme>(null);`
	`107`	`+ return GetDefaultAuthenticateSchemeAsync();`
`110`	`108`	`}`
`111`	`109`
`112`	`110`	`/// <summary>`
`113`	`111`	`/// Returns the scheme that will be used by default for <see cref="IAuthenticationService.SignOutAsync(HttpContext, string, AuthenticationProperties)"/>.`
`114`	`112`	`/// This is typically specified via <see cref="AuthenticationOptions.DefaultSignOutScheme"/>.`
`115`		`- /// Otherwise, this will fallback to <see cref="GetDefaultSignInSchemeAsync"/> .`
	`113`	`+ /// If only a single sign out handler scheme exists, that will be used, if more than one exists,`
	`114`	`+ /// this will fallback to <see cref="GetDefaultSignInSchemeAsync"/> if that supoorts sign out.`
`116`	`115`	`/// </summary>`
`117`	`116`	`/// <returns>The scheme that will be used by default for <see cref="IAuthenticationService.SignOutAsync(HttpContext, string, AuthenticationProperties)"/>.</returns>`
`118`		`- public Task<AuthenticationScheme> GetDefaultSignOutSchemeAsync()`
	`117`	`+ public virtual Task<AuthenticationScheme> GetDefaultSignOutSchemeAsync()`
`119`	`118`	`{`
`120`	`119`	`if (_options.DefaultSignOutScheme != null)`
`121`	`120`	`{`
`122`	`121`	`return GetSchemeAsync(_options.DefaultSignOutScheme);`
`123`	`122`	`}`
	`123`	`+ if (_signOutHandlers.Count == 1)`
	`124`	`+ {`
	`125`	`+ return Task.FromResult(_signOutHandlers[0]);`
	`126`	`+ }`
`124`	`127`	`return GetDefaultSignInSchemeAsync();`
`125`	`128`	`}`
`126`	`129`
`@@ -129,7 +132,7 @@ public Task<AuthenticationScheme> GetDefaultSignOutSchemeAsync()`
`129`	`132`	`/// </summary>`
`130`	`133`	`/// <param name="name">The name of the authenticationScheme.</param>`
`131`	`134`	`/// <returns>The scheme or null if not found.</returns>`
`132`		`- public Task<AuthenticationScheme> GetSchemeAsync(string name)`
	`135`	`+ public virtual Task<AuthenticationScheme> GetSchemeAsync(string name)`
`133`	`136`	`{`
`134`	`137`	`if (_map.ContainsKey(name))`
`135`	`138`	`{`
`@@ -142,7 +145,7 @@ public Task<AuthenticationScheme> GetSchemeAsync(string name)`
`142`	`145`	`/// Returns the schemes in priority order for request handling.`
`143`	`146`	`/// </summary>`
`144`	`147`	`/// <returns>The schemes in priority order for request handling</returns>`
`145`		`- public Task<IEnumerable<AuthenticationScheme>> GetRequestHandlerSchemesAsync()`
	`148`	`+ public virtual Task<IEnumerable<AuthenticationScheme>> GetRequestHandlerSchemesAsync()`
`146`	`149`	`{`
`147`	`150`	`return Task.FromResult<IEnumerable<AuthenticationScheme>>(_requestHandlers);`
`148`	`151`	`}`
`@@ -151,7 +154,7 @@ public Task<IEnumerable<AuthenticationScheme>> GetRequestHandlerSchemesAsync()`
`151`	`154`	`/// Registers a scheme for use by <see cref="IAuthenticationService"/>.`
`152`	`155`	`/// </summary>`
`153`	`156`	`/// <param name="scheme">The scheme.</param>`
`154`		`- public void AddScheme(AuthenticationScheme scheme)`
	`157`	`+ public virtual void AddScheme(AuthenticationScheme scheme)`
`155`	`158`	`{`
`156`	`159`	`if (_map.ContainsKey(scheme.Name))`
`157`	`160`	`{`
`@@ -167,6 +170,14 @@ public void AddScheme(AuthenticationScheme scheme)`
`167`	`170`	`{`
`168`	`171`	`_requestHandlers.Add(scheme);`
`169`	`172`	`}`
	`173`	`+ if (typeof(IAuthenticationSignInHandler).IsAssignableFrom(scheme.HandlerType))`
	`174`	`+ {`
	`175`	`+ _signInHandlers.Add(scheme);`
	`176`	`+ }`
	`177`	`+ if (typeof(IAuthenticationSignOutHandler).IsAssignableFrom(scheme.HandlerType))`
	`178`	`+ {`
	`179`	`+ _signOutHandlers.Add(scheme);`
	`180`	`+ }`
`170`	`181`	`_map[scheme.Name] = scheme;`
`171`	`182`	`}`
`172`	`183`	`}`
`@@ -175,7 +186,7 @@ public void AddScheme(AuthenticationScheme scheme)`
`175`	`186`	`/// Removes a scheme, preventing it from being used by <see cref="IAuthenticationService"/>.`
`176`	`187`	`/// </summary>`
`177`	`188`	`/// <param name="name">The name of the authenticationScheme being removed.</param>`
`178`		`- public void RemoveScheme(string name)`
	`189`	`+ public virtual void RemoveScheme(string name)`
`179`	`190`	`{`
`180`	`191`	`if (!_map.ContainsKey(name))`
`181`	`192`	`{`
`@@ -186,15 +197,15 @@ public void RemoveScheme(string name)`
`186`	`197`	`if (_map.ContainsKey(name))`
`187`	`198`	`{`
`188`	`199`	`var scheme = _map[name];`
`189`		`- _requestHandlers.Remove(_requestHandlers.Where(s => s.Name == name).FirstOrDefault());`
	`200`	`+ _requestHandlers.Remove(scheme);`
	`201`	`+ _signInHandlers.Remove(scheme);`
	`202`	`+ _signOutHandlers.Remove(scheme);`
`190`	`203`	`_map.Remove(name);`
`191`	`204`	`}`
`192`	`205`	`}`
`193`	`206`	`}`
`194`	`207`
`195`		`- public Task<IEnumerable<AuthenticationScheme>> GetAllSchemesAsync()`
`196`		`- {`
`197`		`- return Task.FromResult<IEnumerable<AuthenticationScheme>>(_map.Values);`
`198`		`- }`
	`208`	`+ public virtual Task<IEnumerable<AuthenticationScheme>> GetAllSchemesAsync()`
	`209`	`+ => Task.FromResult<IEnumerable<AuthenticationScheme>>(_map.Values);`
`199`	`210`	`}`
`200`	`211`	`}`