diff --git a/Controllers/AuthController.cs b/Controllers/AuthController.cs index b4a8008..34ffe6b 100644 --- a/Controllers/AuthController.cs +++ b/Controllers/AuthController.cs @@ -145,11 +145,14 @@ public class AuthController : ControllerBase var roles = await _userManager.GetRolesAsync(user); + var displayName = user.Name ?? user.Email ?? string.Empty; + var userEmail = user.Email ?? string.Empty; + var claims = new List { new(JwtRegisteredClaimNames.Sub, user.Id.ToString()), - new(JwtRegisteredClaimNames.Email, user.Email ?? string.Empty), - new("name", user.Name), + new(JwtRegisteredClaimNames.Email, userEmail), + new("name", displayName), new("tenantId", tenantId.ToString()) }; diff --git a/Data/SeedData.cs b/Data/SeedData.cs index cf97836..66adf30 100644 --- a/Data/SeedData.cs +++ b/Data/SeedData.cs @@ -78,6 +78,28 @@ public static class SeedData await userManager.AddToRoleAsync(adminUser, "admin"); } } + else + { + existingAdmin.UserName = options.AdminEmail; + existingAdmin.Email = options.AdminEmail; + existingAdmin.Name = options.AdminName; + existingAdmin.TenantId = tenant.Id; + existingAdmin.EmailConfirmed = true; + existingAdmin.IsActive = true; + + await userManager.UpdateAsync(existingAdmin); + + if (!await userManager.CheckPasswordAsync(existingAdmin, options.AdminPassword)) + { + var resetToken = await userManager.GeneratePasswordResetTokenAsync(existingAdmin); + await userManager.ResetPasswordAsync(existingAdmin, resetToken, options.AdminPassword); + } + + if (!await userManager.IsInRoleAsync(existingAdmin, "admin")) + { + await userManager.AddToRoleAsync(existingAdmin, "admin"); + } + } tenantProvider.SetTenantId(null); } diff --git a/appsettings.Development.json b/appsettings.Development.json index 1dedf75..0bc8a6a 100644 --- a/appsettings.Development.json +++ b/appsettings.Development.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "Default": "Host=localhost;Port=5432;Database=linegestao;Username=linegestao_app;Password=CHANGE_ME" + "Default": "Host=localhost;Port=5432;Database=linegestao;Username=linegestao_app;Password=255851Ed@" }, "Jwt": { "Key": "dev-only-please-replace-with-env-variable-in-production",