Add "Username" field to user model

SculptTechProject · SculptTechProject · commit ac5fa73d118a · 2025-11-14T23:12:52.000+01:00
- Introduced `UserName` as a required property in the `User` domain model.
- Updated database schema and migrations to include `UserName` column in the `users` table.
- Modified registration and repository interfaces to handle `UserName` along with `Email`.
- Updated API DTOs and service methods to accommodate the new field.
- Enabled CORS for frontend development and improved JWT key handling in development.
diff --git a/Migrations/20251114220854_Username.Designer.cs b/Migrations/20251114220854_Username.Designer.cs
diff --git a/Migrations/20251114220854_Username.cs b/Migrations/20251114220854_Username.cs
@@ -0,0 +1,29 @@
+﻿using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace sparkly_server.Migrations
+{
+    /// <inheritdoc />
+    public partial class Username : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "UserName",
+                table: "users",
+                type: "text",
+                nullable: false,
+                defaultValue: "");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "UserName",
+                table: "users");
+        }
+    }
+}
diff --git a/Migrations/AppDbContextModelSnapshot.cs b/Migrations/AppDbContextModelSnapshot.cs
@@ -44,6 +44,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<string>("UserName")
+                        .IsRequired()
+                        .HasColumnType("text");
+
                     b.HasKey("Id");
 
                     b.HasIndex("Email")
diff --git a/Program.cs b/Program.cs
@@ -19,8 +19,20 @@ public static void Main(string[] args)
      
         
         var jwtKey = builder.Configuration["SPARKLY_JWT_KEY"]
-                     ?? Environment.GetEnvironmentVariable("SPARKLY_JWT_KEY")
-                     ?? throw new Exception("JWT key missing");
+                     ?? Environment.GetEnvironmentVariable("SPARKLY_JWT_KEY");
+
+        if (string.IsNullOrWhiteSpace(jwtKey))
+        {
+            if (builder.Environment.IsDevelopment())
+            {
+                jwtKey = "dev-only-jwt-key-change-me";
+            }
+            else
+            {
+                throw new Exception("JWT key missing");
+            }
+        }
+
 
         var jwtIssuer   = builder.Configuration["SPARKLY_JWT_ISSUER"]
                           ?? Environment.GetEnvironmentVariable("SPARKLY_JWT_ISSUER")
@@ -57,6 +69,18 @@ public static void Main(string[] args)
         // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi
         builder.Services.AddOpenApi();
         
+        builder.Services.AddCors(options =>
+        {
+            options.AddPolicy("FrontendDev", policy =>
+            {
+                policy
+                    .WithOrigins("http://localhost:4200") 
+                    .AllowAnyHeader()
+                    .AllowAnyMethod()
+                    .AllowCredentials();
+            });
+        });
+        
         builder.Services
             .AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             .AddJwtBearer(options =>
@@ -86,6 +110,8 @@ public static void Main(string[] args)
 
         app.UseAuthentication();
         app.UseAuthorization();
+        
+        app.UseCors("FrontendDev");
 
         app.MapControllers();
 
diff --git a/src/Controllers/AuthController.cs b/src/Controllers/AuthController.cs
@@ -24,7 +24,7 @@ public AuthController(IUserService userService, IAuthService authService)
         public async Task<IActionResult> Register([FromBody] RegisterRequest request, CancellationToken ct)
         {
             // Add validation email and password??
-            await _userService.RegisterAsync(request.Email, request.Password, ct);
+            await _userService.RegisterAsync(userName: request.Username, email: request.Email, password: request.Password, ct: ct);
             return NoContent();
         }
 
diff --git a/src/Controllers/ProfileController.cs b/src/Controllers/ProfileController.cs
@@ -29,7 +29,7 @@ public IActionResult Me()
             if (!_currentUser.IsAuthenticated)
                 return Unauthorized();
 
-            return Ok(new { _currentUser.UserId, _currentUser.Email, _currentUser.Role });
+            return Ok(new { _currentUser.UserId, _currentUser.Email, _currentUser.UserName, _currentUser.Role });
         }
     }
 }
diff --git a/src/DTO/Auth.cs b/src/DTO/Auth.cs
@@ -1,6 +1,6 @@
 namespace sparkly_server.DTO
 {
-    public record RegisterRequest(string Email, string Password);
+    public record RegisterRequest(string Username, string Email, string Password);
     public record LoginRequest(string Email, string Password);
     public record AuthResponse(string AccessToken, string RefreshToken);
 }
diff --git a/src/Domain/Users/User.cs b/src/Domain/Users/User.cs
@@ -6,16 +6,18 @@ public class User
     {
         public Guid Id { get; private set; }
         public string Email { get; private set; } = default!;
+        public string UserName { get; set; } = default!;
         public string PasswordHash { get; private set; } = default!;
         public string Role { get; private set; } = "User";
         public DateTime CreatedAt { get; private set; } = DateTime.UtcNow;
 
         private User() { }
 
-        public User(string email, string role = "User")
+        public User(string userName, string email, string role = "User")
         {
             Id = Guid.NewGuid();
             Email = email;
+            UserName = userName;
             Role = role;
         }
 
diff --git a/src/Infrastructure/AppDbContext.cs b/src/Infrastructure/AppDbContext.cs
@@ -21,11 +21,14 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 cfg.ToTable("users");
 
                 cfg.HasKey(u => u.Id);
-
+                
                 cfg.Property(u => u.Email)
                     .IsRequired()
                     .HasMaxLength(256);
 
+                cfg.Property(u => u.UserName)
+                    .IsRequired();
+                
                 cfg.HasIndex(u => u.Email)
                     .IsUnique();
 
diff --git a/src/Services/Auth/AuthService.cs b/src/Services/Auth/AuthService.cs
@@ -24,7 +24,7 @@ public AuthService(IUserService userService, IJwtProvider jwtProvider)
             var accessToken  = _jwtProvider.GenerateAccessToken(user);
             var refreshToken = _jwtProvider.GenerateRefreshToken();
 
-            // TODO: save refresh token to db
+            // TODO: save refresh token to db (!BLOCKER!)
 
             var now = DateTime.UtcNow;
 
diff --git a/src/Services/Users/CurrentUser.cs b/src/Services/Users/CurrentUser.cs
@@ -17,6 +17,7 @@ public CurrentUser(IHttpContextAccessor httpContextAccessor)
             Guid.TryParse(Principal?.FindFirstValue(ClaimTypes.NameIdentifier), out var id) ? id : null;
 
         public string? Email => Principal?.FindFirstValue(ClaimTypes.Email);
+        public string? UserName => Principal?.FindFirstValue(ClaimTypes.Name);
         public string? Role => Principal?.FindFirstValue(ClaimTypes.Role);
         public bool IsAuthenticated => Principal?.Identity?.IsAuthenticated == true;
 
diff --git a/src/Services/Users/ICurrentUser.cs b/src/Services/Users/ICurrentUser.cs
@@ -4,6 +4,7 @@ public interface ICurrentUser
     {
         Guid? UserId { get; }
         string? Email { get; }
+        string? UserName { get; }
         string? Role { get; }
         bool IsAuthenticated { get; }
         bool IsInRole(string role);
diff --git a/src/Services/Users/IUserRepository.cs b/src/Services/Users/IUserRepository.cs
@@ -5,6 +5,7 @@ namespace sparkly_server.Services.Users
     public interface IUserRepository
     {
         Task<User?> GetByEmailAsync(string email, CancellationToken ct = default);
+        Task<User?> GetByUserNameAsync(string userName, CancellationToken ct = default);
         Task<User?> GetByIdAsync(Guid id, CancellationToken ct = default);
         Task AddAsync(User user, CancellationToken ct = default);
         Task SaveChangesAsync(CancellationToken ct = default);
diff --git a/src/Services/Users/IUserService.cs b/src/Services/Users/IUserService.cs
@@ -4,7 +4,7 @@ namespace sparkly_server.Services.Users
 {
     public interface IUserService
     {
-        Task<User> RegisterAsync(string email, string password, CancellationToken ct = default);
+        Task<User> RegisterAsync(string userName, string email, string password, CancellationToken ct = default);
         Task<User?> ValidateUserAsync(string email, string password, CancellationToken ct = default);
     }
 }
diff --git a/src/Services/Users/UserRepository.cs b/src/Services/Users/UserRepository.cs
@@ -15,7 +15,8 @@ public UserRepository(AppDbContext db)
 
         public Task<User?> GetByIdAsync(Guid id, CancellationToken ct = default)
             => _db.Users.FirstOrDefaultAsync(u => u.Id == id, ct);
-
+        public Task<User?> GetByUserNameAsync(string userName, CancellationToken ct = default)
+            => _db.Users.FirstOrDefaultAsync(u => u.UserName == userName, ct);
         public Task<User?> GetByEmailAsync(string email, CancellationToken ct = default)
             => _db.Users.FirstOrDefaultAsync(u => u.Email == email, ct);
 
diff --git a/src/Services/Users/UserService.cs b/src/Services/Users/UserService.cs
@@ -14,20 +14,27 @@ public UserService(IUserRepository users)
             _users = users;
         }
 
-        public async Task<User> RegisterAsync(string email, string password, CancellationToken ct = default)
+        public async Task<User> RegisterAsync(string userName, string email, string password, CancellationToken ct = default)
         {
-            var existing = await _users.GetByEmailAsync(email, ct);
-            if (existing is not null)
+            var userByEmail = await _users.GetByEmailAsync(email, ct);
+            var userByName = await _users.GetByEmailAsync(userName, ct);
+            
+            if (userByEmail is not null || userByName is not null)
             {
                 throw new InvalidOperationException("User with this email already exists.");
             }
 
+            if (string.IsNullOrWhiteSpace(userName) || string.IsNullOrWhiteSpace(email))
+            {
+                throw new InvalidOperationException("Please provide valid name and email.");
+            }
+            
             if (string.IsNullOrWhiteSpace(password) || password.Length < 6)
             {
                 throw new InvalidOperationException("Password too weak.");
             }
             
-            var user = new User(email);
+            var user = new User(userName:userName, email:email, role:"user");
             
             var hash = _passwordHasher.HashPassword(user, password);
             user.SetPasswordHash(hash);

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public AuthController(IUserService userService, IAuthService authService)`
`24`	`24`	`public async Task<IActionResult> Register([FromBody] RegisterRequest request, CancellationToken ct)`
`25`	`25`	`{`
`26`	`26`	`// Add validation email and password??`
`27`		`- await _userService.RegisterAsync(request.Email, request.Password, ct);`
	`27`	`+ await _userService.RegisterAsync(userName: request.Username, email: request.Email, password: request.Password, ct: ct);`
`28`	`28`	`return NoContent();`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public IActionResult Me()`
`29`	`29`	`if (!_currentUser.IsAuthenticated)`
`30`	`30`	`return Unauthorized();`
`31`	`31`
`32`		`- return Ok(new { _currentUser.UserId, _currentUser.Email, _currentUser.Role });`
	`32`	`+ return Ok(new { _currentUser.UserId, _currentUser.Email, _currentUser.UserName, _currentUser.Role });`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace sparkly_server.DTO`
`2`	`2`	`{`
`3`		`- public record RegisterRequest(string Email, string Password);`
	`3`	`+ public record RegisterRequest(string Username, string Email, string Password);`
`4`	`4`	`public record LoginRequest(string Email, string Password);`
`5`	`5`	`public record AuthResponse(string AccessToken, string RefreshToken);`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,18 @@ public class User`
`6`	`6`	`{`
`7`	`7`	`public Guid Id { get; private set; }`
`8`	`8`	`public string Email { get; private set; } = default!;`
	`9`	`+ public string UserName { get; set; } = default!;`
`9`	`10`	`public string PasswordHash { get; private set; } = default!;`
`10`	`11`	`public string Role { get; private set; } = "User";`
`11`	`12`	`public DateTime CreatedAt { get; private set; } = DateTime.UtcNow;`
`12`	`13`
`13`	`14`	`private User() { }`
`14`	`15`
`15`		`- public User(string email, string role = "User")`
	`16`	`+ public User(string userName, string email, string role = "User")`
`16`	`17`	`{`
`17`	`18`	`Id = Guid.NewGuid();`
`18`	`19`	`Email = email;`
	`20`	`+ UserName = userName;`
`19`	`21`	`Role = role;`
`20`	`22`	`}`
`21`	`23`