Optimize code

nager · Jun 17, 2024 · 5cd81c1 · 5cd81c1
1 parent cf06059
commit 5cd81c1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/src/Nager.Authentication.AspNet/Controllers/AuthenticationController.cs b/src/Nager.Authentication.AspNet/Controllers/AuthenticationController.cs
@@ -189,7 +189,7 @@ public async Task<ActionResult<AuthenticationResponseDto>> AuthenticateAsync(
         /// <param name="cancellationToken"></param>
         /// <returns></returns>
         /// <response code="200">Authentication successful</response>
-        /// <response code="406">Invalid credential</response>
+        /// <response code="400">Invalid token</response>
         /// <response code="500">Unexpected error</response>
         [AllowAnonymous]
         [HttpPost]

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.2</Version>
+    <Version>2.0.3</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.2</Version>
+  <Version>2.0.3</Version>
 </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Nager.Authentication/Services/UserAuthenticationService.cs b/src/Nager.Authentication/Services/UserAuthenticationService.cs
@@ -251,19 +251,31 @@ public async Task<ValidateTokenResult> ValidateTokenAsync(
             var cacheKey = this.GetCacheKey(mfaIdentifier);
             if (!this._memoryCache.TryGetValue<string>(cacheKey, out var emailAddress))
             {
+                this._logger.LogError($"{nameof(ValidateTokenAsync)} - CacheKey {cacheKey} not found");
+
                 return new ValidateTokenResult
                 {
                     Success = false
                 };
             }
 
-            this._memoryCache.Remove(cacheKey);
+            if (string.IsNullOrEmpty(emailAddress))
+            {
+                this._logger.LogError($"{nameof(ValidateTokenAsync)} - EmailAddress is empty");
+
+                return new ValidateTokenResult
+                {
+                    Success = false
+                };
+            }
 
             var timeTolerance = TimeSpan.FromSeconds(20);
 
             var userEntity = await this._userRepository.GetAsync(o => o.EmailAddress == emailAddress);
             if (userEntity == null)
             {
+                this._logger.LogError($"{nameof(ValidateTokenAsync)} - No User available");
+
                 return new ValidateTokenResult
                 {
                     Success = false
@@ -273,6 +285,11 @@ public async Task<ValidateTokenResult> ValidateTokenAsync(
             var twoFactorAuthenticator = new TwoFactorAuthenticator();
             var isTokenValid = twoFactorAuthenticator.ValidateTwoFactorPIN(userEntity.MfaSecret, token, timeTolerance);
 
+            if (isTokenValid)
+            {
+                this._memoryCache.Remove(cacheKey);
+            }
+
             return new ValidateTokenResult
             {
                 Success = isTokenValid,