Update SPA templates

- Use top-level statements - Use minimal hosting APIs - #33947 #33944
dotnet · Jul 7, 2021 · 96803ee · 96803ee
1 parent 324a329
commit 96803ee
Show file tree

Hide file tree

Showing 5 changed files with 172 additions and 260 deletions.
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Program.cs
@@ -1,26 +1,92 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+#if (IndividualLocalAuth)
+using Microsoft.AspNetCore.Authentication;
+#endif
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+#if (IndividualLocalAuth)
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.UI;
+#endif
+#if (IndividualLocalAuth)
+using Microsoft.EntityFrameworkCore;
+#endif
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
+#if (IndividualLocalAuth)
+using Company.WebApplication1.Data;
+using Company.WebApplication1.Models;
+#endif
 
-namespace Company.WebApplication1
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+#if (IndividualLocalAuth)
+var connectionString = Configuration.GetConnectionString("DefaultConnection");
+builder.Services.AddDbContext<ApplicationDbContext>(options =>
+#if (UseLocalDB)
+    options.UseSqlServer(connectionString));
+#else
+    options.UseSqlite(connectionString));
+#endif
+builder.Services.AddDatabaseDeveloperPageExceptionFilter();
+
+builder.Services.AddDefaultIdentity<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = true)
+    .AddEntityFrameworkStores<ApplicationDbContext>();
+
+builder.Services.AddIdentityServer()
+    .AddApiAuthorization<ApplicationUser, ApplicationDbContext>();
+
+builder.Services.AddAuthentication()
+    .AddIdentityServerJwt();
+#endif
+
+builder.Services.AddControllersWithViews();
+#if (IndividualLocalAuth)
+builder.Services.AddRazorPages();
+#endif
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseDeveloperExceptionPage();
+#if (IndividualLocalAuth)
+    app.UseMigrationsEndPoint();
+#endif
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+#if (RequiresHttps)
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
+}
+
+app.UseHttpsRedirection();
+#else
 }
+
+#endif
+app.UseStaticFiles();
+app.UseRouting();
+
+#if (IndividualLocalAuth)
+app.UseAuthentication();
+app.UseIdentityServer();
+#endif
+#if (!NoAuth)
+app.UseAuthorization();
+#endif
+
+app.MapControllerRoute(
+    name: "default",
+    pattern: "{controller}/{action=Index}/{id?}");
+#if (IndividualLocalAuth)
+app.MapRazorPages();
+#endif
+
+app.MapFallbackToFile("index.html");;
+
+app.Run();
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Startup.cs
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Program.cs b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Program.cs
@@ -1,26 +1,92 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+#if (IndividualLocalAuth)
+using Microsoft.AspNetCore.Authentication;
+#endif
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+#if (IndividualLocalAuth)
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.UI;
+#endif
+#if (IndividualLocalAuth)
+using Microsoft.EntityFrameworkCore;
+#endif
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
+#if (IndividualLocalAuth)
+using Company.WebApplication1.Data;
+using Company.WebApplication1.Models;
+#endif
 
-namespace Company.WebApplication1
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+#if (IndividualLocalAuth)
+var connectionString = Configuration.GetConnectionString("DefaultConnection");
+builder.Services.AddDbContext<ApplicationDbContext>(options =>
+#if (UseLocalDB)
+    options.UseSqlServer(connectionString));
+#else
+    options.UseSqlite(connectionString));
+#endif
+builder.Services.AddDatabaseDeveloperPageExceptionFilter();
+
+builder.Services.AddDefaultIdentity<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = true)
+    .AddEntityFrameworkStores<ApplicationDbContext>();
+
+builder.Services.AddIdentityServer()
+    .AddApiAuthorization<ApplicationUser, ApplicationDbContext>();
+
+builder.Services.AddAuthentication()
+    .AddIdentityServerJwt();
+#endif
+
+builder.Services.AddControllersWithViews();
+#if (IndividualLocalAuth)
+builder.Services.AddRazorPages();
+#endif
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseDeveloperExceptionPage();
+#if (IndividualLocalAuth)
+    app.UseMigrationsEndPoint();
+#endif
+}
+else
 {
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder.UseStartup<Startup>();
-                });
-    }
+#if (RequiresHttps)
+    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+    app.UseHsts();
+}
+
+app.UseHttpsRedirection();
+#else
 }
+
+#endif
+app.UseStaticFiles();
+app.UseRouting();
+
+#if (IndividualLocalAuth)
+app.UseAuthentication();
+app.UseIdentityServer();
+#endif
+#if (!NoAuth)
+app.UseAuthorization();
+#endif
+
+app.MapControllerRoute(
+    name: "default",
+    pattern: "{controller}/{action=Index}/{id?}");
+#if (IndividualLocalAuth)
+app.MapRazorPages();
+#endif
+
+app.MapFallbackToFile("index.html");;
+
+app.Run();