Change setup validation to use a dto (#1852)

(cherry picked from commit 6f2f475)
bitwarden · Feb 9, 2022 · 083b01d · 083b01d
1 parent f5484ec
commit 083b01d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
@@ -3,7 +3,7 @@
 using System.Data.SqlClient;
 using System.Globalization;
 using System.Net.Http;
-using System.Text.Json;
+using System.Net.Http.Json;
 using Bit.Migrator;
 
 namespace Bit.Setup
@@ -272,10 +272,8 @@ private static bool ValidateInstallation()
                     return false;
                 }
 
-                var resultString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-                using var jsonDocument = JsonSerializer.Deserialize<JsonDocument>(resultString);
-                var root = jsonDocument.RootElement;
-                if (!root.GetProperty("Enabled").GetBoolean())
+                var result = response.Content.ReadFromJsonAsync<InstallationValidationResponseModel>().GetAwaiter().GetResult();
+                if (!result.Enabled)
                 {
                     Console.WriteLine("Installation id has been disabled.");
                     return false;
@@ -326,5 +324,10 @@ private static void ParseParameters()
                 _context.Parameters.Add(_context.Args[i].Substring(1), _context.Args[i + 1]);
             }
         }
+
+        class InstallationValidationResponseModel
+        {
+            public bool Enabled { get; init; }
+        }
     }
 }