Fix property naming

nager · Jun 14, 2024 · 41a6592 · 41a6592
1 parent 54525ff
commit 41a6592
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/src/Nager.Authentication.Abstraction/Entities/UserEntity.cs b/src/Nager.Authentication.Abstraction/Entities/UserEntity.cs
@@ -31,9 +31,9 @@ public class UserEntity
         public DateTime? LastSuccessfulValidationTimestamp { get; set; }
 
         [MaxLength(32)]
-        public byte[]? mfaSecret { get; set; }
+        public byte[]? MfaSecret { get; set; }
 
-        public bool mfaActive { get; set; }
+        public bool MfaActive { get; set; }
 
         public bool IsLocked { get; set; }
     }

diff --git a/src/Nager.Authentication.Abstraction/Nager.Authentication.Abstraction.csproj b/src/Nager.Authentication.Abstraction/Nager.Authentication.Abstraction.csproj
@@ -20,7 +20,7 @@
     <Nullable>enable</Nullable>
     <TargetFramework>netstandard2.1</TargetFramework>
 
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Nager.Authentication.AspNet/Nager.Authentication.AspNet.csproj b/src/Nager.Authentication.AspNet/Nager.Authentication.AspNet.csproj
@@ -18,7 +18,7 @@
     <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
     <Nullable>enable</Nullable>
 
-    <Version>2.0.0</Version>
+    <Version>2.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Nager.Authentication/Nager.Authentication.csproj b/src/Nager.Authentication/Nager.Authentication.csproj
@@ -20,7 +20,7 @@
   <Nullable>enable</Nullable>
   <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
 
-  <Version>2.0.0</Version>
+  <Version>2.0.1</Version>
 </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Nager.Authentication/Services/UserAccountService.cs b/src/Nager.Authentication/Services/UserAccountService.cs
@@ -67,9 +67,9 @@ private async Task<bool> CreateMfaSecretAsync(
                 return false;
             }
 
-            if (userEntity.mfaSecret == null)
+            if (userEntity.MfaSecret == null)
             {
-                userEntity.mfaSecret = ByteHelper.CreatePseudoRandomNumber();
+                userEntity.MfaSecret = ByteHelper.CreatePseudoRandomNumber();
                 return await this._userRepository.UpdateAsync(userEntity, cancellationToken);
             }
 
@@ -88,15 +88,15 @@ public async Task<MfaActivationResult> ActivateMfaAsync(
                 return MfaActivationResult.UserNotFound;
             }
 
-            if (userEntity.mfaActive)
+            if (userEntity.MfaActive)
             {
                 return MfaActivationResult.AlreadyActive;
             }
 
             var twoFactorAuthenticator = new TwoFactorAuthenticator();
-            if (twoFactorAuthenticator.ValidateTwoFactorPIN(userEntity.mfaSecret, token))
+            if (twoFactorAuthenticator.ValidateTwoFactorPIN(userEntity.MfaSecret, token))
             {
-                userEntity.mfaActive = true;
+                userEntity.MfaActive = true;
                 if (await this._userRepository.UpdateAsync(userEntity, cancellationToken))
                 {
                     return MfaActivationResult.Success;
@@ -120,16 +120,16 @@ public async Task<MfaDeactivationResult> DeactivateMfaAsync(
                 return MfaDeactivationResult.UserNotFound;
             }
 
-            if (!userEntity.mfaActive)
+            if (!userEntity.MfaActive)
             {
                 return MfaDeactivationResult.NotActive;
             }
 
             var twoFactorAuthenticator = new TwoFactorAuthenticator();
-            if (twoFactorAuthenticator.ValidateTwoFactorPIN(userEntity.mfaSecret, token))
+            if (twoFactorAuthenticator.ValidateTwoFactorPIN(userEntity.MfaSecret, token))
             {
-                userEntity.mfaActive = false;
-                userEntity.mfaSecret = null;
+                userEntity.MfaActive = false;
+                userEntity.MfaSecret = null;
 
                 if (await this._userRepository.UpdateAsync(userEntity, cancellationToken))
                 {
@@ -142,7 +142,7 @@ public async Task<MfaDeactivationResult> DeactivateMfaAsync(
             return MfaDeactivationResult.InvalidCode;
         }
 
-        public async Task<MfaInformation> GetMfaInformationAsync(
+        public async Task<MfaInformation?> GetMfaInformationAsync(
             string emailAddress,
             CancellationToken cancellationToken = default)
         {
@@ -152,7 +152,7 @@ public async Task<MfaInformation> GetMfaInformationAsync(
                 return null;
             }
 
-            if (userEntity.mfaActive)
+            if (userEntity.MfaActive)
             {
                 return new MfaInformation
                 {
@@ -166,7 +166,7 @@ public async Task<MfaInformation> GetMfaInformationAsync(
             }
 
             var twoFactorAuthenticator = new TwoFactorAuthenticator();
-            var setupCode = twoFactorAuthenticator.GenerateSetupCode(this._issuer, emailAddress, userEntity.mfaSecret);
+            var setupCode = twoFactorAuthenticator.GenerateSetupCode(this._issuer, emailAddress, userEntity.MfaSecret);
 
             return new MfaInformation
             {

diff --git a/src/Nager.Authentication/Services/UserAuthenticationService.cs b/src/Nager.Authentication/Services/UserAuthenticationService.cs
@@ -182,7 +182,7 @@ public async Task<AuthenticationResult> ValidateCredentialsAsync(
             var passwordHash = PasswordHelper.HashPasword(authenticationRequest.Password, userEntity.PasswordSalt);
             if (userEntity.PasswordHash.SequenceEqual(passwordHash))
             {
-                if (userEntity.mfaActive)
+                if (userEntity.MfaActive)
                 {
                     var mfaIdentifier = Guid.NewGuid().ToString();
                     var cacheKey = this.GetCacheKey(mfaIdentifier);
@@ -271,7 +271,7 @@ public async Task<ValidateTokenResult> ValidateTokenAsync(
             }
 
             var twoFactorAuthenticator = new TwoFactorAuthenticator();
-            var isTokenValid = twoFactorAuthenticator.ValidateTwoFactorPIN(userEntity.mfaSecret, token, timeTolerance);
+            var isTokenValid = twoFactorAuthenticator.ValidateTwoFactorPIN(userEntity.MfaSecret, token, timeTolerance);
 
             return new ValidateTokenResult
             {