Added jwt options back

Author: Chris Young

src/ArchitectNow.Web.Mongo/StartupSample.cs

@@ -15,7 +15,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.IdentityModel.Tokens;
 using NJsonSchema;
 using Serilog;
 
@@ -93,7 +92,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             return provider;
         }
 
-        private SecurityKey ConfigureSecurityKey(JwtIssuerOptions issuerOptions)
+        private JwtSigningKey ConfigureSecurityKey(JwtIssuerOptions issuerOptions)
         {
             var keyString = issuerOptions.Audience;
             var keyBytes = Encoding.Unicode.GetBytes(keyString);

src/ArchitectNow.Web.Redis/StartupSample.cs

@@ -14,7 +14,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.IdentityModel.Tokens;
 using NJsonSchema;
 using Serilog;
 
@@ -91,7 +90,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             return provider;
         }
 
-        private SecurityKey ConfigureSecurityKey(JwtIssuerOptions issuerOptions)
+        private JwtSigningKey ConfigureSecurityKey(JwtIssuerOptions issuerOptions)
         {
             var keyString = issuerOptions.Audience;
             var keyBytes = Encoding.Unicode.GetBytes(keyString);

src/ArchitectNow.Web.Sql/StartupSample.cs

@@ -14,7 +14,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.IdentityModel.Tokens;
 using NJsonSchema;
 using Serilog;
 
@@ -91,7 +90,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             return provider;
         }
 
-        private SecurityKey ConfigureSecurityKey(JwtIssuerOptions issuerOptions)
+        private JwtSigningKey ConfigureSecurityKey(JwtIssuerOptions issuerOptions)
         {
             var keyString = issuerOptions.Audience;
             var keyBytes = Encoding.Unicode.GetBytes(keyString);

src/ArchitectNow.Web/Configuration/JwtExtensions.cs

@@ -10,10 +10,14 @@ namespace ArchitectNow.Web.Configuration
     public static class JwtExtensions
     {
         public static void ConfigureJwt(this IServiceCollection services, IConfiguration configurationRoot,
-            Func<JwtIssuerOptions, SecurityKey> signingKey, JwtBearerEvents jwtBearerEvents = null)
+            Func<JwtIssuerOptions, JwtSigningKey> signingKey, JwtBearerEvents jwtBearerEvents = null)
         {
             var jwtAppSettingOptions = configurationRoot.GetSection(nameof(JwtIssuerOptions)).Get<JwtIssuerOptions>();
 
+            var issuerSigningKey = signingKey(jwtAppSettingOptions);
+            
+            services.AddSingleton(issuerSigningKey);
+
             var tokenValidationParameters = new TokenValidationParameters
             {
                 ValidateIssuer = true,
@@ -23,8 +27,8 @@ public static void ConfigureJwt(this IServiceCollection services, IConfiguration
                 ValidAudience = jwtAppSettingOptions.Audience,
 
                 ValidateIssuerSigningKey = true,
-                IssuerSigningKey = signingKey(jwtAppSettingOptions),
-
+                IssuerSigningKey = issuerSigningKey,
+                
                 RequireExpirationTime = true,
                 ValidateLifetime = true,
 

src/ArchitectNow.Web/Configuration/WebApiExtensions.cs

@@ -1,8 +1,6 @@
 using ArchitectNow.Web.Filters;
 using ArchitectNow.Web.Models;
 using FluentValidation.AspNetCore;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;

src/ArchitectNow.Web/StartupSample.cs

@@ -14,7 +14,6 @@
 using Microsoft.Extensions.Logging;
 using Serilog;
 using SwaggerOptions = ArchitectNow.Web.Models.SwaggerOptions;
-using Microsoft.IdentityModel.Tokens;
 using NJsonSchema;
 
 namespace ArchitectNow.Web
@@ -86,7 +85,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             return provider;
         }
 
-        private SecurityKey ConfigureSecurityKey(JwtIssuerOptions issuerOptions)
+        private JwtSigningKey ConfigureSecurityKey(JwtIssuerOptions issuerOptions)
         {
             var keyString = issuerOptions.Audience;
             var keyBytes = Encoding.Unicode.GetBytes(keyString);

src/ArchitectNow.Web/WebModule.cs

@@ -3,8 +3,8 @@
 using ArchitectNow.Web.Services;
 using Autofac;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
 
@@ -19,7 +19,25 @@ protected override void Load(ContainerBuilder builder)
 
             builder.RegisterType<HttpContextAccessor>().As<IHttpContextAccessor>().SingleInstance();
 
-            builder.RegisterType<GlobalExceptionFilter>().AsSelf().InstancePerLifetimeScope();            
+            builder.RegisterType<GlobalExceptionFilter>().AsSelf().InstancePerLifetimeScope();
+
+            builder.Register(context =>
+            {
+                var configuration = context.Resolve<IConfiguration>();
+                var issuerOptions = configuration.GetSection("jwtIssuerOptions").Get<JwtIssuerOptions>();
+
+                var key = context.Resolve<JwtSigningKey>();
+                if (key == null)
+                {
+                    context.Resolve<ILogger<WebModule>>().LogWarning("JwtSigningKey is not defined");
+                }
+                else
+                {
+                    issuerOptions.SigningCredentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256Signature);
+                }
+
+                return new OptionsWrapper<JwtIssuerOptions>(issuerOptions);
+            }).As<IOptions<JwtIssuerOptions>>().InstancePerLifetimeScope();
         }
     }
 }