refact classes

Author: brunobritodev

src/NetDevPack.Security.JwtExtensions/JwksExtension.cs

@@ -1,57 +1,28 @@
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.IdentityModel.Tokens;
+using Microsoft.IdentityModel.Protocols;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 
 namespace NetDevPack.Security.JwtExtensions
 {
     public static class JwksExtension
     {
         public static void SetJwksOptions(this JwtBearerOptions options, JwkOptions jwkOptions)
         {
-
-            if (options.TokenValidationParameters == null)
-                options.TokenValidationParameters = new TokenValidationParameters();
-
-            if (options.TokenValidationParameters.IssuerSigningKeyResolver == null)
-                options.TokenValidationParameters.IssuerSigningKeyResolver = new JwkRetriever(jwkOptions).IssuerSigningKeyResolver;
-
+            var httpClient = new HttpClient(options.BackchannelHttpHandler ?? new HttpClientHandler())
+            {
+                Timeout = options.BackchannelTimeout,
+                MaxResponseContentBufferSize = 1024 * 1024 * 10 // 10 MB 
+            };
+
+            options.ConfigurationManager = new ConfigurationManager<OpenIdConnectConfiguration>(
+                jwkOptions.JwksUri.OriginalString,
+                new JwksRetriever(),
+                new HttpDocumentRetriever(httpClient) { RequireHttps = options.RequireHttpsMetadata });
             options.TokenValidationParameters.ValidateAudience = false;
             options.TokenValidationParameters.ValidIssuer = jwkOptions.Issuer;
         }
-
-        public class JwkRetriever
-        {
-            private static readonly HttpClient HttpClient = new HttpClient();
-
-            public JwkRetriever(JwkOptions jwkOptions)
-            {
-                Options = jwkOptions;
-            }
-
-            public JwkOptions Options { get; }
-            public JwkList LastResponse { get; private set; }
-            public IEnumerable<SecurityKey> IssuerSigningKeyResolver(string token, SecurityToken securityToken, string kid, TokenValidationParameters validationParameters)
-            {
-                if (LastResponse == null || LastResponse.When.Add(Options.KeepFor) < DateTime.Now)
-                {
-                    var jwkTask = GetJwks();
-                    jwkTask.Wait();
-                    LastResponse = new JwkList(jwkTask.Result);
-                }
-
-                return LastResponse.Jwks.Keys;
-            }
-
-            private async Task<JsonWebKeySet> GetJwks()
-            {
-                var response = await HttpClient.GetAsync(Options.JwksUri);
-                var responseString = await response.Content.ReadAsStringAsync();
-                return new JsonWebKeySet(responseString);
-
-            }
-        }
     }
 }