From f0991b4e6daaf3acd0403b303b9b5142521a1572 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 30 Oct 2017 15:49:46 -0700 Subject: [PATCH] Revert changes to the 2.0 templates that were unintentionally copied from dotnet/templating (#135) --- .../Manage/TwoFactorAuthentication.cshtml.cs | 4 +- ...000000000_CreateIdentitySchema.Designer.cs | 161 ++++++++---------- .../00000000000000_CreateIdentitySchema.cs | 14 +- 3 files changed, 84 insertions(+), 95 deletions(-) diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs index e91c080e1c..bff77be20e 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/RazorPagesWeb-CSharp/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs @@ -12,6 +12,8 @@ namespace Company.WebApplication1.Pages.Account.Manage { public class TwoFactorAuthenticationModel : PageModel { + private const string AuthenicatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}"; + private readonly UserManager _userManager; private readonly SignInManager _signInManager; private readonly ILogger _logger; @@ -48,4 +50,4 @@ namespace Company.WebApplication1.Pages.Account.Manage return Page(); } } -} +} \ No newline at end of file diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs index 4ef62fc3d5..483520ed85 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs @@ -17,85 +17,17 @@ namespace Company.WebApplication1.Data.Migrations { protected override void BuildTargetModel(ModelBuilder modelBuilder) { -#pragma warning disable 612, 618 modelBuilder #if (UseLocalDB) - .HasAnnotation("ProductVersion", "2.0.0-rtm-26452") + .HasAnnotation("ProductVersion", "1.0.0-rc3") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); #else - .HasAnnotation("ProductVersion", "2.0.0-rtm-26452"); + .HasAnnotation("ProductVersion", "1.0.2"); #endif - modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b => - { - b.Property("Id") - .ValueGeneratedOnAdd(); - - b.Property("AccessFailedCount"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken(); - - b.Property("Email") -#if (UseLocalDB) - .HasAnnotation("MaxLength", 256); -#else - .HasMaxLength(256); -#endif - - b.Property("EmailConfirmed"); - - b.Property("LockoutEnabled"); - - b.Property("LockoutEnd"); - - b.Property("NormalizedEmail") -#if (UseLocalDB) - .HasAnnotation("MaxLength", 256); -#else - .HasMaxLength(256); -#endif - - b.Property("NormalizedUserName") -#if (UseLocalDB) - .HasAnnotation("MaxLength", 256); -#else - .HasMaxLength(256); -#endif - - b.Property("PasswordHash"); - - b.Property("PhoneNumber"); - - b.Property("PhoneNumberConfirmed"); - - b.Property("SecurityStamp"); - - b.Property("TwoFactorEnabled"); - - b.Property("UserName") -#if (UseLocalDB) - .HasAnnotation("MaxLength", 256); -#else - .HasMaxLength(256); -#endif - - b.HasKey("Id"); - - b.HasIndex("NormalizedEmail") - .HasName("EmailIndex"); - - b.HasIndex("NormalizedUserName") - .IsUnique() - .HasName("UserNameIndex"); - - b.ToTable("AspNetUsers"); - }); - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b => { - b.Property("Id") - .ValueGeneratedOnAdd(); + b.Property("Id"); b.Property("ConcurrencyStamp") .IsConcurrencyToken(); @@ -117,7 +49,6 @@ namespace Company.WebApplication1.Data.Migrations b.HasKey("Id"); b.HasIndex("NormalizedName") - .IsUnique() .HasName("RoleNameIndex"); b.ToTable("AspNetRoles"); @@ -189,6 +120,8 @@ namespace Company.WebApplication1.Data.Migrations b.HasIndex("RoleId"); + b.HasIndex("UserId"); + b.ToTable("AspNetUserRoles"); }); @@ -207,10 +140,75 @@ namespace Company.WebApplication1.Data.Migrations b.ToTable("AspNetUserTokens"); }); + modelBuilder.Entity("Company.WebApplication1.Models.ApplicationUser", b => + { + b.Property("Id"); + + b.Property("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken(); + + b.Property("Email") +#if (UseLocalDB) + .HasAnnotation("MaxLength", 256); +#else + .HasMaxLength(256); +#endif + + b.Property("EmailConfirmed"); + + b.Property("LockoutEnabled"); + + b.Property("LockoutEnd"); + + b.Property("NormalizedEmail") +#if (UseLocalDB) + .HasAnnotation("MaxLength", 256); +#else + .HasMaxLength(256); +#endif + + b.Property("NormalizedUserName") +#if (UseLocalDB) + .HasAnnotation("MaxLength", 256); +#else + .HasMaxLength(256); +#endif + + b.Property("PasswordHash"); + + b.Property("PhoneNumber"); + + b.Property("PhoneNumberConfirmed"); + + b.Property("SecurityStamp"); + + b.Property("TwoFactorEnabled"); + + b.Property("UserName") +#if (UseLocalDB) + .HasAnnotation("MaxLength", 256); +#else + .HasMaxLength(256); +#endif + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasName("UserNameIndex"); + + b.ToTable("AspNetUsers"); + }); + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => { b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") - .WithMany() + .WithMany("Claims") .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade); }); @@ -218,7 +216,7 @@ namespace Company.WebApplication1.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => { b.HasOne("Company.WebApplication1.Models.ApplicationUser") - .WithMany() + .WithMany("Claims") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); }); @@ -226,7 +224,7 @@ namespace Company.WebApplication1.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => { b.HasOne("Company.WebApplication1.Models.ApplicationUser") - .WithMany() + .WithMany("Logins") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); }); @@ -234,24 +232,15 @@ namespace Company.WebApplication1.Data.Migrations modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b => { b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole") - .WithMany() + .WithMany("Users") .HasForeignKey("RoleId") .OnDelete(DeleteBehavior.Cascade); b.HasOne("Company.WebApplication1.Models.ApplicationUser") - .WithMany() + .WithMany("Roles") .HasForeignKey("UserId") .OnDelete(DeleteBehavior.Cascade); }); - - modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => - { - b.HasOne("Company.WebApplication1.Models.ApplicationUser") - .WithMany() - .HasForeignKey("UserId") - .OnDelete(DeleteBehavior.Cascade); - }); -#pragma warning restore 612, 618 } } } diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.cs b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.cs index 4c606d8ff4..93771c4379 100644 --- a/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.cs +++ b/src/Microsoft.DotNet.Web.ProjectTemplates.2.0/content/StarterWeb-CSharp/Data/Migrations/00000000000000_CreateIdentitySchema.cs @@ -39,12 +39,6 @@ namespace Company.WebApplication1.Data.Migrations constraints: table => { table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name }); - table.ForeignKey( - name: "FK_AspNetUserTokens_AspNetUsers_UserId", - column: x => x.UserId, - principalTable: "AspNetUsers", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); }); migrationBuilder.CreateTable( @@ -169,8 +163,7 @@ namespace Company.WebApplication1.Data.Migrations migrationBuilder.CreateIndex( name: "RoleNameIndex", table: "AspNetRoles", - column: "NormalizedName", - unique: true); + column: "NormalizedName"); migrationBuilder.CreateIndex( name: "IX_AspNetRoleClaims_RoleId", @@ -192,6 +185,11 @@ namespace Company.WebApplication1.Data.Migrations table: "AspNetUserRoles", column: "RoleId"); + migrationBuilder.CreateIndex( + name: "IX_AspNetUserRoles_UserId", + table: "AspNetUserRoles", + column: "UserId"); + migrationBuilder.CreateIndex( name: "EmailIndex", table: "AspNetUsers",