From 6886752bfd23119ddcc14e2b77822c4f052d35ee Mon Sep 17 00:00:00 2001
From: Adam Letizia <43392371+koalaty-code@users.noreply.github.com>
Date: Mon, 28 Mar 2022 10:01:13 -0500
Subject: [PATCH] chore(deps): Upgrade Nuget packages and fix authorization
 challenge URI (#65)

---
 .../AzureKeyVaultEmulator.AcceptanceTests.csproj          | 8 ++++----
 AzureKeyVaultEmulator/AzureKeyVaultEmulator.csproj        | 4 ++--
 AzureKeyVaultEmulator/Startup.cs                          | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/AzureKeyVaultEmulator.AcceptanceTests/AzureKeyVaultEmulator.AcceptanceTests.csproj b/AzureKeyVaultEmulator.AcceptanceTests/AzureKeyVaultEmulator.AcceptanceTests.csproj
index a628d42..0b3204a 100644
--- a/AzureKeyVaultEmulator.AcceptanceTests/AzureKeyVaultEmulator.AcceptanceTests.csproj
+++ b/AzureKeyVaultEmulator.AcceptanceTests/AzureKeyVaultEmulator.AcceptanceTests.csproj
@@ -7,10 +7,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.2.0" />
-        <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.2.0" />
-        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.14.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Azure.Security.KeyVault.Keys" Version="4.3.0" />
+        <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.3.0" />
+        <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.16.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/AzureKeyVaultEmulator/AzureKeyVaultEmulator.csproj b/AzureKeyVaultEmulator/AzureKeyVaultEmulator.csproj
index db894ab..9dd710a 100644
--- a/AzureKeyVaultEmulator/AzureKeyVaultEmulator.csproj
+++ b/AzureKeyVaultEmulator/AzureKeyVaultEmulator.csproj
@@ -5,9 +5,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.3" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.0" />
     </ItemGroup>
 
 </Project>
diff --git a/AzureKeyVaultEmulator/Startup.cs b/AzureKeyVaultEmulator/Startup.cs
index 08f3b66..28281d5 100644
--- a/AzureKeyVaultEmulator/Startup.cs
+++ b/AzureKeyVaultEmulator/Startup.cs
@@ -1,4 +1,5 @@
 using System.IdentityModel.Tokens.Jwt;
+using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using AzureKeyVaultEmulator.Keys.Services;
 using AzureKeyVaultEmulator.Secrets.Services;
@@ -27,7 +28,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddControllers()
                 .AddJsonOptions(o =>
                 {
-                    o.JsonSerializerOptions.IgnoreNullValues = true;
+                    o.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
                 });
 
             services.AddSwaggerGen(c =>
@@ -63,7 +64,7 @@ public void ConfigureServices(IServiceCollection services)
                         OnChallenge = context =>
                         {
                             context.Response.Headers.Remove("WWW-Authenticate");
-                            context.Response.Headers["WWW-Authenticate"] = "Bearer authorization=\"localhost:5001\", scope=\"foobar\", resource=\"https://some.url\"";
+                            context.Response.Headers["WWW-Authenticate"] = "Bearer authorization=\"https://localhost:5001/foo/bar\", scope=\"foobar\", resource=\"https://some.url\"";
                             return Task.CompletedTask;
                         }
                     };