forgot password

matinayo · Aug 8, 2024 · dbfa603 · dbfa603
1 parent 66a292c
commit dbfa603
Show file tree

Hide file tree

Showing 18 changed files with 335 additions and 206 deletions.
diff --git a/HalceraAPI.Common/AppsettingsOptions/EmailSenderOptions.cs b/HalceraAPI.Common/AppsettingsOptions/EmailSenderOptions.cs
@@ -0,0 +1,11 @@
+namespace HalceraAPI.Common.AppsettingsOptions
+{
+    public class EmailSenderOptions
+    {
+        public string? SendGridKey { get; set; }
+
+        public string? SendGridUser { get; set; }
+
+        public string? SendGridEmail { get; set; }
+    }
+}
diff --git a/HalceraAPI.Common/HalceraAPI.Common.csproj b/HalceraAPI.Common/HalceraAPI.Common.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.36.0" />
   </ItemGroup>
 
 </Project>
diff --git a/HalceraAPI.Common/Utilities/EmailConstants.cs b/HalceraAPI.Common/Utilities/EmailConstants.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HalceraAPI.Common.Utilities
+{
+    public static class EmailConstants
+    {
+        public const string ForgotPasswordSubject = "Request to change password";
+
+        public static string ForgotPasswordPlainTextMessage(string userPasswordResetToken)
+        {
+            return $"Request to change password {userPasswordResetToken}";
+        }
+        public const string ForgotPasswordHtmlMessage = "Request to change password";
+    }
+}
diff --git a/HalceraAPI.DataAccess/DbInitializer/DbInitializer.cs b/HalceraAPI.DataAccess/DbInitializer/DbInitializer.cs
@@ -40,7 +40,6 @@ public void Initialize()
 
         private List<Roles> LoadApplicationRoles()
         {
-            // Create all roles required
             List<Roles> applicationRoles = new()
             {
                 new() {
@@ -63,7 +62,7 @@ private void LoadAdminUser(Roles? roleId)
             {
                 Name = "Admin",
                 Email = "[email protected]",
-                PasswordHash = BCrypt.Net.BCrypt.HashPassword("MASTER123*"),
+                PasswordHash = BCrypt.Net.BCrypt.HashPassword("string"),
                 Roles = roleId != null ? new List<Roles>() { roleId } : null
             };
 

diff --git a/HalceraAPI.Model/ApplicationUser.cs b/HalceraAPI.Model/ApplicationUser.cs
@@ -5,9 +5,6 @@
 
 namespace HalceraAPI.Models
 {
-    /// <summary>
-    /// Application User Models
-    /// </summary>
     public class ApplicationUser
     {
         [Key]
@@ -24,21 +21,34 @@ public class ApplicationUser
         public string PasswordHash { get; set; } = string.Empty;
 
         public bool Active { get; set; } = true;
-        /// <summary>
-        /// End date if account is locked
-        /// </summary>
+
         public DateTime? LockoutEnd { get; set; }
+
         public DateTime? UserCreatedDate { get; set; } = DateTime.UtcNow;
+
         public DateTime? DateLastModified { get; set; }
+
         public DateTime? LastLoginDate { get; set; }
+
         public ICollection<Roles>? Roles { get; set; }
+
         public int? RefreshTokenId { get; set; }
+
         [ForeignKey(nameof(RefreshTokenId))]
         public RefreshToken? RefreshToken { get; set; }
+
         public bool AccountDeleted { get; set; }
+
         public DateTime? DateAccountDeleted { get; set; }
 
+        public string? PasswordResetToken { get; set; }
+
+        public DateTime? ResetTokenExpires { get; set; }
+
+        public DateTime? PasswordResetDate { get; set; }
+
         public int? AddressId { get; set; }
+
         [ForeignKey(nameof(AddressId))]
         public BaseAddress? Address { get; set; }
 
@@ -75,11 +85,16 @@ public void Register(string? password)
             LastLoginDate = DateTime.UtcNow;
         }
 
-        /// <summary>
-        /// Set created password hash
-        /// </summary>
-        /// <param name="password">Password string request</param>
-        /// <returns>Password Hash</returns>
+        public void ResetPassword(string password)
+        {
+            ValidateAccountStatus();
+            SetPasswordHash(password);
+            PasswordResetDate = DateTime.UtcNow;
+            DateLastModified = DateTime.UtcNow;
+            PasswordResetToken = null;
+            ResetTokenExpires = null;
+        }
+
         private void SetPasswordHash(string? password)
         {
             if (string.IsNullOrWhiteSpace(password))
@@ -90,10 +105,6 @@ private void SetPasswordHash(string? password)
             PasswordHash = BCrypt.Net.BCrypt.HashPassword(password);
         }
 
-        /// <summary>
-        /// Verify user password
-        /// </summary>
-        /// <param name="requestedPassword">Input password from user</param>
         private void VerifyPassword(string? requestedPassword)
         {
             if (string.IsNullOrWhiteSpace(requestedPassword) 
@@ -103,10 +114,6 @@ private void VerifyPassword(string? requestedPassword)
             }
         }
 
-        /// <summary>
-        /// Validating Account status and preferences 
-        /// </summary>
-        /// <param name="applicationUser">Application User from db</param>
         private void ValidateAccountStatus()
         {
             bool accountIsInactive = !Active;
@@ -126,10 +133,6 @@ private void ValidateAccountStatus()
             }
         }
 
-        /// <summary>
-        /// Generate Refresh Token
-        /// </summary>
-        /// <returns>New refresh token</returns>
         public void GenerateRefreshToken()
         {
             RefreshToken = new RefreshToken

diff --git a/HalceraAPI.Services/Contract/IEmailSenderOperation.cs b/HalceraAPI.Services/Contract/IEmailSenderOperation.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HalceraAPI.Services.Contract
+{
+    public interface IEmailSenderOperation
+    {
+        Task SendEmailAsync(string receiverEmail, string subject, string plainTextMessage, string htmlMessage);
+    }
+}
diff --git a/HalceraAPI.Services/Contract/IIdentityOperation.cs b/HalceraAPI.Services/Contract/IIdentityOperation.cs
@@ -3,6 +3,7 @@
 using HalceraAPI.Services.Dtos.ApplicationUser;
 using HalceraAPI.Services.Dtos.RefreshToken;
 using HalceraAPI.Services.Dtos.Role;
+using HalceraAPI.Services.Dtos.Identity;
 
 namespace HalceraAPI.Services.Contract
 {
@@ -14,5 +15,9 @@ public interface IIdentityOperation
         Task<ApplicationUser> GetLoggedInUserAsync();
         Task<IEnumerable<RoleResponse>> GetApplicationRoles();
         Task<ApplicationUser?> GetUserWithEmail(string? email);
+        Task ForgotPassword(string email);
+        Task ResetUserPassword(ResetUserPasswordRequest resetUserPasswordRequest);
+
+        void Logout();
     }
 }
diff --git a/HalceraAPI.Services/Contract/IUserOperation.cs b/HalceraAPI.Services/Contract/IUserOperation.cs
@@ -2,7 +2,6 @@
 using HalceraAPI.Services.Dtos.APIResponse;
 using HalceraAPI.Services.Dtos.ApplicationUser;
 using HalceraAPI.Services.Dtos.BaseAddress;
-using HalceraAPI.Services.Dtos.Role;
 
 namespace HalceraAPI.Services.Contract
 {
@@ -20,5 +19,6 @@ Task<APIResponse<IEnumerable<UserResponse>>> GetUsersAsync(
         Task LockUnlockUserAsync(string userId, AccountAction accountAction);
         Task <APIResponse<UserAuthResponse>> DeleteRoleFromUserAsync(string userId, int roleId);
         Task<APIResponse<UserAuthResponse>> UpdateUserRoleUserAsync(string userId, int roleId);
+        void ResetPassword(string email);
     }
 }
diff --git a/HalceraAPI.Services/Dtos/ApplicationUser/LoginRequest.cs b/HalceraAPI.Services/Dtos/ApplicationUser/LoginRequest.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 
 namespace HalceraAPI.Services.Dtos.ApplicationUser
 {
@@ -14,7 +9,6 @@ public class LoginRequest
         public string? Email { get; set; }
 
         [Required]
-        [StringLength(255, ErrorMessage = "Must be between 5 and 255 characters", MinimumLength = 5)]
         [DataType(DataType.Password)]
         public string? Password { get; set; }
     }

diff --git a/HalceraAPI.Services/Dtos/Identity/ResetUserPasswordRequest.cs b/HalceraAPI.Services/Dtos/Identity/ResetUserPasswordRequest.cs
@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace HalceraAPI.Services.Dtos.Identity
+{
+    public class ResetUserPasswordRequest
+    {
+        [Required]
+        [EmailAddress]
+        public required string Email { get; set; }
+
+        [Required]
+        public required string OTP { get; set; }
+
+        [Required]
+        [StringLength(255, ErrorMessage = "Must be between 5 and 255 characters", MinimumLength = 5)]
+        [DataType(DataType.Password)]
+        public required string Password { get; set; }
+
+        [Required]
+        [StringLength(255, ErrorMessage = "Must be between 5 and 255 characters", MinimumLength = 5)]
+        [DataType(DataType.Password)]
+        [Compare(nameof(Password))]
+        public required string ConfirmPassword { get; set; }
+    }
+}
diff --git a/HalceraAPI.Services/HalceraAPI.Services.csproj b/HalceraAPI.Services/HalceraAPI.Services.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -11,6 +11,7 @@
     <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Paystack.Net" Version="1.1.0" />
+    <PackageReference Include="SendGrid" Version="9.29.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/HalceraAPI.Services/Operations/EmailSenderOperation.cs b/HalceraAPI.Services/Operations/EmailSenderOperation.cs
@@ -0,0 +1,34 @@
+
+using HalceraAPI.Common.AppsettingsOptions;
+using HalceraAPI.Services.Contract;
+using Microsoft.Extensions.Options;
+using SendGrid;
+using SendGrid.Helpers.Mail;
+
+namespace HalceraAPI.Services.Operations
+{
+    public class EmailSenderOperation : IEmailSenderOperation
+    {
+        private readonly EmailSenderOptions _emailOptions;
+
+        public EmailSenderOperation(IOptions<EmailSenderOptions> options)
+        {
+            _emailOptions = options.Value;
+        }
+
+        public async Task SendEmailAsync(string receiverEmail, string subject, string plainTextMessage, string htmlMessage)
+        {
+            await Execute(receiverEmail, subject, plainTextMessage, htmlMessage);
+        }
+
+        private async Task Execute(string receiverEmail, string subject, string plainTextMessage, string htmlMessage)
+        {
+            var client = new SendGridClient(_emailOptions.SendGridKey);
+            var from = new EmailAddress(_emailOptions.SendGridEmail, _emailOptions.SendGridUser);
+            var to = new EmailAddress(receiverEmail);
+
+            var msg = MailHelper.CreateSingleEmail(from, to, subject, plainTextMessage, htmlMessage);
+            await client.SendEmailAsync(msg);
+        }
+    }
+}
diff --git a/HalceraAPI.Services/Operations/IdentityOperation.cs b/HalceraAPI.Services/Operations/IdentityOperation.cs
@@ -5,6 +5,7 @@
 using HalceraAPI.Models;
 using HalceraAPI.Services.Contract;
 using HalceraAPI.Services.Dtos.ApplicationUser;
+using HalceraAPI.Services.Dtos.Identity;
 using HalceraAPI.Services.Dtos.RefreshToken;
 using HalceraAPI.Services.Dtos.Role;
 using HalceraAPI.Services.Token;
@@ -20,17 +21,20 @@ public class IdentityOperation : IIdentityOperation
         private readonly IMapper _mapper;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly JWTOptions jwtOptions;
+        private readonly IEmailSenderOperation _emailSenderOperation;
 
         public IdentityOperation(
             IUnitOfWork unitOfWork,
             IMapper mapper,
             IHttpContextAccessor httpContextAccessor,
-            IOptions<JWTOptions> options)
+            IOptions<JWTOptions> options,
+            IEmailSenderOperation emailSenderOperation)
         {
             _unitOfWork = unitOfWork;
             _mapper = mapper;
             _httpContextAccessor = httpContextAccessor;
             jwtOptions = options.Value;
+            _emailSenderOperation = emailSenderOperation;
         }
 
         public async Task<UserAuthResponse> Register(RegisterRequest registerRequest)
@@ -153,5 +157,53 @@ private async Task SetUserRole(IEnumerable<RoleRequest>? rolesId, ApplicationUse
                 }
             }
         }
+
+        public async Task ForgotPassword(string email)
+        {
+            var user = await _unitOfWork.ApplicationUser
+                .GetFirstOrDefault(user => user.Email.Trim().ToLower().Equals(email.Trim().ToLower()));
+
+            if (user != null)
+            {
+                user.PasswordResetToken = CreateRandomToken();
+                user.ResetTokenExpires = DateTime.UtcNow.AddHours(1);
+                await _unitOfWork.SaveAsync();
+
+                await _emailSenderOperation.SendEmailAsync(
+                    "[email protected]", //user.Email, 
+                    EmailConstants.ForgotPasswordSubject,
+                    EmailConstants.ForgotPasswordPlainTextMessage(user.PasswordResetToken),
+                    EmailConstants.ForgotPasswordHtmlMessage);
+            }
+        }
+
+        public async Task ResetUserPassword(ResetUserPasswordRequest resetUserPasswordRequest)
+        {
+            var user = await _unitOfWork.ApplicationUser
+                .GetFirstOrDefault(user => user.Email.Trim().ToLower().Equals(resetUserPasswordRequest.Email.Trim().ToLower()));
+
+            if (user != null && user.PasswordResetToken != null && DateTime.UtcNow < user.ResetTokenExpires)
+            {
+                if (resetUserPasswordRequest.OTP.Trim().Equals(user.PasswordResetToken.Trim()))
+                {
+                    user.ResetPassword(resetUserPasswordRequest.Password);
+                    await _unitOfWork.SaveAsync();
+
+                    return;
+                }
+            }
+
+            throw new Exception("Invalid Token");
+        }
+
+        public void Logout()
+        {
+            throw new NotImplementedException();
+        }
+
+        private static string CreateRandomToken()
+        {
+            return Guid.NewGuid().ToString()[..5];
+        }
     }
 }
diff --git a/HalceraAPI.Services/Operations/ShoppingCartOperation.cs b/HalceraAPI.Services/Operations/ShoppingCartOperation.cs
@@ -394,7 +394,6 @@ private PaymentDetails ProcessPaymentOrderDetails(PaymentDetailsRequest paymentD
 
         private static decimal GetTotalAmountToBePaidDuringCheckout(IEnumerable<ShoppingCart> cartItemsFromDb, Currency currencyToBePaidIn)
         {
-            // TODO: only product that are active
             decimal totalAmount = 0.0M;
             List<OrderDetails> orderDetails = new();