Merge pull request #233 from ITU-BDSA2024-GROUP10/modify-the-identity-register-page

Modify the identity register page

Author: stoftot

Chirp/src/Chirp.Infrastructure/AuthorRepository.cs

@@ -12,7 +12,7 @@ public class AuthorRepository(ChirpDBContext context) : IAuthorRepository
     public async Task<AuthorDTO?> GetAuthorByName(string name) =>
         await context.Authors
             .Where(a => a.Name == name)
-            .Select(a => new AuthorDTO(a.Name, a.Email))
+            .Select(a => new AuthorDTO(a.Name, a.Email!))
             .FirstOrDefaultAsync();
 
     public async Task<AuthorDTO?> GetAuthorByEmail(string email)
@@ -24,20 +24,14 @@ await context.Authors
 
         var authors = await query.ToListAsync();
 
-        return authors.Select(author => new AuthorDTO(author.Name, author.Email)).FirstOrDefault();
+        return authors.Select(author => new AuthorDTO(author.Name, author.Email ?? string.Empty)).FirstOrDefault();
     }
 
     public async Task<bool> AddAuthor(AuthorDTO author)
     {
-        var newAuthor = new Author
-        {
-            Name = author.Name,
-            Email = author.Email
-        };
-
         try
         {
-            context.Authors.Add(newAuthor);
+            context.Authors.Add(Author.CreateAuthor(author));
             await context.SaveChangesAsync();
             return true;
         }

Chirp/src/Chirp.Infrastructure/ChirpDbContext.cs

@@ -4,7 +4,7 @@
 
 namespace Chirp.Infrastructure;
 
-public class ChirpDBContext(DbContextOptions<ChirpDBContext> options) : IdentityDbContext<ApplicationUser>(options)
+public class ChirpDBContext(DbContextOptions<ChirpDBContext> options) : IdentityDbContext<Author>(options)
 {
     public DbSet<Cheep> Cheeps { get; set; }
     public DbSet<Author> Authors { get; set; }
@@ -38,22 +38,17 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         //define author entity constraints
         modelBuilder.Entity<Author>(entity =>
         {
-            //define auto increment key
-            entity.HasKey(a => a.Id);
-            entity.Property(a => a.Id)
-                .ValueGeneratedOnAdd();
-
             //define required + unique name
             entity.Property(a => a.Name)
                 .IsRequired();
-            entity.HasIndex(a => a.Name)
-                .IsUnique();
-
-            //define required + unique email
             entity.Property(a => a.Email)
                 .IsRequired();
+            entity.HasIndex(a => a.Name)
+                .IsUnique();
             entity.HasIndex(a => a.Email)
                 .IsUnique();
         });
+
+        
     }
 }

Chirp/src/Chirp.Infrastructure/DbInitializer.cs

@@ -1,27 +1,40 @@
+using System.Security.Claims;
 using Chirp.Infrastructure.Model;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Chirp.Infrastructure;
 
 public static class DbInitializer
 {
-    public static void SeedDatabase(ChirpDBContext chirpContext)
+    public static async void SeedDatabase(ChirpDBContext chirpContext, IServiceProvider serviceProvider)
     {
         if (!(chirpContext.Authors.Any() && chirpContext.Cheeps.Any()))
         {
-            var a1 = new Author() { Id = 1, Name = "Roger Histand", Email = "Roger+Histand@hotmail.com", Cheeps = new List<Cheep>() };
-            var a2 = new Author() { Id = 2, Name = "Luanna Muro", Email = "Luanna-Muro@ku.dk", Cheeps = new List<Cheep>() };
-            var a3 = new Author() { Id = 3, Name = "Wendell Ballan", Email = "Wendell-Ballan@gmail.com", Cheeps = new List<Cheep>() };
-            var a4 = new Author() { Id = 4, Name = "Nathan Sirmon", Email = "Nathan+Sirmon@dtu.dk", Cheeps = new List<Cheep>() };
-            var a5 = new Author() { Id = 5, Name = "Quintin Sitts", Email = "Quintin+Sitts@itu.dk", Cheeps = new List<Cheep>() };
-            var a6 = new Author() { Id = 6, Name = "Mellie Yost", Email = "Mellie+Yost@ku.dk", Cheeps = new List<Cheep>() };
-            var a7 = new Author() { Id = 7, Name = "Malcolm Janski", Email = "Malcolm-Janski@gmail.com", Cheeps = new List<Cheep>() };
-            var a8 = new Author() { Id = 8, Name = "Octavio Wagganer", Email = "Octavio.Wagganer@dtu.dk", Cheeps = new List<Cheep>() };
-            var a9 = new Author() { Id = 9, Name = "Johnnie Calixto", Email = "Johnnie+Calixto@itu.dk", Cheeps = new List<Cheep>() };
-            var a10 = new Author() { Id = 10, Name = "Jacqualine Gilcoine", Email = "Jacqualine.Gilcoine@gmail.com", Cheeps = new List<Cheep>() };
-            var a11 = new Author() { Id = 11, Name = "Helge", Email = "ropf@itu.dk", Cheeps = new List<Cheep>() };
-            var a12 = new Author() { Id = 12, Name = "Adrian", Email = "adho@itu.dk", Cheeps = new List<Cheep>() };
+            var a1 = new Author() { Id = "1", Name = "Roger Histand", Email = "Roger+Histand@hotmail.com", Cheeps = new List<Cheep>() };
+            var a2 = new Author() { Id = "2", Name = "Luanna Muro", Email = "Luanna-Muro@ku.dk", Cheeps = new List<Cheep>() };
+            var a3 = new Author() { Id = "3", Name = "Wendell Ballan", Email = "Wendell-Ballan@gmail.com", Cheeps = new List<Cheep>() };
+            var a4 = new Author() { Id = "4", Name = "Nathan Sirmon", Email = "Nathan+Sirmon@dtu.dk", Cheeps = new List<Cheep>() };
+            var a5 = new Author() { Id = "5", Name = "Quintin Sitts", Email = "Quintin+Sitts@itu.dk", Cheeps = new List<Cheep>() };
+            var a6 = new Author() { Id = "6", Name = "Mellie Yost", Email = "Mellie+Yost@ku.dk", Cheeps = new List<Cheep>() };
+            var a7 = new Author() { Id = "7", Name = "Malcolm Janski", Email = "Malcolm-Janski@gmail.com", Cheeps = new List<Cheep>() };
+            var a8 = new Author() { Id = "8", Name = "Octavio Wagganer", Email = "Octavio.Wagganer@dtu.dk", Cheeps = new List<Cheep>() };
+            var a9 = new Author() { Id = "9", Name = "Johnnie Calixto", Email = "Johnnie+Calixto@itu.dk", Cheeps = new List<Cheep>() };
+            var a10 = new Author() { Id = "10", Name = "Jacqualine Gilcoine", Email = "Jacqualine.Gilcoine@gmail.com", Cheeps = new List<Cheep>() };
 
-            var authors = new List<Author>() { a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12 };
+            var userManager = serviceProvider.GetRequiredService<UserManager<Author>>();
+            var a11 = new Author {UserName = "ropf@itu.dk", Email = "ropf@itu.dk", Cheeps = new List<Cheep>(), Name = "Helge"};
+            var a12 = new Author {UserName = "adho@itu.dk", Email = "adho@itu.dk", Cheeps = new List<Cheep>(), Name = "Adrian"};
+            a11.EmailConfirmed = true;
+            a12.EmailConfirmed = true;
+            await userManager.CreateAsync(a11, "LetM31n!");
+            await userManager.CreateAsync(a12, "M32Want_Access");
+            
+            var claim11 = new Claim("UserName", a11.Name);
+            var claim12 = new Claim("UserName", a12.Name);
+            await userManager.AddClaimAsync(a11, claim11);
+            await userManager.AddClaimAsync(a12, claim12);
+            var authors = new List<Author>() { a1, a2, a3, a4, a5, a6, a7, a8, a9, a10};
 
             var c1 = new Cheep() { Id = 1, Author = a10, Message = "They were married in Chicago, with old Smith, and was expected aboard every day; meantime, the two went past me.", TimeStamp = DateTime.Parse("2023-08-01 13:14:37") };
             var c2 = new Cheep() { Id = 2, Author = a10, Message = "And then, as he listened to all that''s left o'' twenty-one people.", TimeStamp = DateTime.Parse("2023-08-01 13:15:21") };