Skip to content

Commit 3442993

Browse files
authored
Merge pull request #164 from IoTSharp/#146
fix #146
2 parents 1a571d4 + 974ee1b commit 3442993

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/SilkierQuartz/Configuration/ApplicationBuilderExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ public static IApplicationBuilder UseSilkierQuartz(
8888

8989
app.UseEndpoints(endpoints =>
9090
{
91-
endpoints.MapControllerRoute(nameof(SilkierQuartz), $"{options.VirtualPathRoot}/{{controller=Scheduler}}/{{action=Index}}");
91+
endpoints.MapControllerRoute(nameof(SilkierQuartz), $"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/')?"":"/")}{{controller=Scheduler}}/{{action=Index}}");
9292
endpoints.MapControllerRoute($"{nameof(SilkierQuartz)}Authenticate",
93-
$"{options.VirtualPathRoot}/{{controller=Authenticate}}/{{action=Login}}");
93+
$"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/') ? "" : "/")}{{controller=Authenticate}}/{{action=Login}}");
9494
});
9595

9696
var types = JobsListHelper.GetSilkierQuartzJobs();
@@ -157,7 +157,7 @@ private static void UseFileServer(this IApplicationBuilder app, SilkierQuartzOpt
157157
fs = new EmbeddedFileProvider(typeof(SilkierQuartzOptions).Assembly, "SilkierQuartz.Content");
158158
var fsOptions = new FileServerOptions()
159159
{
160-
RequestPath = new PathString($"{options.VirtualPathRoot}/Content"),
160+
RequestPath = new PathString($"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/') ? "" : "/")}Content"),
161161
EnableDefaultFiles = false,
162162
EnableDirectoryBrowsing = false,
163163
FileProvider = fs

src/SilkierQuartz/Configuration/ServiceCollectionExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public static IServiceCollection AddSilkierQuartz(
4141
.AddCookie(authenticationOptions.AuthScheme, cfg =>
4242
{
4343
cfg.Cookie.Name = $"sq_authenticationOptions.AuthScheme";
44-
cfg.LoginPath = $"{options.VirtualPathRoot}/Authenticate/Login";
45-
cfg.AccessDeniedPath = $"{options.VirtualPathRoot}/Authenticate/Login";
44+
cfg.LoginPath = $"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/') ? "" : "/")}Authenticate/Login";
45+
cfg.AccessDeniedPath = $"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/') ? "" : "/")}Authenticate/Login";
4646
cfg.ExpireTimeSpan = TimeSpan.FromDays(7);
4747
cfg.SlidingExpiration = true;
4848
});

0 commit comments

Comments
 (0)