Merge pull request #138 from DuendeSoftware/anders/AzFnFix

Call GetConfigurationAsync after RequestRefresh
DuendeSoftware · Jul 28, 2023 · 324eb74 · 324eb74
2 parents 588e62f + f86ade2
commit 324eb74
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 35 deletions.
diff --git a/various/JwtSecuredAzureFunction/Client/Client.csproj b/various/JwtSecuredAzureFunction/Client/Client.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/various/JwtSecuredAzureFunction/JwtSecuredFunction/JwtSecuredFunction.csproj b/various/JwtSecuredAzureFunction/JwtSecuredFunction/JwtSecuredFunction.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AzureFunctionsVersion>v3</AzureFunctionsVersion>
     <OutputType>Exe</OutputType>
   </PropertyGroup>

diff --git a/various/JwtSecuredAzureFunction/JwtSecuredFunction/Token.cs b/various/JwtSecuredAzureFunction/JwtSecuredFunction/Token.cs
@@ -7,6 +7,7 @@
 using Microsoft.IdentityModel.Protocols;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
+using System;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading;
@@ -30,6 +31,22 @@ static Token()
             );
         }
 
+        public static async Task<TokenValidationResult> ValidateTokenAsync(string token)
+        {
+            var handler = new JsonWebTokenHandler();
+
+            var config = await ConfigurationManager.GetConfigurationAsync(CancellationToken.None);
+
+            var validationParameter = new TokenValidationParameters()
+            {
+                ValidIssuer = Authority,
+                ValidAudience = "api",
+                IssuerSigningKeys = config.SigningKeys
+            };
+
+            return handler.ValidateToken(token, validationParameter);
+        }
+
         public static async Task<ClaimsIdentity> ValidateAsync(HttpHeadersCollection headers, ILogger logger)
         {
             var found = headers.TryGetValues("Authorization", out var headerValues);
@@ -45,46 +62,25 @@ public static async Task<ClaimsIdentity> ValidateAsync(HttpHeadersCollection hea
                 logger.LogInformation("Invalid authorization header.");
                 return null;
             }
-
-            var config = await ConfigurationManager.GetConfigurationAsync(CancellationToken.None);
 
-            var validationParameter = new TokenValidationParameters()
+            var result = await ValidateTokenAsync(values[1]);
+
+            if (result.Exception is SecurityTokenSignatureKeyNotFoundException)
             {
-                ValidIssuer = Authority,
-                ValidAudience = "api",
-                IssuerSigningKeys = config.SigningKeys
-            };
+                logger.LogInformation("Trying to refresh keys.");
 
-            var handler = new JsonWebTokenHandler();
+                ConfigurationManager.RequestRefresh();
+
+                result = await ValidateTokenAsync(values[1]);
+            }
 
-            var tries = 0;
-            while (tries <= 1)
+            if (result.IsValid)
             {
-                var result = handler.ValidateToken(values[1], validationParameter);
-
-                if (result.IsValid)
-                {
-                    logger.LogInformation("Valid token, returning identity.");
-                    return result.ClaimsIdentity;
-                }
-                else
-                {
-                    if (result.Exception is SecurityTokenSignatureKeyNotFoundException)
-                    {
-                        logger.LogInformation("Trying to refresh keys.");
-
-                        ConfigurationManager.RequestRefresh();
-                        tries++;
-                    }
-                    else
-                    {
-                        logger.LogInformation("invalid token.");
-                        return null;
-                    }
-                }
+                logger.LogInformation("Valid token, returning identity.");
+                return result.ClaimsIdentity;
             }
 
-            logger.LogInformation("invalid token signature.");
+            logger.LogInformation("invalid token.");
             return null;
         }
     }