Migrate to Microsoft.IdentityModel.JsonWebTokens (#476)

* Enable C# 12

* Migrate to Microsoft.IdentityModel.JsonWebTokens

* Update xunit

* Update Blazer demos to .net8.0

* Update pipelines

* Format code

* Remove unneeded Microsoft.SourceLink.GitHub depedency

* Update Microsoft.VisualStudio.Web.CodeGeneration.Design

* Update Test.Sdk

* Remove unnecessary condition

* Fix nit

* Replace DataHelper.Concat calls with collection expressions

* Format code

* Try to make dotnet format happy

* [Ctap2] Use collection expressions

* Update dependencies

* Update xunit

BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
  <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.13" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.13" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.1" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.1" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>

BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj

@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <Nullable>enable</Nullable>
  <UserSecretsId>d4e312c9-f55a-43e0-b3ea-699aa6421a5c</UserSecretsId>
  <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
  <DockerfileContext>..\..</DockerfileContext>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.13" />
- <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.2" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.1" />
+ <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
  <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+ <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.2.0" />
  </ItemGroup>
 
  <ItemGroup>

BlazorWasmDemo/Server/Controllers/UserController.cs

@@ -168,7 +168,7 @@ public async Task<string> CreateCredentialAsync([FromRoute] string username, [Fr
  SignCount = result.Result.SignCount,
  RegDate = DateTimeOffset.UtcNow,
  AaGuid = result.Result.AaGuid,
- DevicePublicKeys = new List<byte[]> { result.Result.DevicePublicKey },
+ DevicePublicKeys = [result.Result.DevicePublicKey],
  Transports = result.Result.Transports,
  IsBackupEligible = result.Result.IsBackupEligible,
  IsBackedUp = result.Result.IsBackedUp,

BlazorWasmDemo/Server/Program.cs

@@ -4,7 +4,7 @@
 
 builder.Services.AddControllersWithViews();
 builder.Services.AddRazorPages();
-var origin = new Uri(builder.Configuration["Origin"]);
+var origin = new Uri(builder.Configuration["Origin"]!);
 builder.Services.AddFido2(options =>
 {
  options.ServerDomain = origin.Host;

Demo/ConformanceTesting.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-using Fido2NetLib;
+using Fido2NetLib;
 
 namespace Fido2Demo;
 

Demo/Controller.cs

@@ -1,19 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Text;
 
 using Fido2NetLib;
 using Fido2NetLib.Development;
 using Fido2NetLib.Objects;
 
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-using static Fido2NetLib.Fido2;
-
 namespace Fido2Demo;
 
 [Route("api/[controller]")]
@@ -132,7 +124,7 @@ public async Task<JsonResult> MakeCredential([FromBody] AuthenticatorAttestation
  IsBackedUp = success.Result.IsBackedUp,
  AttestationObject = success.Result.AttestationObject,
  AttestationClientDataJson = success.Result.AttestationClientDataJson,
- DevicePublicKeys = new List<byte[]>() { success.Result.DevicePublicKey }
+ DevicePublicKeys = [success.Result.DevicePublicKey]
  });
 
  // 4. return "ok" to the client

Demo/Demo.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <RootNamespace>Fido2Demo</RootNamespace>
  <UserSecretsId>39589262-6aa1-4bde-aaa9-403a7542cf63</UserSecretsId>
  </PropertyGroup>
@@ -13,8 +13,8 @@
  <ProjectReference Include="..\Src\Fido2\Fido2.csproj" />
  </ItemGroup>
 
- <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
- <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
+ <ItemGroup>
+ <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
  </ItemGroup>
 
  <ItemGroup>

Demo/Program.cs

@@ -1,7 +1,4 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-
-namespace Fido2Demo;
+namespace Fido2Demo;
 
 public class Program
 {

Demo/RouteHelperExtensions.cs

@@ -1,8 +1,5 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Rewrite;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Net.Http.Headers;
 
 namespace Fido2Demo;

Demo/Startup.cs

@@ -1,16 +1,7 @@
-using System;
-using System.Collections.Generic;
+using Fido2NetLib;
 
-using Fido2NetLib;
-
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Rewrite;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 
 namespace Fido2Demo;
 

Demo/TestController.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Text;
 
 using Fido2NetLib;
 using Fido2NetLib.Development;
 using Fido2NetLib.Objects;
 
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 

Directory.Build.props

@@ -22,7 +22,7 @@
 
  <!-- Language + Compiler Settings-->
  <PropertyGroup>
- <LangVersion>11</LangVersion>
+ <LangVersion>12</LangVersion>
  </PropertyGroup>
 
  <!--MISC-->

Src/Fido2.AspNet/DateTimeUtilities.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Fido2NetLib;
+namespace Fido2NetLib;
 
 internal static class DateTimeUtilities
 {

Src/Fido2.AspNet/DistributedCacheMetadataService.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Text.Json;
 
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Caching.Memory;

Src/Fido2.AspNet/Fido2NetLibBuilderExtensions.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Net.Http;
-
-using Fido2NetLib;
+using Fido2NetLib;
 
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;

Src/Fido2.AspNet/NullMetadataService.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Fido2NetLib;
+namespace Fido2NetLib;
 
 internal sealed class NullMetadataService : IMetadataService
 {

Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
  <PropertyGroup>
- <TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
+ <TargetFrameworks>net8.0</TargetFrameworks>
  <RootNamespace>Fido2NetLib</RootNamespace>
  <GenerateDocumentationFile>true</GenerateDocumentationFile>
  <Nullable>enable</Nullable>
@@ -22,8 +22,8 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.13" />
- <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="4.9.5">
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
+ <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.3.3">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>

Src/Fido2.Ctap2/Commands/CtapCommand.cs

@@ -14,7 +14,7 @@ public byte[] GetPayload()
 
  if (parameters is null)
  {
- return new byte[] { (byte)Type };
+ return [(byte)Type];
  }
 
  var encodedObject = parameters.Encode();

Src/Fido2.Ctap2/Helpers/CryptoHelper.cs

@@ -6,7 +6,7 @@ namespace Fido2NetLib.Ctap2;
 
 public static class CryptoHelper
 {
- internal static readonly byte[] DefaultIV = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+ internal static ReadOnlySpan<byte> DefaultIV => [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 
  internal static byte[] AesCbcDefaultIvNoPadding(byte[] key, ReadOnlySpan<byte> data)
  {

Src/Fido2.Models/AssertionOptions.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 using Fido2NetLib.Objects;

Src/Fido2.Models/Base64Url.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Buffers;
+using System.Buffers;
 using System.Buffers.Text;
 
 namespace Fido2NetLib;

Src/Fido2.Models/COSETypes.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Fido2NetLib.Objects;
+namespace Fido2NetLib.Objects;
 
 /// <summary>
 /// CBOR Object Signing and Encryption RFC8152 https://tools.ietf.org/html/rfc8152

Src/Fido2.Models/Converters/Base64Converter.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Fido2NetLib;

Src/Fido2.Models/Converters/EnumNameMapper.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Runtime.Serialization;
 

Src/Fido2.Models/Converters/FidoEnumConverter.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 

Src/Fido2.Models/CredentialCreateOptions.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 using Fido2NetLib.Objects;

Src/Fido2.Models/Exceptions/Fido2ErrorCode.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Fido2NetLib.Exceptions;
+namespace Fido2NetLib.Exceptions;
 
 [Flags]
 public enum Fido2ErrorCode

Src/Fido2.Models/Exceptions/Fido2VerificationException.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Runtime.Serialization;
-
-using Fido2NetLib.Exceptions;
+using Fido2NetLib.Exceptions;
 
 namespace Fido2NetLib;
 

Src/Fido2.Models/Fido2Configuration.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace Fido2NetLib;
 

Src/Fido2.Models/Metadata/AlternativeDescriptions.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Fido2NetLib;
 

Src/Fido2.Models/Metadata/MetadataBLOBPayloadEntry.cs

@@ -1,6 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace Fido2NetLib;

Src/Fido2.Models/Metadata/MetadataStatement.cs

@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.Text.Json.Serialization;
 
 namespace Fido2NetLib;

Src/Fido2.Models/Metadata/RgbPaletteEntry.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Fido2NetLib;
 

Src/Fido2.Models/Metadata/UafVersion.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Fido2NetLib;
 

Src/Fido2.Models/Objects/AuthenticationExtensionsPRFInputs.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Fido2NetLib.Objects;
 

Src/Fido2.Models/Objects/PublicKeyCredentialDescriptor.cs

@@ -1,6 +1,5 @@
 #nullable enable
 
-using System;
 using System.Text.Json.Serialization;
 
 namespace Fido2NetLib.Objects;

Src/Fido2.Models/Objects/RegisteredPublicKeyCredential.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Fido2NetLib.Objects;
 

Src/Fido2.Models/StringExtensions.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Fido2NetLib;
+namespace Fido2NetLib;
 
 public static class StringExtensions
 {