Created DefaultChallengeScheme on CAP.DashboardOptions.cs to specify …

…dashboard auth challenge scheme (#815)
dotnetcore · Apr 6, 2021 · b764930 · b764930
1 parent f0a763e
commit b764930
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/samples/Sample.RabbitMQ.Postgres.DashboardAuth/Startup.cs b/samples/Sample.RabbitMQ.Postgres.DashboardAuth/Startup.cs
@@ -62,6 +62,7 @@ public void ConfigureServices(IServiceCollection services)
                 cap.UseDashboard(d =>
                 {
                     d.UseChallengeOnAuth = true;
+                    d.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
                     d.Authorization = new[] {new HttpContextDashboardFilter()};
                 });
             });

diff --git a/src/DotNetCore.CAP.Dashboard/CAP.DashboardMiddleware.cs b/src/DotNetCore.CAP.Dashboard/CAP.DashboardMiddleware.cs
@@ -136,7 +136,7 @@ public async Task Invoke(HttpContext context)
 
                     if (_options.UseChallengeOnAuth)
                     {
-                        await context.ChallengeAsync();
+                        await context.ChallengeAsync(_options.DefaultChallengeScheme);
                         return;
                     }
 

diff --git a/src/DotNetCore.CAP.Dashboard/CAP.DashboardOptions.cs b/src/DotNetCore.CAP.Dashboard/CAP.DashboardOptions.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using DotNetCore.CAP.Dashboard;
+using Microsoft.AspNetCore.Authentication.Cookies;
 
 // ReSharper disable once CheckNamespace
 namespace DotNetCore.CAP
@@ -18,6 +19,11 @@ public DashboardOptions()
             UseChallengeOnAuth = false;
         }
 
+        /// <summary>
+        /// Default ChallengeScheme used for Dashboard authentication. If no scheme is set, the DefaultScheme set up in AddAuthentication will be used.
+        /// </summary>
+        public string DefaultChallengeScheme { get; set; }
+
         /// <summary>
         /// Indicates if executes a Challenge for Auth within ASP.NET middlewares
         /// </summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -136,7 +136,7 @@ public async Task Invoke(HttpContext context) @@
                         if (_options.UseChallengeOnAuth)
                         {
-                            await context.ChallengeAsync();
+                            await context.ChallengeAsync(_options.DefaultChallengeScheme);
                             return;
                         }
@@ Expand Down @@