refactor: Rename ForgotPasswordService to PasswordResetService internally

3 files changed, 120 insertions, 120 deletions

diff --git a/server/src/Services/ForgotPasswordService.cs b/server/src/Services/ForgotPasswordService.cs
deleted file mode 100644
index b7e99ad..0000000
--- a/server/src/Services/ForgotPasswordService.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-namespace IOL.GreatOffice.Api.Services;
-
-public class ForgotPasswordService
-{
-	private readonly AppDbContext _context;
-	private readonly MailService _mailService;
-	private readonly AppConfiguration _configuration;
-	private readonly ILogger<ForgotPasswordService> _logger;
-
-
-	public ForgotPasswordService(
-			AppDbContext context,
-			VaultService vaultService,
-			ILogger<ForgotPasswordService> logger,
-			MailService mailService
-	) {
-		_context = context;
-		_configuration = vaultService.GetCurrentAppConfiguration();
-		_logger = logger;
-		_mailService = mailService;
-	}
-
-	public async Task<ForgotPasswordRequest> GetRequestAsync(Guid id, CancellationToken cancellationToken = default) {
-		var request = await _context.ForgotPasswordRequests
-									.Include(c => c.User)
-									.SingleOrDefaultAsync(c => c.Id == id, cancellationToken);
-		if (request == default) {
-			return default;
-		}
-
-		_logger.LogInformation($"Found forgot password request for user: {request.User.Username}, expires at {request.ExpirationDate} (in {request.ExpirationDate.Subtract(AppDateTime.UtcNow).Minutes} minutes).");
-		return request;
-	}
-
-	public async Task<bool> FullFillRequestAsync(Guid id, string newPassword, CancellationToken cancellationToken = default) {
-		var request = await GetRequestAsync(id, cancellationToken);
-		if (request == default) {
-			throw new ForgotPasswordRequestNotFoundException("Request with id: " + id + " was not found");
-		}
-
-		var user = _context.Users.SingleOrDefault(c => c.Id == request.User.Id);
-		if (user == default) {
-			throw new UserNotFoundException("User with id: " + request.User.Id + " was not found");
-		}
-
-		user.HashAndSetPassword(newPassword);
-		_context.Users.Update(user);
-		await _context.SaveChangesAsync(cancellationToken);
-		_logger.LogInformation($"Fullfilled forgot password request for user: {request.User.Username}");
-		await DeleteRequestsForUserAsync(user.Id, cancellationToken);
-		return true;
-	}
-
-
-	public async Task AddRequestAsync(User user, TimeZoneInfo requestTz, CancellationToken cancellationToken = default) {
-		await DeleteRequestsForUserAsync(user.Id, cancellationToken);
-		var request = new ForgotPasswordRequest(user);
-		_context.ForgotPasswordRequests.Add(request);
-		await _context.SaveChangesAsync(cancellationToken);
-		var portalUrl = _configuration.PORTAL_URL;
-		var emailFromAddress = _configuration.EMAIL_FROM_ADDRESS;
-		var emailFromDisplayName = _configuration.EMAIL_FROM_DISPLAY_NAME;
-		var zonedExpirationDate = TimeZoneInfo.ConvertTimeBySystemTimeZoneId(request.ExpirationDate, requestTz.Id);
-		var message = new MailMessage {
-				From = new MailAddress(emailFromAddress, emailFromDisplayName),
-				To = {
-						new MailAddress(user.Username)
-				},
-				Subject = "Time Tracker - Forgot password request",
-				Body = @$"
-Hi {user.Username}
-
-Go to the following link to set a new password.
-
-{portalUrl}/#/reset-password?id={request.Id}
-
-The link expires at {zonedExpirationDate:yyyy-MM-dd hh:mm}.
-If you did not request a password reset, no action is required.
-"
-		};
-
-#pragma warning disable 4014
-		Task.Run(() => {
-#pragma warning restore 4014
-					 _mailService.SendMail(message);
-					 _logger.LogInformation($"Added forgot password request for user: {request.User.Username}, expires in {request.ExpirationDate.Subtract(AppDateTime.UtcNow)}.");
-				 },
-				 cancellationToken);
-	}
-
-	public async Task DeleteRequestsForUserAsync(Guid userId, CancellationToken cancellationToken = default) {
-		var requestsToRemove = _context.ForgotPasswordRequests.Where(c => c.UserId == userId).ToList();
-		if (!requestsToRemove.Any()) return;
-		_context.ForgotPasswordRequests.RemoveRange(requestsToRemove);
-		await _context.SaveChangesAsync(cancellationToken);
-		_logger.LogInformation($"Deleted {requestsToRemove.Count} forgot password requests for user: {userId}.");
-	}
-
-
-	public async Task DeleteStaleRequestsAsync(CancellationToken cancellationToken = default) {
-		var deleteCount = 0;
-		foreach (var request in _context.ForgotPasswordRequests) {
-			if (!request.IsExpired) {
-				continue;
-			}
-
-			_context.ForgotPasswordRequests.Remove(request);
-			deleteCount++;
-			_logger.LogInformation($"Marking forgot password request with id: {request.Id} for deletion, expiration date was {request.ExpirationDate}.");
-		}
-
-		await _context.SaveChangesAsync(cancellationToken);
-		_logger.LogInformation($"Deleted {deleteCount} stale forgot password requests.");
-	}
-}
diff --git a/server/src/Services/PasswordResetService.cs b/server/src/Services/PasswordResetService.cs
new file mode 100644
index 0000000..1b4f147
--- /dev/null
+++ b/server/src/Services/PasswordResetService.cs
@@ -0,0 +1,115 @@
+namespace IOL.GreatOffice.Api.Services;
+
+public class PasswordResetService
+{
+    private readonly AppDbContext _context;
+    private readonly MailService _mailService;
+    private readonly AppConfiguration _configuration;
+    private readonly ILogger<PasswordResetService> _logger;
+
+
+    public PasswordResetService(
+        AppDbContext context,
+        VaultService vaultService,
+        ILogger<PasswordResetService> logger,
+        MailService mailService
+    ) {
+        _context = context;
+        _configuration = vaultService.GetCurrentAppConfiguration();
+        _logger = logger;
+        _mailService = mailService;
+    }
+
+    public async Task<ForgotPasswordRequest> GetRequestAsync(Guid id, CancellationToken cancellationToken = default) {
+        var request = await _context.ForgotPasswordRequests
+            .Include(c => c.User)
+            .SingleOrDefaultAsync(c => c.Id == id, cancellationToken);
+        if (request == default) {
+            return default;
+        }
+
+        _logger.LogInformation($"Found password reset request for user: {request.User.Username}, expires at {request.ExpirationDate} (in {request.ExpirationDate.Subtract(AppDateTime.UtcNow).Minutes} minutes).");
+        return request;
+    }
+
+    public async Task<bool> FullFillRequestAsync(Guid id, string newPassword, CancellationToken cancellationToken = default) {
+        var request = await GetRequestAsync(id, cancellationToken);
+        if (request == default) {
+            throw new ForgotPasswordRequestNotFoundException("Request with id: " + id + " was not found");
+        }
+
+        var user = _context.Users.SingleOrDefault(c => c.Id == request.User.Id);
+        if (user == default) {
+            throw new UserNotFoundException("User with id: " + request.User.Id + " was not found");
+        }
+
+        user.HashAndSetPassword(newPassword);
+        _context.Users.Update(user);
+        await _context.SaveChangesAsync(cancellationToken);
+        _logger.LogInformation($"Fullfilled password reset request for user: {request.User.Username}");
+        await DeleteRequestsForUserAsync(user.Id, cancellationToken);
+        return true;
+    }
+
+
+    public async Task AddRequestAsync(User user, TimeZoneInfo requestTz, CancellationToken cancellationToken = default) {
+        await DeleteRequestsForUserAsync(user.Id, cancellationToken);
+        var request = new ForgotPasswordRequest(user);
+        _context.ForgotPasswordRequests.Add(request);
+        await _context.SaveChangesAsync(cancellationToken);
+        var portalUrl = _configuration.PORTAL_URL;
+        var emailFromAddress = _configuration.EMAIL_FROM_ADDRESS;
+        var emailFromDisplayName = _configuration.EMAIL_FROM_DISPLAY_NAME;
+        var zonedExpirationDate = TimeZoneInfo.ConvertTimeBySystemTimeZoneId(request.ExpirationDate, requestTz.Id);
+        var message = new MailMessage {
+            From = new MailAddress(emailFromAddress, emailFromDisplayName),
+            To = {
+                new MailAddress(user.Username)
+            },
+            Subject = "Reset password - Greatoffice",
+            Body = @$"
+Hi {user.Username}
+
+Go to the following link to set a new password.
+
+{portalUrl}/reset-password/{request.Id}
+
+The link expires at {zonedExpirationDate:yyyy-MM-dd hh:mm}.
+If you did not request a password reset, no action is required.
+"
+        };
+
+#pragma warning disable 4014
+        Task.Run(() => {
+#pragma warning restore 4014
+                _mailService.SendMail(message);
+                _logger.LogInformation($"Added password reset request for user: {request.User.Username}, expires in {request.ExpirationDate.Subtract(AppDateTime.UtcNow)}.");
+            },
+            cancellationToken);
+    }
+
+    public async Task DeleteRequestsForUserAsync(Guid userId, CancellationToken cancellationToken = default) {
+        var requestsToRemove = _context.ForgotPasswordRequests.Where(c => c.UserId == userId).ToList();
+        if (!requestsToRemove.Any()) return;
+        _context.ForgotPasswordRequests.RemoveRange(requestsToRemove);
+        await _context.SaveChangesAsync(cancellationToken);
+        _logger.LogInformation($"Deleted {requestsToRemove.Count} password reset requests for user: {userId}.");
+    }
+
+
+    public async Task DeleteStaleRequestsAsync(CancellationToken cancellationToken = default) {
+        var deleteCount = 0;
+        foreach (var request in _context.ForgotPasswordRequests.Where(c => c.IsExpired)) {
+            if (!request.IsExpired) {
+                continue;
+            }
+
+            _context.ForgotPasswordRequests.Remove(request);
+            deleteCount++;
+            _logger.LogInformation($"Marking password reset request with id: {request.Id} for deletion, expiration date was {request.ExpirationDate}.");
+        }
+
+        await _context.SaveChangesAsync(cancellationToken);
+        _logger.LogInformation($"Deleted {deleteCount} stale password reset requests.");
+    }
+}
\ No newline at end of file
diff --git a/server/src/Services/UserService.cs b/server/src/Services/UserService.cs
index 9b531de..6db663a 100644
--- a/server/src/Services/UserService.cs
+++ b/server/src/Services/UserService.cs
@@ -2,14 +2,14 @@ namespace IOL.GreatOffice.Api.Services;
 
 public class UserService
 {
-	private readonly ForgotPasswordService _forgotPasswordService;
+	private readonly PasswordResetService _passwordResetService;
 
 	/// <summary>
 	/// Provides methods to perform common operations on user data.
 	/// </summary>
-	/// <param name="forgotPasswordService"></param>
-	public UserService(ForgotPasswordService forgotPasswordService) {
-		_forgotPasswordService = forgotPasswordService;
+	/// <param name="passwordResetService"></param>
+	public UserService(PasswordResetService passwordResetService) {
+		_passwordResetService = passwordResetService;
 	}
 
 	/// <summary>
@@ -37,7 +37,7 @@ public class UserService
 		}
 
 		await httpContext.SignInAsync(principal, authenticationProperties);
-		await _forgotPasswordService.DeleteRequestsForUserAsync(user.Id);
+		await _passwordResetService.DeleteRequestsForUserAsync(user.Id);
 	}
 
 	/// <summary>