Refactoring and password hashing
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
using System;
|
||||
using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
|
||||
using TextSender_API.Models;
|
||||
|
||||
namespace TextSender_API.Controllers;
|
||||
|
||||
public class PasswordVerification
|
||||
{
|
||||
#region Fiends
|
||||
private int _keySize = 64;
|
||||
private int _iterations = 350000;
|
||||
#endregion
|
||||
|
||||
#region Constructors
|
||||
#endregion
|
||||
|
||||
#region Methods
|
||||
public Salt CreateSalt(User user)
|
||||
{
|
||||
var salt = new Salt();
|
||||
salt.Key = RandomNumberGenerator.GetBytes(this._keySize);
|
||||
|
||||
return salt;
|
||||
}
|
||||
|
||||
public string HashPassword(User user, Salt salt)
|
||||
{
|
||||
var hashAlgorithm = HashAlgorithmName.SHA512;
|
||||
|
||||
var hash = Rfc2898DeriveBytes.Pbkdf2(
|
||||
Encoding.UTF8.GetBytes(user.Password!),
|
||||
salt.Key!,
|
||||
this._iterations,
|
||||
hashAlgorithm,
|
||||
this._keySize);
|
||||
|
||||
return Convert.ToHexString(hash);
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
@@ -9,17 +9,17 @@ namespace TextSender_API.Controllers;
|
||||
|
||||
[ApiController]
|
||||
[Route("api/v1/user")]
|
||||
public class RegisterController : ControllerBase
|
||||
public class UsersController : ControllerBase
|
||||
{
|
||||
#region Fields
|
||||
private readonly ILogger<RegisterController> _logger;
|
||||
private readonly ILogger<UsersController> _logger;
|
||||
private IConfiguration _config;
|
||||
#endregion
|
||||
|
||||
|
||||
#region Constructors
|
||||
|
||||
public RegisterController(ILogger<RegisterController> logger, IConfiguration config)
|
||||
public UsersController(ILogger<UsersController> logger, IConfiguration config)
|
||||
{
|
||||
this._logger = logger;
|
||||
this._config = config;
|
||||
@@ -33,15 +33,24 @@ public class RegisterController : ControllerBase
|
||||
try
|
||||
{
|
||||
var connString = this._config.GetConnectionString("MongoDBURI");
|
||||
var userRepo = new UserRepository(connString);
|
||||
var userRepo = new UsersRepository(connString!);
|
||||
var saltRepo = new SaltRepository(connString!);
|
||||
var allUsers = userRepo.RetrieveAllUsers();
|
||||
var result = allUsers.Exists(ea => ea.Username.Equals(userRequest.Username));
|
||||
var result = allUsers.Exists(ea => ea.Username!.Equals(userRequest.Username));
|
||||
|
||||
if (!result)
|
||||
{
|
||||
var pwdVerify = new PasswordVerification();
|
||||
var salt = pwdVerify.CreateSalt(userRequest);
|
||||
var hashedPassword = pwdVerify.HashPassword(userRequest, salt);
|
||||
|
||||
this._logger.LogInformation("Creating user");
|
||||
userRequest.Password = hashedPassword;
|
||||
userRequest.DateCreated = DateTime.Now;
|
||||
userRepo.CreateUser(userRequest);
|
||||
|
||||
salt.UserId = userRequest.Id;
|
||||
saltRepo.Create(salt);
|
||||
}
|
||||
else
|
||||
{
|
||||
Reference in New Issue
Block a user