From ad1909ef57ff45be116c8c8a8064c4e00278f620 Mon Sep 17 00:00:00 2001 From: csimonapastore Date: Tue, 17 Jun 2025 00:11:14 +0200 Subject: [PATCH] Minor fixes --- MainProject.Tests/Utils/PasswordUtils_Test.cs | 2 +- MainProject/Utils/PasswordUtils.cs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MainProject.Tests/Utils/PasswordUtils_Test.cs b/MainProject.Tests/Utils/PasswordUtils_Test.cs index 2f2d6e6..937a367 100644 --- a/MainProject.Tests/Utils/PasswordUtils_Test.cs +++ b/MainProject.Tests/Utils/PasswordUtils_Test.cs @@ -33,7 +33,7 @@ public class PasswordUtils_Test Assert.IsTrue(errors.Contains(PasswordValidationEnum.MIN_NUMBER)); Assert.IsTrue(errors.Contains(PasswordValidationEnum.MIN_SPECIAL)); Assert.IsTrue(errors.Contains(PasswordValidationEnum.IDENTICAL_CHARS)); - Assert.IsTrue(!errors.Contains(PasswordValidationEnum.MIN_LOWER)); + Assert.IsFalse(errors.Contains(PasswordValidationEnum.MIN_LOWER)); } catch (Exception exception) { diff --git a/MainProject/Utils/PasswordUtils.cs b/MainProject/Utils/PasswordUtils.cs index 25e28e1..e72bde3 100644 --- a/MainProject/Utils/PasswordUtils.cs +++ b/MainProject/Utils/PasswordUtils.cs @@ -9,6 +9,8 @@ using BasicDotnetTemplate.MainProject.Models.Settings; namespace BasicDotnetTemplate.MainProject.Utils; public partial class PasswordUtils { + protected PasswordUtils() { } + private const int MIN_LENGTH = 8; private const int MIN_UPPER = 2; private const int MIN_LOWER = 2; @@ -27,14 +29,13 @@ public partial class PasswordUtils [GeneratedRegex("[^a-zA-Z0-9]")] private static partial Regex RegexSpecial(); - [GeneratedRegex(@"(\S)\1{2,}", RegexOptions.IgnoreCase | RegexOptions.Compiled)] - private static partial Regex RegexIdenticalChars(); + private static readonly Regex RegexIdenticalChars = new(@"(\S)\1{2,}", RegexOptions.IgnoreCase | RegexOptions.Compiled); public static List ValidatePassword(string password) { List errors = []; - if (password.Length < 8) + if (password.Length < MIN_LENGTH) errors.Add(PasswordValidationEnum.MIN_LENGTH); if (RegexUpper().Matches(password).Count < MIN_UPPER) @@ -49,7 +50,7 @@ public partial class PasswordUtils if (RegexSpecial().Matches(password).Count < MIN_SPECIAL) errors.Add(PasswordValidationEnum.MIN_SPECIAL); - if (RegexIdenticalChars().IsMatch(password)) + if (RegexIdenticalChars.IsMatch(password)) errors.Add(PasswordValidationEnum.IDENTICAL_CHARS); return errors;