cleanup up cookie handler detection and error messages

IdentityServer · Nov 16, 2018 · 7a83707 · 7a83707
1 parent 1a20cc2
commit 7a83707
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Configuration/IdentityServerApplicationBuilderExtensions.cs b/src/Configuration/IdentityServerApplicationBuilderExtensions.cs
@@ -92,17 +92,17 @@ private static async Task ValidateAsync(IServiceProvider services, ILogger logge
                 if (options.Authentication.CookieAuthenticationScheme != null)
                 {
                     authenticationScheme = await schemes.GetSchemeAsync(options.Authentication.CookieAuthenticationScheme);
-                    logger.LogInformation("Using explicitly configured scheme {scheme} for IdentityServer", options.Authentication.CookieAuthenticationScheme);
+                    logger.LogInformation("Using explicitly configured authentication scheme {scheme} for IdentityServer", options.Authentication.CookieAuthenticationScheme);
                 }
                 else
                 {
                     authenticationScheme = await schemes.GetDefaultAuthenticateSchemeAsync();
                     logger.LogInformation("Using the default authentication scheme {scheme} for IdentityServer", authenticationScheme.Name);
                 }
 
-                if (!typeof(CookieAuthenticationHandler).IsAssignableFrom(authenticationScheme.HandlerType))
+                if (!typeof(IAuthenticationSignInHandler).IsAssignableFrom(authenticationScheme.HandlerType))
                 {
-                    logger.LogError("Authentication scheme {scheme} is configured for IdentityServer, but it is not a cookie authentication scheme. Using a cookie scheme is required and must be configured as either the default authentication scheme or set the CookieAuthenticationScheme on the IdentityServerOptions.", authenticationScheme.Name);
+                    logger.LogError("Authentication scheme {scheme} is configured for IdentityServer, but it is not a scheme that supports signin (like cookies). Either configure the default authentication scheme with cookies or set the CookieAuthenticationScheme on the IdentityServerOptions.", authenticationScheme.Name);
                 }
 
                 logger.LogDebug("Using {scheme} as default ASP.NET Core scheme for authentication", (await schemes.GetDefaultAuthenticateSchemeAsync())?.Name);