Skip to content

fix #146 #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maikebing merged 1 commit into from
May 8, 2025
Merged

fix #146 #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/SilkierQuartz/Configuration/ApplicationBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ public static IApplicationBuilder UseSilkierQuartz(

app.UseEndpoints(endpoints =>
{
endpoints.MapControllerRoute(nameof(SilkierQuartz), $"{options.VirtualPathRoot}/{{controller=Scheduler}}/{{action=Index}}");
endpoints.MapControllerRoute(nameof(SilkierQuartz), $"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/')?"":"/")}{{controller=Scheduler}}/{{action=Index}}");
endpoints.MapControllerRoute($"{nameof(SilkierQuartz)}Authenticate",
$"{options.VirtualPathRoot}/{{controller=Authenticate}}/{{action=Login}}");
$"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/') ? "" : "/")}{{controller=Authenticate}}/{{action=Login}}");
});

var types = JobsListHelper.GetSilkierQuartzJobs();
Expand Down Expand Up @@ -157,7 +157,7 @@ private static void UseFileServer(this IApplicationBuilder app, SilkierQuartzOpt
fs = new EmbeddedFileProvider(typeof(SilkierQuartzOptions).Assembly, "SilkierQuartz.Content");
var fsOptions = new FileServerOptions()
{
RequestPath = new PathString($"{options.VirtualPathRoot}/Content"),
RequestPath = new PathString($"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/') ? "" : "/")}Content"),
EnableDefaultFiles = false,
EnableDirectoryBrowsing = false,
FileProvider = fs
Expand Down
4 changes: 2 additions & 2 deletions src/SilkierQuartz/Configuration/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public static IServiceCollection AddSilkierQuartz(
.AddCookie(authenticationOptions.AuthScheme, cfg =>
{
cfg.Cookie.Name = $"sq_authenticationOptions.AuthScheme";
cfg.LoginPath = $"{options.VirtualPathRoot}/Authenticate/Login";
cfg.AccessDeniedPath = $"{options.VirtualPathRoot}/Authenticate/Login";
cfg.LoginPath = $"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/') ? "" : "/")}Authenticate/Login";
cfg.AccessDeniedPath = $"{options.VirtualPathRoot}{(options.VirtualPathRoot.EndsWith('/') ? "" : "/")}Authenticate/Login";
cfg.ExpireTimeSpan = TimeSpan.FromDays(7);
cfg.SlidingExpiration = true;
});
Expand Down
Loading