Merge pull request #11 from amirhessampourhossein/main

Add setup for JwtBearerOptions
amantinband · Dec 28, 2023 · cdff73c · cdff73c
2 parents 95030ba + c44b3fd
commit cdff73c
Show file tree

Hide file tree

Showing 26 changed files with 57 additions and 50 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
     "rest-client.environmentVariables": {
         "$shared": {
-            "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiTGlvciIsImZhbWlseV9uYW1lIjoiRGFnYW4iLCJlbWFpbCI6Imxpb3JAZGFnYW4uY29tIiwiaWQiOiJhYWU5M2JmNS05ZTNjLTQ3YjMtYWFjZS0zMDM0NjUzYjZiYjIiLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbiIsInBlcm1pc3Npb25zIjpbInNldDpyZW1pbmRlciIsImdldDpyZW1pbmRlciIsImRpc21pc3M6cmVtaW5kZXIiLCJkZWxldGU6cmVtaW5kZXIiLCJjcmVhdGU6c3Vic2NyaXB0aW9uIiwiZGVsZXRlOnN1YnNjcmlwdGlvbiIsImdldDpzdWJzY3JpcHRpb24iXSwiZXhwIjoxNzAzNjA2Njk3LCJpc3MiOiJSZW1pbmRlclNlcnZpY2UiLCJhdWQiOiJSZW1pbmRlclNlcnZpY2UifQ.YhGGMluj3C0n-_UNR_Xs57lJejZde2uGf_3wgWD0eXE",
+            "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYW1lIjoiTGlvciIsImZhbWlseV9uYW1lIjoiRGFnYW4iLCJlbWFpbCI6Imxpb3JAZGFnYW4uY29tIiwiaWQiOiJhYWU5M2JmNS05ZTNjLTQ3YjMtYWFjZS0zMDM0NjUzYjZiYjIiLCJodHRwOi8vc2NoZW1hcy5taWNyb3NvZnQuY29tL3dzLzIwMDgvMDYvaWRlbnRpdHkvY2xhaW1zL3JvbGUiOiJBZG1pbiIsInBlcm1pc3Npb25zIjpbInNldDpyZW1pbmRlciIsImdldDpyZW1pbmRlciIsImRpc21pc3M6cmVtaW5kZXIiLCJkZWxldGU6cmVtaW5kZXIiLCJjcmVhdGU6c3Vic2NyaXB0aW9uIiwiZGVsZXRlOnN1YnNjcmlwdGlvbiIsImdldDpzdWJzY3JpcHRpb24iXSwiZXhwIjoxNzAzNzY0ODA4LCJpc3MiOiJSZW1pbmRlclNlcnZpY2UiLCJhdWQiOiJSZW1pbmRlclNlcnZpY2UifQ.hY4F9MC3jDF-xieCnGtmYrnf1--crcnlmHSAE4_3z2I",
             "userId": "aae93bf5-9e3c-47b3-aace-3034653b6bb2",
             "subscriptionId": "c8ee11f0-d4bb-4b43-a448-d511924b520e",
             "reminderId": "08233bb1-ce29-49e2-b346-5f8b7cf61593"

diff --git a/src/CleanArchitecture.Api/CleanArchitecture.sqlite b/src/CleanArchitecture.Api/CleanArchitecture.sqlite
diff --git a/...leanArchitecture.Application/Reminders/Commands/DismissReminder/DismissReminderCommand.cs b/...leanArchitecture.Application/Reminders/Commands/DismissReminder/DismissReminderCommand.cs
@@ -1,4 +1,3 @@
-using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Application.Common.Security.Permissions;
 using CleanArchitecture.Application.Common.Security.Policies;
 using CleanArchitecture.Application.Common.Security.Request;

diff --git a/src/CleanArchitecture.Application/Reminders/Commands/SetReminder/SetReminderCommand.cs b/src/CleanArchitecture.Application/Reminders/Commands/SetReminder/SetReminderCommand.cs
@@ -1,4 +1,3 @@
-using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Application.Common.Security.Permissions;
 using CleanArchitecture.Application.Common.Security.Policies;
 using CleanArchitecture.Application.Common.Security.Request;

diff --git a/src/CleanArchitecture.Application/Reminders/Queries/GetReminder/GetReminderQuery.cs b/src/CleanArchitecture.Application/Reminders/Queries/GetReminder/GetReminderQuery.cs
@@ -1,4 +1,3 @@
-using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Application.Common.Security.Permissions;
 using CleanArchitecture.Application.Common.Security.Policies;
 using CleanArchitecture.Application.Common.Security.Request;

diff --git a/src/CleanArchitecture.Application/Reminders/Queries/ListReminders/ListRemindersQuery.cs b/src/CleanArchitecture.Application/Reminders/Queries/ListReminders/ListRemindersQuery.cs
@@ -1,4 +1,3 @@
-using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Application.Common.Security.Permissions;
 using CleanArchitecture.Application.Common.Security.Policies;
 using CleanArchitecture.Application.Common.Security.Request;

diff --git a/...ecture.Application/Subscriptions/Commands/CancelSubscription/CancelSubscriptionCommand.cs b/...ecture.Application/Subscriptions/Commands/CancelSubscription/CancelSubscriptionCommand.cs
@@ -1,4 +1,3 @@
-using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Application.Common.Security.Request;
 using CleanArchitecture.Application.Common.Security.Roles;
 

diff --git a/...ecture.Application/Subscriptions/Commands/CreateSubscription/CreateSubscriptionCommand.cs b/...ecture.Application/Subscriptions/Commands/CreateSubscription/CreateSubscriptionCommand.cs
@@ -1,4 +1,3 @@
-using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Application.Common.Security.Permissions;
 using CleanArchitecture.Application.Common.Security.Policies;
 using CleanArchitecture.Application.Common.Security.Request;

diff --git a/...eanArchitecture.Application/Subscriptions/Queries/GetSubscription/GetSubscriptionQuery.cs b/...eanArchitecture.Application/Subscriptions/Queries/GetSubscription/GetSubscriptionQuery.cs
@@ -1,4 +1,3 @@
-using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Application.Common.Security.Permissions;
 using CleanArchitecture.Application.Common.Security.Policies;
 using CleanArchitecture.Application.Common.Security.Request;

diff --git a/...anArchitecture.Infrastructure/Common/Security/CurrentUserProvider/ICurrentUserProvider.cs b/...anArchitecture.Infrastructure/Common/Security/CurrentUserProvider/ICurrentUserProvider.cs
diff --git a/src/CleanArchitecture.Infrastructure/DependencyInjection.cs b/src/CleanArchitecture.Infrastructure/DependencyInjection.cs
@@ -1,25 +1,22 @@
 using System.Net;
 using System.Net.Mail;
-using System.Text;
 
 using CleanArchitecture.Application.Common.Interfaces;
 using CleanArchitecture.Infrastructure.Common;
-using CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
 using CleanArchitecture.Infrastructure.Reminders.BackgroundServices;
 using CleanArchitecture.Infrastructure.Reminders.Persistence;
 using CleanArchitecture.Infrastructure.Security;
 using CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
 using CleanArchitecture.Infrastructure.Security.PolicyEnforcer;
 using CleanArchitecture.Infrastructure.Security.TokenGenerator;
+using CleanArchitecture.Infrastructure.Security.TokenValidation;
 using CleanArchitecture.Infrastructure.Services;
 using CleanArchitecture.Infrastructure.Users.Persistence;
 
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Options;
-using Microsoft.IdentityModel.Tokens;
 
 namespace CleanArchitecture.Infrastructure;
 
@@ -100,24 +97,14 @@ private static IServiceCollection AddAuthorization(this IServiceCollection servi
 
     private static IServiceCollection AddAuthentication(this IServiceCollection services, IConfiguration configuration)
     {
-        var jwtSettings = new JwtSettings();
-        configuration.Bind(JwtSettings.Section, jwtSettings);
+        services.Configure<JwtSettings>(configuration.GetSection(JwtSettings.Section));
 
-        services.AddSingleton(Options.Create(jwtSettings));
         services.AddSingleton<IJwtTokenGenerator, JwtTokenGenerator>();
 
-        services.AddAuthentication(defaultScheme: JwtBearerDefaults.AuthenticationScheme)
-            .AddJwtBearer(options => options.TokenValidationParameters = new TokenValidationParameters
-            {
-                ValidateIssuer = true,
-                ValidateAudience = true,
-                ValidateLifetime = true,
-                ValidateIssuerSigningKey = true,
-                ValidIssuer = jwtSettings.Issuer,
-                ValidAudience = jwtSettings.Audience,
-                IssuerSigningKey = new SymmetricSecurityKey(
-                    Encoding.UTF8.GetBytes(jwtSettings.Secret)),
-            });
+        services
+            .ConfigureOptions<JwtBearerTokenValidationConfiguration>()
+            .AddAuthentication(defaultScheme: JwtBearerDefaults.AuthenticationScheme)
+            .AddJwtBearer();
 
         return services;
     }

diff --git a/...e/Common/Security/AuthorizationService.cs → ...tructure/Security/AuthorizationService.cs b/...e/Common/Security/AuthorizationService.cs → ...tructure/Security/AuthorizationService.cs
@@ -1,6 +1,6 @@
 using CleanArchitecture.Application.Common.Interfaces;
 using CleanArchitecture.Application.Common.Security.Request;
-using CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
+using CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
 using CleanArchitecture.Infrastructure.Security.PolicyEnforcer;
 
 using ErrorOr;

diff --git a/...curity/CurrentUserProvider/CurrentUser.cs → ...curity/CurrentUserProvider/CurrentUser.cs b/...curity/CurrentUserProvider/CurrentUser.cs → ...curity/CurrentUserProvider/CurrentUser.cs
@@ -1,4 +1,4 @@
-namespace CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
+namespace CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
 
 public record CurrentUser(
     Guid Id,

diff --git a/...urrentUserProvider/CurrentUserProvider.cs → ...urrentUserProvider/CurrentUserProvider.cs b/...urrentUserProvider/CurrentUserProvider.cs → ...urrentUserProvider/CurrentUserProvider.cs
@@ -1,8 +1,6 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 
-using CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
-
 using Microsoft.AspNetCore.Http;
 
 using Throw;

diff --git a/src/CleanArchitecture.Infrastructure/Security/CurrentUserProvider/ICurrentUserProvider.cs b/src/CleanArchitecture.Infrastructure/Security/CurrentUserProvider/ICurrentUserProvider.cs
@@ -0,0 +1,6 @@
+namespace CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
+
+public interface ICurrentUserProvider
+{
+    CurrentUser GetCurrentUser();
+}
diff --git a/...ecurity/PolicyEnforcer/IPolicyEnforcer.cs → ...ecurity/PolicyEnforcer/IPolicyEnforcer.cs b/...ecurity/PolicyEnforcer/IPolicyEnforcer.cs → ...ecurity/PolicyEnforcer/IPolicyEnforcer.cs
@@ -1,5 +1,5 @@
 using CleanArchitecture.Application.Common.Security.Request;
-using CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
+using CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
 
 using ErrorOr;
 

diff --git a/...Security/PolicyEnforcer/PolicyEnforcer.cs → ...Security/PolicyEnforcer/PolicyEnforcer.cs b/...Security/PolicyEnforcer/PolicyEnforcer.cs → ...Security/PolicyEnforcer/PolicyEnforcer.cs
@@ -1,7 +1,7 @@
 using CleanArchitecture.Application.Common.Security.Policies;
 using CleanArchitecture.Application.Common.Security.Request;
 using CleanArchitecture.Application.Common.Security.Roles;
-using CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
+using CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
 
 using ErrorOr;
 

diff --git a/...on/Security/TokenGenerator/JwtSettings.cs → ...re/Security/TokenGenerator/JwtSettings.cs b/...on/Security/TokenGenerator/JwtSettings.cs → ...re/Security/TokenGenerator/JwtSettings.cs
diff --git a/...urity/TokenGenerator/JwtTokenGenerator.cs → ...urity/TokenGenerator/JwtTokenGenerator.cs b/...urity/TokenGenerator/JwtTokenGenerator.cs → ...urity/TokenGenerator/JwtTokenGenerator.cs
diff --git a/...itecture.Infrastructure/Security/TokenValidation/JwtBearerTokenValidationConfiguration.cs b/...itecture.Infrastructure/Security/TokenValidation/JwtBearerTokenValidationConfiguration.cs
@@ -0,0 +1,32 @@
+using System.Text;
+
+using CleanArchitecture.Infrastructure.Security.TokenGenerator;
+
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.Extensions.Options;
+using Microsoft.IdentityModel.Tokens;
+
+namespace CleanArchitecture.Infrastructure.Security.TokenValidation;
+
+public sealed class JwtBearerTokenValidationConfiguration(IOptions<JwtSettings> jwtSettings)
+    : IConfigureNamedOptions<JwtBearerOptions>
+{
+    private readonly JwtSettings _jwtSettings = jwtSettings.Value;
+
+    public void Configure(string? name, JwtBearerOptions options) => Configure(options);
+
+    public void Configure(JwtBearerOptions options)
+    {
+        options.TokenValidationParameters = new TokenValidationParameters
+        {
+            ValidateIssuer = true,
+            ValidateAudience = true,
+            ValidateLifetime = true,
+            ValidateIssuerSigningKey = true,
+            ValidIssuer = _jwtSettings.Issuer,
+            ValidAudience = _jwtSettings.Audience,
+            IssuerSigningKey = new SymmetricSecurityKey(
+                Encoding.UTF8.GetBytes(_jwtSettings.Secret)),
+        };
+    }
+}
diff --git a/tests/CleanArchitecture.Application.SubcutaneousTests/Common/WebAppFactory.cs b/tests/CleanArchitecture.Application.SubcutaneousTests/Common/WebAppFactory.cs
@@ -1,6 +1,6 @@
 using CleanArchitecture.Api;
 using CleanArchitecture.Infrastructure.Common;
-using CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
+using CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
 
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
@@ -48,11 +48,11 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
             services
                 .RemoveAll<DbContextOptions<AppDbContext>>()
                 .AddDbContext<AppDbContext>((sp, options) => options.UseSqlite(TestDatabase.Connection));
-
-            builder.ConfigureAppConfiguration((context, conf) => conf.AddInMemoryCollection(new Dictionary<string, string?>
-            {
-                { "EmailSettings:EnableEmailNotifications", "false" },
-            }));
         });
+
+        builder.ConfigureAppConfiguration((context, conf) => conf.AddInMemoryCollection(new Dictionary<string, string?>
+        {
+            { "EmailSettings:EnableEmailNotifications", "false" },
+        }));
     }
 }
diff --git a/tests/CleanArchitecture.Application.SubcutaneousTests/GlobalUsings.cs b/tests/CleanArchitecture.Application.SubcutaneousTests/GlobalUsings.cs
@@ -9,6 +9,5 @@
 global using TestCommon.Reminders;
 global using TestCommon.Security;
 global using TestCommon.Subscriptions;
-global using TestCommon.TestConstants;
 
 global using Xunit;
diff --git a/tests/CleanArchitecture.Application.UnitTests/Common/Behaviors/AuthorizationBehaviorTests.cs b/tests/CleanArchitecture.Application.UnitTests/Common/Behaviors/AuthorizationBehaviorTests.cs
@@ -1,6 +1,5 @@
 using CleanArchitecture.Application.Common.Behaviors;
 using CleanArchitecture.Application.Common.Interfaces;
-using CleanArchitecture.Application.Common.Security;
 using CleanArchitecture.Application.Common.Security.Request;
 
 using MediatR;

diff --git a/tests/TestCommon/Security/CurrentUserFactory.cs b/tests/TestCommon/Security/CurrentUserFactory.cs
@@ -1,4 +1,4 @@
-using CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
+using CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
 
 using TestCommon.TestConstants;
 

diff --git a/tests/TestCommon/Security/TestCurrentUserProvider.cs b/tests/TestCommon/Security/TestCurrentUserProvider.cs
@@ -1,4 +1,4 @@
-using CleanArchitecture.Infrastructure.Common.Security.CurrentUserProvider;
+using CleanArchitecture.Infrastructure.Security.CurrentUserProvider;
 
 namespace TestCommon.Security;
 

diff --git a/tests/TestCommon/Subscriptions/SubscriptionCommandFactory.cs b/tests/TestCommon/Subscriptions/SubscriptionCommandFactory.cs
@@ -1,6 +1,5 @@
 using CleanArchitecture.Application.Subscriptions.Commands.CancelSubscription;
 using CleanArchitecture.Application.Subscriptions.Commands.CreateSubscription;
-using CleanArchitecture.Application.Subscriptions.Queries.GetSubscription;
 using CleanArchitecture.Domain.Users;
 
 using TestCommon.TestConstants;