Upate Scaffold Identity to .NET 6 /3 (dotnet#23968)

* Upate Scaffold Identity to .NET 6 /3 * work * work * work * work * work * work * work * work * work * work
v-savila · github-actions · Nov 16, 2021 · Nov 16, 2021 · Nov 16, 2021 · Nov 17, 2021
commit 9fc1d712e4b90c3d2e134e3443a49328647d4741
diff --git a/aspnetcore/includes/scaffold-identity/install-pkg.md b/aspnetcore/includes/scaffold-identity/install-pkg.md
@@ -0,0 +1,20 @@
+---
+no-loc: [Home, Privacy, Kestrel, appsettings.json, "ASP.NET Core Identity", cookie, Cookie, Blazor, "Blazor Server", "Blazor WebAssembly", "Identity", "Let's Encrypt", Razor, SignalR]
+---
+Install the [Microsoft.VisualStudio.Web.CodeGeneration.Design](https://www.nuget.org/packages/Microsoft.VisualStudio.Web.CodeGeneration.Design/) NuGet package:
+
+# [Visual Studio](#tab/visual-studio)
+
+In the Visual Studio **Package Manager Console**:
+
+```powershell
+Install-Package Microsoft.VisualStudio.Web.CodeGeneration.Design
+```
+
+# [.NET Core CLI](#tab/netcore-cli)
+
+```dotnetcli
+dotnet add package Microsoft.VisualStudio.Web.CodeGeneration.Design
+```
+
+---
diff --git a/aspnetcore/security/authentication/scaffold-identity.md b/aspnetcore/security/authentication/scaffold-identity.md
@@ -27,31 +27,9 @@ We recommend using a source control system that shows file differences and allow
 
 Services are required when using [Two Factor Authentication](xref:security/authentication/identity-enable-qrcodes), [Account confirmation and password recovery](xref:security/authentication/accconfirm), and other security features with Identity. Services or service stubs aren't generated when scaffolding Identity. Services to enable these features must be added manually. For example, see [Require Email Confirmation](xref:security/authentication/accconfirm#require-email-confirmation).
 
-When scaffolding Identity with a new data context into a project with existing individual accounts:
-
-* In `Startup.ConfigureServices`, remove the calls to:
-  * `AddDbContext`
-  * `AddDefaultIdentity`
-
-For example, `AddDbContext` and `AddDefaultIdentity` are commented out in the following code:
-
-[!code-csharp[](scaffold-identity/3.1sample/StartupRemove.cs?name=snippet)]
-
-The preceding code comments out the code that is duplicated in *Areas/Identity/IdentityHostingStartup.cs*
-
 Typically, apps that were created with individual accounts should ***not*** create a new data context.
 
-## Scaffold Identity into an empty project
-
-[!INCLUDE[](~/includes/scaffold-identity/id-scaffold-dlg.md)]
-
-Update the `Startup` class with code similar to the following:
-
-[!code-csharp[](scaffold-identity/3.1sample/StartupMVC.cs?name=snippet)]
-
-[!INCLUDE[](~/includes/scaffold-identity/hsts.md)]
-
-[!INCLUDE[](~/includes/scaffold-identity/migrations.md)]
+<a name="RPNA"></a>
 
 ## Scaffold Identity into a Razor project without existing authorization
 
@@ -80,9 +58,9 @@ Fixed via dotnet ef database drop
 before dotnet ef database update
 -->
 
-[!INCLUDE[](~/includes/scaffold-identity/id-scaffold-dlg.md)]
+[!INCLUDE[](~/includes/scaffold-identity/install-pkg.md)]
 
-Identity is configured in *Areas/Identity/IdentityHostingStartup.cs*. For more information, see [IHostingStartup](xref:fundamentals/configuration/platform-specific-configuration).
+[!INCLUDE[](~/includes/scaffold-identity/id-scaffold-dlg.md)]
 
 <a name="efm"></a>
 
@@ -92,22 +70,25 @@ Identity is configured in *Areas/Identity/IdentityHostingStartup.cs*. For more i
 
 <a name="useauthentication"></a>
 
+<!--
 ### Enable authentication
 
 Update the `Startup` class with code similar to the following:
 
 [!code-csharp[](scaffold-identity/3.1sample/StartupRP.cs?name=snippet)]
 
-[!INCLUDE[](~/includes/scaffold-identity/hsts.md)]
+[!INCLUDE[](~/includes/scaffold-identity/hsts.md)] -->
 
 ### Layout changes
 
 Optional: Add the login partial (`_LoginPartial`) to the layout file:
 
-[!code-cshtml[](scaffold-identity/3.1sample/_Layout.cshtml?highlight=20)]
+[!code-cshtml[](scaffold-identity/6.0sample/_Layout.cshtml?highlight=29)]
 
 ## Scaffold Identity into a Razor project with authorization
 
+[!INCLUDE[](~/includes/scaffold-identity/install-pkg.md)]
+
 <!--
 Use >=2.1: dotnet new webapp -au Individual -o RPauth
 Use = 2.0: dotnet new razor -au Individual -o RPauth
@@ -121,8 +102,6 @@ dotnet aspnet-codegenerator identity -dc RPauth.Data.ApplicationDbContext --file
 
 [!INCLUDE[](~/includes/scaffold-identity/id-scaffold-dlg-auth.md)]
 
-Some Identity options are configured in *Areas/Identity/IdentityHostingStartup.cs*. For more information, see [IHostingStartup](xref:fundamentals/configuration/platform-specific-configuration).
-
 ## Scaffold Identity into an MVC project without existing authorization
 
 <!--
@@ -139,23 +118,19 @@ dotnet ef migrations add CreateIdentitySchema
 dotnet ef database update
 -->
 
+[!INCLUDE[](~/includes/scaffold-identity/install-pkg.md)]
+
 [!INCLUDE[](~/includes/scaffold-identity/id-scaffold-dlg.md)]
 
 Optional: Add the login partial (`_LoginPartial`) to the *Views/Shared/_Layout.cshtml* file:
 
-[!code-cshtml[](scaffold-identity/3.1sample/_Layout.cshtml?highlight=20)]
-
-* Move the *Pages/Shared/_LoginPartial.cshtml* file to *Views/Shared/_LoginPartial.cshtml*
-
-Identity is configured in *Areas/Identity/IdentityHostingStartup.cs*. For more information, see IHostingStartup.
+[!code-cshtml[](scaffold-identity/6.0sample/_Layout.cshtml?highlight=29)]
 
 [!INCLUDE[](~/includes/scaffold-identity/migrations.md)]
 
-Update the `Startup` class with code similar to the following:
-
-[!code-csharp[](scaffold-identity/3.1sample/StartupMVC.cs?name=snippet)]
+Add `MapRazorPages` to *Program.cs* as shown in the following highlighted code:
 
-[!INCLUDE[](~/includes/scaffold-identity/hsts.md)]
+[!code-cshtml[](scaffold-identity/6.0sample/ProgramMRP.cs?highlight=39)]
 
 ## Scaffold Identity into an MVC project with authorization
 
@@ -167,6 +142,8 @@ dotnet restore
 dotnet aspnet-codegenerator identity -dc MvcAuth.Data.ApplicationDbContext  --files "Account.Login;Account.Register"
 -->
 
+[!INCLUDE[](~/includes/scaffold-identity/install-pkg.md)]
+
 [!INCLUDE[](~/includes/scaffold-identity/id-scaffold-dlg-auth.md)]
 
 ## Scaffold Identity into a Blazor Server project without existing authorization
@@ -354,7 +331,7 @@ In the *Pages/Shared/Layout.cshtml* file, make the following changes:
 ## Scaffold Identity into a Blazor Server project with authorization
 
 [!INCLUDE[](~/includes/scaffold-identity/id-scaffold-dlg-auth.md)]
-
+<!-- Remove this, no longer true -->
 Some Identity options are configured in *Areas/Identity/IdentityHostingStartup.cs*. For more information, see [IHostingStartup](xref:fundamentals/configuration/platform-specific-configuration).
 
 ## Standalone or hosted Blazor WebAssembly apps
@@ -371,24 +348,6 @@ For more information, see the [Blazor Security and Identity articles](xref:blazo
 <!-- remove AllowAreas  #23280 -->
 To maintain full control of the Identity UI, run the Identity scaffolder and select **Override all files**.
 
-The following highlighted code shows the changes to replace the default Identity UI with Identity in an ASP.NET Core 2.1 web app. You might want to do this to have full control of the Identity UI.
-
-[!code-csharp[](scaffold-identity/sample/StartupFull.cs?name=snippet1&highlight=13-14,17-999)]
-
-The default Identity is replaced in the following code:
-
-[!code-csharp[](scaffold-identity/sample/StartupFull.cs?name=snippet2)]
-
-The following code sets the [LoginPath](/dotnet/api/microsoft.aspnetcore.authentication.cookies.cookieauthenticationoptions.loginpath), [LogoutPath](/dotnet/api/microsoft.aspnetcore.authentication.cookies.cookieauthenticationoptions.logoutpath), and [AccessDeniedPath](/dotnet/api/microsoft.aspnetcore.authentication.cookies.cookieauthenticationoptions.accessdeniedpath):
-
-[!code-csharp[](scaffold-identity/sample/StartupFull.cs?name=snippet3)]
-
-Register an `IEmailSender` implementation, for example:
-
-[!code-csharp[](scaffold-identity/sample/StartupFull.cs?name=snippet4)]
-
-[!code-csharp[](scaffold-identity/sample/StartupFull.cs?name=snippet)]
-
 <!--
 uld option: Use Local DB, not SQLite
 

diff --git a/aspnetcore/security/authentication/scaffold-identity/6.0sample/ProgramMRP.cs b/aspnetcore/security/authentication/scaffold-identity/6.0sample/ProgramMRP.cs
@@ -0,0 +1,41 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using WebMVCauth.Data;
+
+var builder = WebApplication.CreateBuilder(args);
+
+var connectionString = builder.Configuration.GetConnectionString("DefaultConnection");
+builder.Services.AddDbContext<ApplicationDbContext>(options =>
+    options.UseSqlServer(connectionString));
+builder.Services.AddDatabaseDeveloperPageExceptionFilter();
+
+builder.Services.AddDefaultIdentity<IdentityUser>(options => options.SignIn.RequireConfirmedAccount = true)
+    .AddEntityFrameworkStores<ApplicationDbContext>();
+builder.Services.AddControllersWithViews();
+
+var app = builder.Build();
+
+if (app.Environment.IsDevelopment())
+{
+    app.UseMigrationsEndPoint();
+}
+else
+{
+    app.UseExceptionHandler("/Home/Error");
+    app.UseHsts();
+}
+
+app.UseHttpsRedirection();
+app.UseStaticFiles();
+
+app.UseRouting();
+
+app.UseAuthentication();
+app.UseAuthorization();
+
+app.MapControllerRoute(
+    name: "default",
+    pattern: "{controller=Home}/{action=Index}/{id?}");
+app.MapRazorPages();
+
+app.Run();
diff --git a/aspnetcore/security/authentication/scaffold-identity/6.0sample/_Layout.cshtml b/aspnetcore/security/authentication/scaffold-identity/6.0sample/_Layout.cshtml
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>@ViewData["Title"] - WebRPnoAuth2Auth</title>
+    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/WebRPnoAuth2Auth.styles.css" asp-append-version="true" />
+</head>
+<body>
+    <header>
+        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
+            <div class="container">
+                <a class="navbar-brand" asp-area="" asp-page="/Index">WebRPnoAuth2Auth</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
+                        aria-expanded="false" aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
+                    <ul class="navbar-nav flex-grow-1">
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
+                        </li>
+                    </ul>
+                    <partial name="_LoginPartial" />
+                </div>
+            </div>
+        </nav>
+    </header>
+    <div class="container">
+        <main role="main" class="pb-3">
+            @RenderBody()
+        </main>
+    </div>
+
+    <footer class="border-top footer text-muted">
+        <div class="container">
+            &copy; 2021 - WebRPnoAuth2Auth - <a asp-area="" asp-page="/Privacy">Privacy</a>
+        </div>
+    </footer>
+
+    <script src="~/lib/jquery/dist/jquery.min.js"></script>
+    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
+    <script src="~/js/site.js" asp-append-version="true"></script>
+
+    @await RenderSectionAsync("Scripts", required: false)
+</body>
+</html>