diff --git a/Blazor/Blazor/Blazor.csproj b/Blazor/Blazor/Blazor.csproj index 62be3fa..edf20db 100644 --- a/Blazor/Blazor/Blazor.csproj +++ b/Blazor/Blazor/Blazor.csproj @@ -18,6 +18,7 @@ + diff --git a/Blazor/Blazor/Models/AdministratorModel.cs b/Blazor/Blazor/Models/AdministratorModel.cs index af3ca37..86dda6f 100644 --- a/Blazor/Blazor/Models/AdministratorModel.cs +++ b/Blazor/Blazor/Models/AdministratorModel.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Cryptography.KeyDerivation; using Microsoft.AspNetCore.Identity; +using BCrypt.Net; using System.Security.Cryptography; using System.ComponentModel.DataAnnotations; using System.Text; @@ -22,18 +23,24 @@ public class AdministratorModel public void HashPassword(string password) { - using (MD5 md5 = MD5.Create()) - { - byte[] inputBytes = Encoding.UTF8.GetBytes(password); - byte[] hashBytes = md5.ComputeHash(inputBytes); - - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < hashBytes.Length; i++) - { - sb.Append(hashBytes[i].ToString("x2")); - } - - HashedPassword = sb.ToString(); - } + this.HashedPassword = BCrypt.Net.BCrypt.HashPassword(password, BCrypt.Net.BCrypt.GenerateSalt()); } + + + //public void HashPassword(string password) + //{ + // using (MD5 md5 = MD5.Create()) + // { + // byte[] inputBytes = Encoding.UTF8.GetBytes(password); + // byte[] hashBytes = md5.ComputeHash(inputBytes); + + // StringBuilder sb = new StringBuilder(); + // for (int i = 0; i < hashBytes.Length; i++) + // { + // sb.Append(hashBytes[i].ToString("x2")); + // } + + // HashedPassword = sb.ToString(); + // } + //} } diff --git a/Blazor/Blazor/Models/PlayerModel.cs b/Blazor/Blazor/Models/PlayerModel.cs index d202d12..eb0077a 100644 --- a/Blazor/Blazor/Models/PlayerModel.cs +++ b/Blazor/Blazor/Models/PlayerModel.cs @@ -21,18 +21,23 @@ public class PlayerModel public void HashPassword(string password) { - using (MD5 md5 = MD5.Create()) - { - byte[] inputBytes = Encoding.UTF8.GetBytes(password); - byte[] hashBytes = md5.ComputeHash(inputBytes); - - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < hashBytes.Length; i++) - { - sb.Append(hashBytes[i].ToString("x2")); - } - - HashedPassword = sb.ToString(); - } + this.HashedPassword = BCrypt.Net.BCrypt.HashPassword(password, BCrypt.Net.BCrypt.GenerateSalt()); } + + //public void HashPassword(string password) + //{ + // using (MD5 md5 = MD5.Create()) + // { + // byte[] inputBytes = Encoding.UTF8.GetBytes(password); + // byte[] hashBytes = md5.ComputeHash(inputBytes); + + // StringBuilder sb = new StringBuilder(); + // for (int i = 0; i < hashBytes.Length; i++) + // { + // sb.Append(hashBytes[i].ToString("x2")); + // } + + // HashedPassword = sb.ToString(); + // } + //} } diff --git a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs index a049907..2c0d926 100644 --- a/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs +++ b/Blazor/Blazor/Pages/Admins/AddAdministrator.razor.cs @@ -25,7 +25,7 @@ namespace Blazor.Pages.Admins { if (administratorModel != null) { - administratorModel.HashPassword(administratorModel.HashedPassword); + administratorModel.HashPassword(administratorModel.HashedPassword); var formData = new List>(); formData.Add(new KeyValuePair("username", administratorModel.Username)); diff --git a/Blazor/Test/Test.csproj b/Blazor/Test/Test.csproj index 3a5cdc0..6e17cfa 100644 --- a/Blazor/Test/Test.csproj +++ b/Blazor/Test/Test.csproj @@ -10,6 +10,7 @@ +