optimize code

nager · Jul 10, 2024 · 22756f4 · 22756f4
1 parent 2d4dc8a
commit 22756f4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.0.x
     - name: Restore dependencies

diff --git a/src/Nager.Authentication.Abstraction/Models/AuthenticationResult.cs b/src/Nager.Authentication.Abstraction/Models/AuthenticationResult.cs
@@ -1,8 +1,18 @@
 namespace Nager.Authentication.Abstraction.Models
 {
+    /// <summary>
+    /// Authentication Result
+    /// </summary>
     public class AuthenticationResult
     {
+        /// <summary>
+        /// Authentication Status
+        /// </summary>
         public AuthenticationStatus Status { get; set; }
-        public string MfaIdentifier { get; set; }
+
+        /// <summary>
+        /// Mfa Identifier
+        /// </summary>
+        public string? MfaIdentifier { get; set; }
     }
 }
diff --git a/src/Nager.Authentication.AspNet/Controllers/AuthenticationController.cs b/src/Nager.Authentication.AspNet/Controllers/AuthenticationController.cs
@@ -169,6 +169,11 @@ public async Task<ActionResult<AuthenticationResponseDto>> AuthenticateAsync(
                         return StatusCode(StatusCodes.Status500InternalServerError);
                     }
                 case AuthenticationStatus.MfaCodeRequired:
+                    if (string.IsNullOrEmpty(authenticationResult.MfaIdentifier))
+                    {
+                        return StatusCode(StatusCodes.Status500InternalServerError);
+                    }
+
                     return StatusCode(StatusCodes.Status401Unauthorized, new MfaRequiredResponseDto
                     {
                         MfaType = "TOTP",

diff --git a/src/Nager.Authentication.AspNet/Nager.Authentication.AspNet.csproj b/src/Nager.Authentication.AspNet/Nager.Authentication.AspNet.csproj
@@ -15,7 +15,7 @@
     <PackageProjectUrl>https://github.com/nager/Nager.Authentication</PackageProjectUrl>
     <PackageTags>Authentication</PackageTags>
 
-    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <Nullable>enable</Nullable>
 
     <Version>2.0.4</Version>

diff --git a/src/Nager.Authentication/Nager.Authentication.csproj b/src/Nager.Authentication/Nager.Authentication.csproj
@@ -18,7 +18,7 @@
   <RepositoryUrl>https://github.com/nager/Nager.Authentication</RepositoryUrl>
 
   <Nullable>enable</Nullable>
-  <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
+  <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
 
   <Version>2.0.4</Version>
 </PropertyGroup>