Migrate to Microsoft.IdentityModel.JsonWebTokens (#476)

iamcarbon · web-flow · commit 81e125d381d4 · 2024-01-15T19:12:13.000+01:00
* 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
diff --git a/BlazorWasmDemo/Client/BlazorWasmDemo.Client.csproj b/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>
diff --git a/BlazorWasmDemo/Server/BlazorWasmDemo.Server.csproj b/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>
diff --git a/BlazorWasmDemo/Server/Controllers/UserController.cs b/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,
diff --git a/BlazorWasmDemo/Server/Program.cs b/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;
diff --git a/Demo/ConformanceTesting.cs b/Demo/ConformanceTesting.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-
-using Fido2NetLib;
+﻿using Fido2NetLib;
 
 namespace Fido2Demo;
 
diff --git a/Demo/Controller.cs b/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
diff --git a/Demo/Demo.csproj b/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>
diff --git a/Demo/Program.cs b/Demo/Program.cs
@@ -1,7 +1,4 @@
-﻿using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-
-namespace Fido2Demo;
+﻿namespace Fido2Demo;
 
 public class Program
 {
diff --git a/Demo/RouteHelperExtensions.cs b/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;
diff --git a/Demo/Startup.cs b/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;
 
diff --git a/Demo/TestController.cs b/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;
 
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,7 +22,7 @@
   
   <!-- Language + Compiler Settings-->
   <PropertyGroup>
-    <LangVersion>11</LangVersion>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
   
   <!--MISC-->
diff --git a/Src/Fido2.AspNet/DateTimeUtilities.cs b/Src/Fido2.AspNet/DateTimeUtilities.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace Fido2NetLib;
+﻿namespace Fido2NetLib;
 
 internal static class DateTimeUtilities
 {
diff --git a/Src/Fido2.AspNet/DistributedCacheMetadataService.cs b/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;
diff --git a/Src/Fido2.AspNet/Fido2NetLibBuilderExtensions.cs b/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;
diff --git a/Src/Fido2.AspNet/NullMetadataService.cs b/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
 {
diff --git a/Src/Fido2.BlazorWebAssembly/Fido2.BlazorWebAssembly.csproj b/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>
diff --git a/Src/Fido2.Ctap2/Commands/CtapCommand.cs b/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();
diff --git a/Src/Fido2.Ctap2/Helpers/CryptoHelper.cs b/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)
     {
diff --git a/Src/Fido2.Models/AssertionOptions.cs b/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;
diff --git a/Src/Fido2.Models/Base64Url.cs b/Src/Fido2.Models/Base64Url.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Buffers;
+﻿using System.Buffers;
 using System.Buffers.Text;
 
 namespace Fido2NetLib;
diff --git a/Src/Fido2.Models/COSETypes.cs b/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
diff --git a/Src/Fido2.Models/Converters/Base64Converter.cs b/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;
diff --git a/Src/Fido2.Models/Converters/EnumNameMapper.cs b/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;
 
diff --git a/Src/Fido2.Models/Converters/FidoEnumConverter.cs b/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;
 
diff --git a/Src/Fido2.Models/CredentialCreateOptions.cs b/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;
diff --git a/Src/Fido2.Models/Exceptions/Fido2ErrorCode.cs b/Src/Fido2.Models/Exceptions/Fido2ErrorCode.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace Fido2NetLib.Exceptions;
+﻿namespace Fido2NetLib.Exceptions;
 
 [Flags]
 public enum Fido2ErrorCode
diff --git a/Src/Fido2.Models/Exceptions/Fido2VerificationException.cs b/Src/Fido2.Models/Exceptions/Fido2VerificationException.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Runtime.Serialization;
-
-using Fido2NetLib.Exceptions;
+﻿using Fido2NetLib.Exceptions;
 
 namespace Fido2NetLib;
 
diff --git a/Src/Fido2.Models/Fido2Configuration.cs b/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;
 
diff --git a/Src/Fido2.Models/Metadata/AlternativeDescriptions.cs b/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;
 
diff --git a/Src/Fido2.Models/Metadata/MetadataBLOBPayloadEntry.cs b/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;
diff --git a/Src/Fido2.Models/Metadata/MetadataStatement.cs b/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;
diff --git a/Src/Fido2.Models/Metadata/RgbPaletteEntry.cs b/Src/Fido2.Models/Metadata/RgbPaletteEntry.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Text.Json.Serialization;
+﻿using System.Text.Json.Serialization;
 
 namespace Fido2NetLib;
 
diff --git a/Src/Fido2.Models/Metadata/UafVersion.cs b/Src/Fido2.Models/Metadata/UafVersion.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Text.Json.Serialization;
+﻿using System.Text.Json.Serialization;
 
 namespace Fido2NetLib;
 
diff --git a/Src/Fido2.Models/Objects/AuthenticationExtensionsPRFInputs.cs b/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;
 
diff --git a/Src/Fido2.Models/Objects/PublicKeyCredentialDescriptor.cs b/Src/Fido2.Models/Objects/PublicKeyCredentialDescriptor.cs
@@ -1,6 +1,5 @@
 ﻿#nullable enable
 
-using System;
 using System.Text.Json.Serialization;
 
 namespace Fido2NetLib.Objects;
diff --git a/Src/Fido2.Models/Objects/RegisteredPublicKeyCredential.cs b/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;
 
diff --git a/Src/Fido2.Models/StringExtensions.cs b/Src/Fido2.Models/StringExtensions.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace Fido2NetLib;
+﻿namespace Fido2NetLib;
 
 public static class StringExtensions
 {
diff --git a/Src/Fido2/AttestationFormat/AndroidSafetyNet.cs b/Src/Fido2/AttestationFormat/AndroidSafetyNet.cs
diff --git a/Src/Fido2/AttestationFormat/FidoU2f.cs b/Src/Fido2/AttestationFormat/FidoU2f.cs
diff --git a/Src/Fido2/AttestationFormat/Tpm.cs b/Src/Fido2/AttestationFormat/Tpm.cs
diff --git a/Src/Fido2/AttestationFormat/VerifyAttestationRequest.cs b/Src/Fido2/AttestationFormat/VerifyAttestationRequest.cs
diff --git a/Src/Fido2/AuthenticatorAssertionResponse.cs b/Src/Fido2/AuthenticatorAssertionResponse.cs
diff --git a/Src/Fido2/AuthenticatorAttestationResponse.cs b/Src/Fido2/AuthenticatorAttestationResponse.cs
diff --git a/Src/Fido2/Extensions/CryptoUtils.cs b/Src/Fido2/Extensions/CryptoUtils.cs
diff --git a/Src/Fido2/Fido2.csproj b/Src/Fido2/Fido2.csproj
diff --git a/Src/Fido2/Metadata/ConformanceMetadataRepository.cs b/Src/Fido2/Metadata/ConformanceMetadataRepository.cs
diff --git a/Src/Fido2/Metadata/Fido2MetadataServiceRepository.cs b/Src/Fido2/Metadata/Fido2MetadataServiceRepository.cs
diff --git a/Src/Fido2/Objects/DevicePublicKeyAuthenticatorOutput.cs b/Src/Fido2/Objects/DevicePublicKeyAuthenticatorOutput.cs
diff --git a/Test/Attestation/AndroidSafetyNet.cs b/Test/Attestation/AndroidSafetyNet.cs
diff --git a/Test/Extensions/DataHelper.cs b/Test/Extensions/DataHelper.cs
diff --git a/Test/Test.csproj b/Test/Test.csproj
diff --git a/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj b/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj
diff --git a/azure-pipelines.yml b/azure-pipelines.yml

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`builder.Services.AddControllersWithViews();`
`6`	`6`	`builder.Services.AddRazorPages();`
`7`		`-var origin = new Uri(builder.Configuration["Origin"]);`
	`7`	`+var origin = new Uri(builder.Configuration["Origin"]!);`
`8`	`8`	`builder.Services.AddFido2(options =>`
`9`	`9`	`{`
`10`	`10`	`options.ServerDomain = origin.Host;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using Microsoft.AspNetCore.Hosting;`
`2`		`-using Microsoft.Extensions.Hosting;`
`3`		`-`
`4`		`-namespace Fido2Demo;`
	`1`	`+namespace Fido2Demo;`
`5`	`2`
`6`	`3`	`public class Program`
`7`	`4`	`{`