diff --git a/Lieb/Data/DbInitializer.cs b/Lieb/Data/DbInitializer.cs index 02a19ac..b3d68ca 100644 --- a/Lieb/Data/DbInitializer.cs +++ b/Lieb/Data/DbInitializer.cs @@ -12,11 +12,11 @@ namespace Lieb.Data return; // DB has been seeded } - var users = new User[] + var users = new LiebUser[] { - new User{DiscordUserId=0, Name="Sarah",Birthday=DateTime.Parse("1992-01-15")}, - new User{DiscordUserId=0, Name="Lisa",Birthday=DateTime.Parse("1991-02-15")}, - new User{DiscordUserId=0, Name="Simon",Birthday=DateTime.Parse("2019-09-01")} + new LiebUser{DiscordUserId=0, Name="Sarah",Birthday=DateTime.Parse("1992-01-15")}, + new LiebUser{DiscordUserId=0, Name="Lisa",Birthday=DateTime.Parse("1991-02-15")}, + new LiebUser{DiscordUserId=0, Name="Simon",Birthday=DateTime.Parse("2019-09-01")} }; context.Users.AddRange(users); diff --git a/Lieb/Data/LiebContext.cs b/Lieb/Data/LiebContext.cs index 629a211..772d33f 100644 --- a/Lieb/Data/LiebContext.cs +++ b/Lieb/Data/LiebContext.cs @@ -6,17 +6,18 @@ using System.Threading.Tasks; using Microsoft.EntityFrameworkCore; using Lieb.Models; using Lieb.Models.Raid; +using Microsoft.AspNetCore.Identity.EntityFrameworkCore; namespace Lieb.Data { - public class LiebContext : DbContext - { - public LiebContext (DbContextOptions options) + public class LiebContext : IdentityDbContext +{ + public LiebContext (DbContextOptions options) : base(options) { } - public DbSet Users { get; set; } + public DbSet Users { get; set; } public DbSet GuildWars2Account { get; set; } public DbSet Equipped { get; set; } public DbSet RaidRoles { get; set; } @@ -31,7 +32,8 @@ namespace Lieb.Data protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity().ToTable("User"); + base.OnModelCreating(modelBuilder); + modelBuilder.Entity().ToTable("User"); modelBuilder.Entity().ToTable("GuildWars2Account"); modelBuilder.Entity().ToTable("Equipped"); modelBuilder.Entity().ToTable("RaidRole"); diff --git a/Lieb/Lieb.csproj b/Lieb/Lieb.csproj index 5cfee68..6934c1a 100644 --- a/Lieb/Lieb.csproj +++ b/Lieb/Lieb.csproj @@ -12,6 +12,8 @@ + + all diff --git a/Lieb/Models/User.cs b/Lieb/Models/LiebUser.cs similarity index 69% rename from Lieb/Models/User.cs rename to Lieb/Models/LiebUser.cs index 3ba9080..0b7017e 100644 --- a/Lieb/Models/User.cs +++ b/Lieb/Models/LiebUser.cs @@ -1,8 +1,10 @@ -namespace Lieb.Models +using Microsoft.AspNetCore.Identity; + +namespace Lieb.Models { - public class User + public class LiebUser : IdentityUser { - public int UserId { get; set; } + public int LiebUserId { get; set; } public ulong DiscordUserId { get; set; } public string Name { get; set; } = string.Empty; public string Pronouns { get; set; } = string.Empty; diff --git a/Lieb/Models/Raid/RaidSignUp.cs b/Lieb/Models/Raid/RaidSignUp.cs index b7fcab8..c862a3c 100644 --- a/Lieb/Models/Raid/RaidSignUp.cs +++ b/Lieb/Models/Raid/RaidSignUp.cs @@ -21,7 +21,7 @@ public SignUpType SignUpType { get; set; } public Raid Raid { get; set; } - public User User { get; set; } = new User(); + public LiebUser User { get; set; } = new LiebUser(); public GuildWars2Account GuildWars2Account { get; set; } = new GuildWars2Account(); public PlannedRaidRole PlannedRaidRole { get; set; } = new PlannedRaidRole(); } diff --git a/Lieb/Models/Raid/RandomRaid.cs b/Lieb/Models/Raid/RandomRaid.cs index c9add95..9339fe2 100644 --- a/Lieb/Models/Raid/RandomRaid.cs +++ b/Lieb/Models/Raid/RandomRaid.cs @@ -6,7 +6,7 @@ public short Quickness { get; set; } public short Alacrity { get; set; } public short Heal { get; set; } - public User Tank { get; set; } = new User(); + public LiebUser Tank { get; set; } = new LiebUser(); public bool RandomClass { get; set; } public bool RandomEliteSpecialization { get; set; } diff --git a/Lieb/Pages/Users/Create.cshtml.cs b/Lieb/Pages/Users/Create.cshtml.cs index 5b93e17..3d749af 100644 --- a/Lieb/Pages/Users/Create.cshtml.cs +++ b/Lieb/Pages/Users/Create.cshtml.cs @@ -26,7 +26,7 @@ namespace Lieb.Pages.Users } [BindProperty] - public User User { get; set; } + public LiebUser User { get; set; } // To protect from overposting attacks, see https://aka.ms/RazorPagesCRUD public async Task OnPostAsync() diff --git a/Lieb/Pages/Users/Delete.cshtml.cs b/Lieb/Pages/Users/Delete.cshtml.cs index 3d2389b..52b314c 100644 --- a/Lieb/Pages/Users/Delete.cshtml.cs +++ b/Lieb/Pages/Users/Delete.cshtml.cs @@ -21,7 +21,7 @@ namespace Lieb.Pages.Users } [BindProperty] - public User User { get; set; } + public LiebUser User { get; set; } public async Task OnGetAsync(int? id) { diff --git a/Lieb/Pages/Users/Details.cshtml.cs b/Lieb/Pages/Users/Details.cshtml.cs index 865bae2..16ada8b 100644 --- a/Lieb/Pages/Users/Details.cshtml.cs +++ b/Lieb/Pages/Users/Details.cshtml.cs @@ -20,7 +20,7 @@ namespace Lieb.Pages.Users _context = context; } - public User User { get; set; } + public LiebUser User { get; set; } public async Task OnGetAsync(int? id) { diff --git a/Lieb/Pages/Users/Edit.cshtml.cs b/Lieb/Pages/Users/Edit.cshtml.cs index 3c5b6bf..90a1ee6 100644 --- a/Lieb/Pages/Users/Edit.cshtml.cs +++ b/Lieb/Pages/Users/Edit.cshtml.cs @@ -22,7 +22,7 @@ namespace Lieb.Pages.Users } [BindProperty] - public User User { get; set; } + public LiebUser User { get; set; } public async Task OnGetAsync(int? id) { diff --git a/Lieb/Pages/Users/Index.cshtml.cs b/Lieb/Pages/Users/Index.cshtml.cs index 5857ba2..046e32a 100644 --- a/Lieb/Pages/Users/Index.cshtml.cs +++ b/Lieb/Pages/Users/Index.cshtml.cs @@ -20,7 +20,7 @@ namespace Lieb.Pages.Users _context = context; } - public IList User { get;set; } + public IList User { get;set; } public async Task OnGetAsync() { diff --git a/Lieb/Program.cs b/Lieb/Program.cs index 9869132..862e3da 100644 --- a/Lieb/Program.cs +++ b/Lieb/Program.cs @@ -1,10 +1,11 @@ -using Discord.OAuth2; +using Discord.OAuth2; using Lieb.Data; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; +using Microsoft.AspNetCore.Identity; var builder = WebApplication.CreateBuilder(args); @@ -13,6 +14,10 @@ builder.Services.AddRazorPages(); builder.Services.AddDbContext(options => options.UseSqlServer(builder.Configuration.GetConnectionString("LiebContext"))); +/* +builder.Services.AddDefaultIdentity(options => options.SignIn.RequireConfirmedAccount = true) + .AddEntityFrameworkStores();builder.Services.AddDbContext(options => + options.UseSqlServer(connectionString));*/ builder.Services.AddDatabaseDeveloperPageExceptionFilter();