Added missing fields for a wrapped response. Changed awaiting mechanism for getting product ID's. Added check for a null response.

Author: joevanwanzeeleKF

hashicorp-vault-cagateway/APIProxy/WrappedResponse.cs

@@ -12,6 +12,9 @@ namespace Keyfactor.Extensions.CAPlugin.HashicorpVault.APIProxy
 {
     public class WrappedResponse<T>
     {
+        [JsonPropertyName("request_id")]
+        public string RequestId { get; set; }
+
         [JsonPropertyName("lease_id")]
         public string LeaseId { get; set; }
 
@@ -30,6 +33,9 @@ public class WrappedResponse<T>
         [JsonPropertyName("mount_point")]
         public string MountPoint { get; set; }
 
+        [JsonPropertyName("mount_type")]
+        public string MountType { get; set; }
+
         [JsonPropertyName("mount_running_plugin_version")]
         public string PluginVersion { get; set; }
 

hashicorp-vault-cagateway/Client/VaultHttp.cs

@@ -89,10 +89,11 @@ public async Task<T> GetAsync<T>(string path, Dictionary<string, string> paramet
                 if (string.IsNullOrEmpty(response.Content)) throw new Exception(response.ErrorMessage ?? "no content returned from Vault");
 
                 logger.LogTrace($"deserializing the response into a {typeof(T)}");
-                var serialized = JsonConvert.DeserializeObject<T>(response.Content);
+                var deserialized = JsonConvert.DeserializeObject<T>(response.Content);
 
                 logger.LogTrace($"successfully deserialized the reponse");
-                return serialized;
+                
+                return deserialized;
             }
             catch (Exception ex)
             {
@@ -120,7 +121,7 @@ public async Task<T> PostAsync<T>(string path, dynamic parameters = default)
                 if (parameters != null)
                 {
                     string serializedParams = JsonConvert.SerializeObject(parameters);
-                    logger.LogTrace($"serialized parameters (from {parameters.GetType()?.Name}): {serializedParams}");
+                    logger.LogTrace($"deserialized parameters (from {parameters.GetType()?.Name}): {serializedParams}");
                     request.AddJsonBody(serializedParams);
                 }
 

hashicorp-vault-cagateway/HashicorpVaultCAConnector.cs

@@ -440,7 +440,7 @@ public async Task ValidateCAConnectionInfo(Dictionary<string, object> connection
             {
                 logger.LogTrace("making an authenticated request to the Vault server to verify credentials (listing role names)..");
                 var roleNames = await _client.GetRoleNamesAsync();
-                logger.LogTrace($"successfule request: received a response containing {roleNames.Count} role names");
+                logger.LogTrace($"successful request: received a response containing {roleNames?.Count} role names");
             }
             catch (Exception ex)
             {
@@ -583,7 +583,10 @@ public List<string> GetProductIds()
             try
             {
                 logger.LogTrace("requesting role names from vault..");
-                var roleNames = _client.GetRoleNamesAsync().Result;
+                var roleNames = _client.GetRoleNamesAsync().GetAwaiter().GetResult();
+                if (roleNames == null) {
+                    throw new Exception("no role names returned, or deserialization failed.");
+                }
                 logger.LogTrace($"got {roleNames.Count} role names from vault:");
                 foreach (var name in roleNames)
                 {