feat: Update dependencies

me-viper · Sep 28, 2023 · c4d591b · c4d591b
1 parent 8ebdb5d
commit c4d591b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 23 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,25 +1,25 @@
 <Project>
   <ItemGroup>
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
-    <PackageVersion Include="IPNetwork2" Version="2.6.605" />
-    <PackageVersion Include="JetBrains.Annotations" Version="2022.3.1" />
+    <PackageVersion Include="IPNetwork2" Version="2.6.611" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2023.2.0" />
     <PackageVersion Include="JsonPatch.Net" Version="2.1.0" />
-    <PackageVersion Include="JsonSchema.Net" Version="5.1.3" />
+    <PackageVersion Include="JsonSchema.Net" Version="5.2.5" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="OpaDotNet.Compilation.Cli" Version="1.2.0" />
-    <PackageVersion Include="OpaDotNet.Compilation.Interop" Version="1.2.0" />
+    <PackageVersion Include="OpaDotNet.Compilation.Cli" Version="1.3.1" />
+    <PackageVersion Include="OpaDotNet.Compilation.Interop" Version="1.3.1" />
     <PackageVersion Include="Semver" Version="2.3.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.32.1" />
-    <PackageVersion Include="Wasmtime" Version="11.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
-    <PackageVersion Include="xunit" Version="2.5.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.0.1" />
+    <PackageVersion Include="Wasmtime" Version="13.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="xunit" Version="2.5.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
@@ -28,6 +28,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
     <PackageVersion Include="Yaml2JsonNode" Version="1.2.4" />
-    <PackageVersion Include="YamlDotNet" Version="13.2.0" />
+    <PackageVersion Include="YamlDotNet" Version="13.4.0" />
   </ItemGroup>
 </Project>
diff --git a/bench/OpaDotNet.Benchmarks.csproj b/bench/OpaDotNet.Benchmarks.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/docs/snippets/Snippets.cs b/docs/snippets/Snippets.cs
@@ -2,6 +2,9 @@
 
 #pragma warning disable CS0105
 
+
+using OpaDotNet.Compilation.Abstractions;
+
 #region Usings
 
 using OpaDotNet.Wasm;
@@ -167,7 +170,7 @@ public async Task CompileSourceCli()
     {
         #region CompileSourceCli
 
-        var compiler = new RegoCliCompiler();
+        IRegoCompiler compiler = new RegoCliCompiler();
 
         var policySource = """
             package example
@@ -257,7 +260,7 @@ public async Task CompileSourceInterop()
     {
         #region CompileSourceInterop
 
-        var compiler = new RegoInteropCompiler();
+        IRegoCompiler compiler = new RegoInteropCompiler();
 
         var policySource = """
             package example

diff --git a/docs/snippets/Snippets.csproj b/docs/snippets/Snippets.csproj
@@ -8,12 +8,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
-        <PackageReference Include="OpaDotNet.Compilation.Cli" Version="1.1.3" />
-        <PackageReference Include="OpaDotNet.Compilation.Interop" Version="1.1.3" />
-        <PackageReference Include="OpaDotNet.Extensions.AspNetCore" Version="1.0.5"/>
-        <PackageReference Include="xunit" Version="2.5.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="OpaDotNet.Compilation.Cli" Version="1.3.1" />
+        <PackageReference Include="OpaDotNet.Compilation.Interop" Version="1.3.1" />
+        <PackageReference Include="OpaDotNet.Extensions.AspNetCore" Version="1.1.0" />
+        <PackageReference Include="xunit" Version="2.5.1" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/samples/ReferencesValidationPolicy/ReferencesValidationPolicy.csproj b/samples/ReferencesValidationPolicy/ReferencesValidationPolicy.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpaDotNet.Compilation.Cli" Version="1.2.0" />
+    <PackageReference Include="OpaDotNet.Compilation.Cli" Version="1.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpaDotNet.Wasm/DefaultOpaImportsAbi.Jwt.cs b/src/OpaDotNet.Wasm/DefaultOpaImportsAbi.Jwt.cs
@@ -211,8 +211,11 @@ private static string JwtEncodeSign(JsonNode? headers, JsonNode? payload, JsonNo
 
     private static string JwtEncodeSignRaw(string headers, string payload, string key)
     {
-        var jwtPayload = JsonExtensions.DeserializeJwtPayload(payload);
-        var baseHeader = JsonExtensions.DeserializeJwtHeader(headers);
+        var jwtPayload = JwtPayload.Deserialize(payload);
+
+        // System.IdentityModel.Tokens.Jwt 7.0+ removed deserialization helper method we've
+        // been using and didn't provide alternative. So for now using the only one ugly solution available.
+        var baseHeader = JwtHeader.Base64UrlDeserialize(Base64UrlEncoder.Encode(headers));
 
         var jwk = new JsonWebKey(key);
         var alg = baseHeader.Alg ?? jwk.Alg;