paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maps controller routes

Browse Source
This commit is contained in:
Paul Schneider
2024-02-25 18:51:58 +00:00
parent 834866663a
commit bc803b1547
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Yavsc/Controllers/Communicating/BlogspotController.cs
View File

@ -48,7 +48,7 @@ namespace Yavsc.Controllers
return View(); return View();
} }
[Route("/Title/{id?}")] [Route("~/Title/{id?}")]
[AllowAnonymous] [AllowAnonymous]
public IActionResult Title(string id) public IActionResult Title(string id)
{ {
@ -61,7 +61,7 @@ namespace Yavsc.Controllers
).ToList()); ).ToList());
} }
[Route("/Blog/{userName}/{pageLen?}/{pageNum?}")] [Route("~/Blog/{userName}/{pageLen?}/{pageNum?}")]
[AllowAnonymous] [AllowAnonymous]
public async Task<IActionResult> UserPosts(string userName, int pageLen=10, int pageNum=0) public async Task<IActionResult> UserPosts(string userName, int pageLen=10, int pageNum=0)
{ {

37
src/Yavsc/HostingExtensions.cs
View File

@ -149,17 +149,18 @@ internal static class HostingExtensions
Config.GServiceAccount = JsonConvert.DeserializeObject<GoogleServiceAccount>(safile.OpenText().ReadToEnd()); Config.GServiceAccount = JsonConvert.DeserializeObject<GoogleServiceAccount>(safile.OpenText().ReadToEnd());
} }
var services = builder.Services;
builder.Services.AddRazorPages(); services.AddRazorPages();
builder.Services.AddDbContext<ApplicationDbContext>(options => services.AddDbContext<ApplicationDbContext>(options =>
options.UseNpgsql(builder.Configuration.GetConnectionString("Default"))); options.UseNpgsql(builder.Configuration.GetConnectionString("Default")));
builder.Services.AddIdentity<ApplicationUser, IdentityRole>() services.AddIdentity<ApplicationUser, IdentityRole>()
.AddEntityFrameworkStores<ApplicationDbContext>() .AddEntityFrameworkStores<ApplicationDbContext>()
.AddDefaultTokenProviders(); .AddDefaultTokenProviders();
builder.Services services
.AddIdentityServer(options => .AddIdentityServer(options =>
{ {
options.Events.RaiseErrorEvents = true; options.Events.RaiseErrorEvents = true;
@ -175,7 +176,7 @@ internal static class HostingExtensions
.AddInMemoryClients(Config.Clients) .AddInMemoryClients(Config.Clients)
.AddAspNetIdentity<ApplicationUser>().AddServerSideSessions(); .AddAspNetIdentity<ApplicationUser>().AddServerSideSessions();
builder.Services.AddAuthentication() services.AddAuthentication()
.AddGoogle(options => .AddGoogle(options =>
{ {
options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme; options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme;
@ -186,7 +187,7 @@ internal static class HostingExtensions
options.ClientId = "325408689282-6bekh7p3guj4k0f3301a6frf025cnrk1.apps.googleusercontent.com"; options.ClientId = "325408689282-6bekh7p3guj4k0f3301a6frf025cnrk1.apps.googleusercontent.com";
options.ClientSecret = "XV1DLrq8cQE2JI4gZP3h6d8y"; options.ClientSecret = "XV1DLrq8cQE2JI4gZP3h6d8y";
}); });
builder.Services.Configure<RequestLocalizationOptions>(options => services.Configure<RequestLocalizationOptions>(options =>
{ {
CultureInfo[] supportedCultures = new[] CultureInfo[] supportedCultures = new[]
{ {
@ -217,11 +218,11 @@ builder.Services.Configure<RequestLocalizationOptions>(options =>
}; };
}); });
builder.Services.AddSignalR(); services.AddSignalR();
builder.Services.AddOptions(); services.AddOptions();
_ = builder.Services.AddCors(options => _ = services.AddCors(options =>
{ {
options.AddPolicy("CorsPolicy", builder => options.AddPolicy("CorsPolicy", builder =>
{ {
@ -231,13 +232,13 @@ builder.Services.Configure<RequestLocalizationOptions>(options =>
// Add the system clock service // Add the system clock service
_ = builder.Services.AddSingleton<ISystemClock, SystemClock>(); _ = services.AddSingleton<ISystemClock, SystemClock>();
_ = builder.Services.AddSingleton<IConnexionManager, HubConnectionManager>(); _ = services.AddSingleton<IConnexionManager, HubConnectionManager>();
_ = builder.Services.AddSingleton<ILiveProcessor, LiveProcessor>(); _ = services.AddSingleton<ILiveProcessor, LiveProcessor>();
_ = builder.Services.AddTransient<IFileSystemAuthManager, FileSystemAuthManager>(); _ = services.AddTransient<IFileSystemAuthManager, FileSystemAuthManager>();
builder.Services.AddMvc(config => services.AddMvc(config =>
{ {
/* var policy = new AuthorizationPolicyBuilder() /* var policy = new AuthorizationPolicyBuilder()
.RequireAuthenticatedUser() .RequireAuthenticatedUser()
@ -260,9 +261,8 @@ builder.Services.AddMvc(config =>
options.ResourcesPath = "Resources"; options.ResourcesPath = "Resources";
}).AddDataAnnotationsLocalization(); }).AddDataAnnotationsLocalization();
var services = builder.Services;
_ = services.AddTransient<ITrueEmailSender, MailSender>(); _ = services.AddTransient<ITrueEmailSender, MailSender>();
_ = services.AddTransient<Microsoft.AspNetCore.Identity.UI.Services.IEmailSender, MailSender>(); _ = services.AddTransient<Microsoft.AspNetCore.Identity.UI.Services.IEmailSender, MailSender>();
_ = services.AddTransient<IYavscMessageSender, YavscMessageSender>(); _ = services.AddTransient<IYavscMessageSender, YavscMessageSender>();
_ = services.AddTransient<IBillingService, BillingService>(); _ = services.AddTransient<IBillingService, BillingService>();
@ -299,7 +299,6 @@ var services = builder.Services;
_ = services.AddControllersWithViews() _ = services.AddControllersWithViews()
.AddNewtonsoftJson(); .AddNewtonsoftJson();
LoadGoogleConfig(configuration); LoadGoogleConfig(configuration);
return builder.Build(); return builder.Build();
} }
@ -314,6 +313,9 @@ var services = builder.Services;
app.UseRouting(); app.UseRouting();
app.UseIdentityServer(); app.UseIdentityServer();
app.UseAuthorization(); app.UseAuthorization();
app.MapControllerRoute(
name: "default",
pattern: "{controller=Home}/{action=Index}/{id?}");
app.MapRazorPages() app.MapRazorPages()
.RequireAuthorization(); .RequireAuthorization();
ConfigureWorkflow(); ConfigureWorkflow();
@ -329,6 +331,7 @@ var services = builder.Services;
payPalSettings, googleAuthSettings, localization, loggerFactory, payPalSettings, googleAuthSettings, localization, loggerFactory,
app.Environment.EnvironmentName ); app.Environment.EnvironmentName );
app.ConfigureFileServerApp(); app.ConfigureFileServerApp();
return app; return app;
} }