chore: merge

.NET 8
NetDevPack · Dec 1, 2023 · 5230767 · 5230767
2 parents 932fdd3 + f8eeb8e
commit 5230767
Show file tree

Hide file tree

Showing 21 changed files with 122 additions and 90 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -28,10 +28,10 @@ jobs:
         with:
           dotnet-version: 7.0.x
 
-      - name: Setup .NET Core 3.1
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 8.0.x
 
       - name: Restore dependencies
         run: dotnet restore 

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -24,10 +24,10 @@ jobs:
         with:
           dotnet-version: 7.0.x
 
-      - name: Setup .NET Core 3.1
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 3.1.x
+          dotnet-version: 8.0.x
 
       - name: Restore dependencies
         run: dotnet restore

diff --git a/samples/1_AspNet.Default/AspNet.Default.csproj b/samples/1_AspNet.Default/AspNet.Default.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Bogus" Version="34.0.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/2_AspNet.Store.EntityFramework/AspNet.Store.EntityFramework.csproj b/samples/2_AspNet.Store.EntityFramework/AspNet.Store.EntityFramework.csproj
@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Bogus" Version="34.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.25.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/2_AspNet.Store.EntityFramework/Properties/launchSettings.json b/samples/2_AspNet.Store.EntityFramework/Properties/launchSettings.json
@@ -9,7 +9,7 @@
     }
   },
   "profiles": {
-    "NetDevPack.Security.Jwt.AspNet.SymetricKey": {
+    "AspNet.Store.EntityFramework": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,

diff --git a/samples/2_AspNet.Store.EntityFramework/appsettings.json b/samples/2_AspNet.Store.EntityFramework/appsettings.json
@@ -1,7 +1,7 @@
 {
   "ConnectionStrings": {
-    //"DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;Initial Catalog=jwks;Integrated Security=SSPI;"
-    "DefaultConnection": "Data Source=localhost;Initial Catalog=jwks;User Id=sa; Password=@Password1;Connection Timeout=60;MultipleActiveResultSets=True;TrustServerCertificate=True"
+    "DefaultConnection": "Data Source=(LocalDb)\\MSSQLLocalDB;Initial Catalog=jwks;Integrated Security=SSPI;"
+    //"DefaultConnection": "Data Source=localhost;Initial Catalog=jwks;User Id=sa; Password=@Password1;Connection Timeout=60;MultipleActiveResultSets=True;TrustServerCertificate=True"
   },
   "Logging": {
     "LogLevel": {

diff --git a/samples/3_IdentityServer4/AspNet.IdentityServer4.csproj b/samples/3_IdentityServer4/AspNet.IdentityServer4.csproj
@@ -1,15 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\NetDevPack.Security.Jwt.AspNetCore\NetDevPack.Security.Jwt.AspNetCore.csproj" />
     <ProjectReference Include="..\..\src\NetDevPack.Security.Jwt.IdentityServer4\NetDevPack.Security.Jwt.IdentityServer4.csproj" />

diff --git a/samples/Microservice.Sample/Api.Sample/Api.Sample.csproj b/samples/Microservice.Sample/Api.Sample/Api.Sample.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
     <PackageReference Include="NetDevPack.Security.JwtExtensions" Version="7.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/Microservice.Sample/Identity/Controllers/AuthController.cs b/samples/Microservice.Sample/Identity/Controllers/AuthController.cs
@@ -119,12 +119,12 @@ private async Task<string> GenerateAccessToken(string? email)
             identityClaims.AddClaim(new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()));
 
             var handler = new JwtSecurityTokenHandler();
-
+            var key = await _jwtService.GetCurrentSigningCredentials();
             var securityToken = handler.CreateToken(new SecurityTokenDescriptor
             {
                 Issuer = "https://www.devstore.academy", // <- Your website
                 Audience = "NetDevPack.Security.Jwt.AspNet",
-                SigningCredentials = await _jwtService.GetCurrentSigningCredentials(),
+                SigningCredentials = key,
                 Subject = identityClaims,
                 NotBefore = DateTime.UtcNow,
                 Expires = DateTime.UtcNow.AddMinutes(60),

diff --git a/samples/Microservice.Sample/Identity/Controllers/ProtectedController.cs b/samples/Microservice.Sample/Identity/Controllers/ProtectedController.cs
@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Identity.Controllers
+{
+    [ApiController]
+    [Route("api/protected"), Authorize]
+    public class ProtectedController : ControllerBase
+    {
+        [HttpGet]
+        public IActionResult Get()
+        {
+            return Ok();
+        }
+    }
+}
diff --git a/samples/Microservice.Sample/Identity/Identity.csproj b/samples/Microservice.Sample/Identity/Identity.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..\..\src</DockerfileContext>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
-       <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Microservice.Sample/Identity/Program.cs b/samples/Microservice.Sample/Identity/Program.cs
@@ -1,4 +1,3 @@
-
 using Identity.Data;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Identity;
@@ -11,9 +10,34 @@
 
 // Add services to the container.
 builder.Services.AddControllers();
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(c =>
+{
+    c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+    {
+        Description = "Bearer {token}",
+        Name = "Authorization",
+        Scheme = "Bearer",
+        BearerFormat = "JWT",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.ApiKey
+    });
+
+    c.AddSecurityRequirement(new OpenApiSecurityRequirement
+    {
+        {
+            new OpenApiSecurityScheme
+            {
+                Reference = new OpenApiReference
+                {
+                    Type = ReferenceType.SecurityScheme,
+                    Id = "Bearer"
+                }
+            },
+            new string[] { }
+        }
+    });
+});
 
 builder.Services
     .AddJwksManager() // <- Use component

diff --git a/src/NetDevPack.Security.Jwt.AspNetCore/JwtPostConfigureOptions.cs b/src/NetDevPack.Security.Jwt.AspNetCore/JwtPostConfigureOptions.cs
@@ -6,16 +6,20 @@ namespace NetDevPack.Security.Jwt.AspNetCore;
 public class JwtPostConfigureOptions : IPostConfigureOptions<JwtBearerOptions>
 {
     private readonly IServiceProvider _serviceProvider;
-    // private readonly MyCustomSecurityTokenValidator _tokenValidator; //example dependancy
 
     public JwtPostConfigureOptions(IServiceProvider serviceProvider)
     {
         _serviceProvider = serviceProvider;
     }
 
-    public void PostConfigure(string name, JwtBearerOptions options)
+    public void PostConfigure(string? name, JwtBearerOptions options)
     {
+#if NET8_0_OR_GREATER
+        options.TokenHandlers.Clear();
+        options.TokenHandlers.Add(new JwtServiceValidationHandler(_serviceProvider));
+#else
         options.SecurityTokenValidators.Clear();
         options.SecurityTokenValidators.Add(new JwtServiceValidationHandler(_serviceProvider));
+#endif
     }
 }
diff --git a/src/NetDevPack.Security.Jwt.AspNetCore/NetDevPack.Security.Jwt.AspNetCore.csproj b/src/NetDevPack.Security.Jwt.AspNetCore/NetDevPack.Security.Jwt.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Authors>Bruno Brito, Eduardo Pires</Authors>
@@ -21,16 +21,14 @@
     <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.2.2" />
   </ItemGroup>
 
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.31" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.25" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.14" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NetDevPack.Security.Jwt.Core/NetDevPack.Security.Jwt.Core.csproj b/src/NetDevPack.Security.Jwt.Core/NetDevPack.Security.Jwt.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>10.0</LangVersion>
     <Authors>Bruno Brito</Authors>
@@ -16,24 +16,29 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.25.0" />
-    <PackageReference Include="System.Text.Json" Version="7.0.1" />
+    <PackageReference Include="System.Text.Json" Version="8.0.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.0.3" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.31" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.31" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="6.0.25" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="7.0.14" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="6.0.16" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
   </ItemGroup>
 
 	<ItemGroup>

diff --git a/src/NetDevPack.Security.Jwt.IdentityServer4/NetDevPack.Security.Jwt.IdentityServer4.csproj b/src/NetDevPack.Security.Jwt.IdentityServer4/NetDevPack.Security.Jwt.IdentityServer4.csproj
diff --git a/...ty.Jwt.Store.EntityFrameworkCore/NetDevPack.Security.Jwt.Store.EntityFrameworkCore.csproj b/...ty.Jwt.Store.EntityFrameworkCore/NetDevPack.Security.Jwt.Store.EntityFrameworkCore.csproj
diff --git a/src/NetDevPack.Security.Jwt.Store.FileSystem/NetDevPack.Security.Jwt.Store.FileSystem.csproj b/src/NetDevPack.Security.Jwt.Store.FileSystem/NetDevPack.Security.Jwt.Store.FileSystem.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>10.0</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

diff --git a/tests/NetDevPack.Security.Jwt.AspNetCoreTests/NetDevPack.Security.Jwt.AspNetCoreTests.csproj b/tests/NetDevPack.Security.Jwt.AspNetCoreTests/NetDevPack.Security.Jwt.AspNetCoreTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,15 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/tests/NetDevPack.Security.Jwt.Tests/JwtTests/JweTests.cs b/tests/NetDevPack.Security.Jwt.Tests/JwtTests/JweTests.cs
@@ -43,7 +43,7 @@ public JweTests(WarmupInMemoryStore warmup)
         [InlineData(EncryptionAlgorithmKey.Aes256KW, EncryptionAlgorithmContent.Aes192CbcHmacSha384)]
         public void ShouldValidateJwe(string algorithm, string encryption)
         {
-
+            //var sKey = new SecurityKey();
             var key = new CryptographicKey(Algorithm.Create(algorithm).WithContentEncryption(encryption));
             var encryptingCredentials = new EncryptingCredentials(key, algorithm, encryption);