Fixed build

Author: PascalSenn

src/Backend/src/Authoring.Core/Publishing/Services/PublishingService.cs

@@ -8,7 +8,6 @@
 using Confix.Authoring.Store;
 using Confix.Common.Exceptions;
 using Confix.CryptoProviders;
-using Confix.CryptoProviders.AzureKeyVault;
 using GreenDonut;
 using static Confix.Authentication.Authorization.Permissions;
 

src/Backend/src/Tooling/Tooling.csproj

@@ -13,14 +13,14 @@
 
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine"/>
-    <PackageReference Include="Spectre.Console"/>
-    <PackageReference Include="Spectre.Console.Json"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration"/>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json"/>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
-    <PackageReference Include="Microsoft.Extensions.Http"/>
-    <PackageReference Include="StrawberryShake.Server"/>
+    <PackageReference Include="System.CommandLine" />
+    <PackageReference Include="Spectre.Console" />
+    <PackageReference Include="Spectre.Console.Json" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Http" />
+    <PackageReference Include="StrawberryShake.Server" />
   </ItemGroup>
 
 </Project>

src/Backend/src/Vault.Abstractions/Configuration/Transport/CypherAndIv.cs

@@ -2,14 +2,14 @@
 
 namespace Vault.Host.Configuration.Transport;
 
-public record GetConfigurationResponse(CypherAndIv? Configuration, string? Error)
+public record GetConfigurationResponse(JsonDocument? Configuration, string? Error)
 {
     public static GetConfigurationResponse FromError(string error)
     {
         return new GetConfigurationResponse(null, error);
     }
 
-    public static GetConfigurationResponse FromSuccess(CypherAndIv content)
+    public static GetConfigurationResponse FromSuccess(JsonDocument content)
     {
         return new GetConfigurationResponse(content, null);
     }

src/Backend/src/Vault.Abstractions/Configuration/Transport/GetConfigurationResponse.cs

@@ -75,7 +75,7 @@ public async Task RefreshAsync(
         await RequestAsync<RefreshConfigurationResponse>(client, request, cancellationToken);
     }
 
-    public async Task<CypherAndIv?> GetAsync(
+    public async Task<JsonDocument?> GetAsync(
         string applicationName,
         string applicationPartName,
         string environmentName,

src/Backend/src/Vault.Client/ConfigurationClient.cs

@@ -1,6 +1,5 @@
 using System.Text.Json;
 using Confix.Vault.Abstractions;
-using Vault.Host.Configuration.Transport;
 
 namespace Confix.Vault.Client;
 
@@ -13,7 +12,7 @@ Task<TokenPair> CreateAsync(
         string configuration,
         CancellationToken cancellationToken);
 
-    Task<CypherAndIv?> GetAsync(
+    Task<JsonDocument?> GetAsync(
         string applicationName,
         string applicationPartName,
         string environmentName,

src/Backend/src/Vault.Client/IConfigurationClient.cs

@@ -180,11 +180,7 @@ private static void UpdateLocalConfiguration(
         // we use the vault client to load the configuration from the vault. The configuration
         // provider only has a synchronous interface so we need to use the GetAwaiter().GetResult().
         // Not nice but it works.
-        var client = VaultClientFactory.CreateClient(vaultToken);
-        var response = client
-            .GetAsync(applicationName, partName, environment, vaultToken, CancellationToken.None)
-            .GetAwaiter()
-            .GetResult();
+        var response = FetchVaultConfig(applicationName, partName, environment, vaultToken);
 
         if (response is not var (cypher, iv))
         {
@@ -203,6 +199,34 @@ private static void UpdateLocalConfiguration(
 
             return null;
         }
+
+        static CypherAndIv? FetchVaultConfig(
+            string applicationName,
+            string partName,
+            string environment,
+            string vaultToken)
+        {
+            try
+            {
+                var client = VaultClientFactory.CreateClient(vaultToken);
+                var ct = CancellationToken.None;
+                var response = client
+                    .GetAsync(applicationName, partName, environment, vaultToken, ct)
+                    .GetAwaiter()
+                    .GetResult();
+
+                if (response is null)
+                {
+                    return null;
+                }
+
+                return response.Deserialize<CypherAndIv>();
+            }
+            catch
+            {
+                return null;
+            }
+        }
     }
 
     private static IDataProtector CreateProtector() => new ServiceCollection().AddDataProtection()

src/Backend/src/Vault.Configuration/VaulConfigurationProvider.cs

@@ -28,11 +28,8 @@
 var token = ReadLine(cancellationToken);
 
 Console.WriteLine("Fetching...");
-using var response = await client.GetAsync(applicationName,
-    applicationPartName,
-    environmentName,
-    token,
-    cancellationToken);
+using var response = await client
+    .GetAsync(applicationName, applicationPartName, environmentName, token, cancellationToken);
 
 Console.WriteLine("Response...");