nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 21:18:13 -05:00
Code

Change setup validation to use a dto (#1852)

Browse Source
This commit is contained in:
Oscar Hinton 2022-02-09 17:13:21 +01:00 committed by GitHub
parent 1b0d18a7c5
commit 6f2f475aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/Setup/Program.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Globalization; using System.Globalization;
using System.Net.Http; using System.Net.Http;
using System.Text.Json; using System.Net.Http.Json;
using Bit.Migrator; using Bit.Migrator;
namespace Bit.Setup namespace Bit.Setup
@ -272,10 +272,8 @@ namespace Bit.Setup
return false; return false;
} }
var resultString = response.Content.ReadAsStringAsync().GetAwaiter().GetResult(); var result = response.Content.ReadFromJsonAsync<InstallationValidationResponseModel>().GetAwaiter().GetResult();
using var jsonDocument = JsonSerializer.Deserialize<JsonDocument>(resultString); if (!result.Enabled)
var root = jsonDocument.RootElement;
if (!root.GetProperty("Enabled").GetBoolean())
{ {
Console.WriteLine("Installation id has been disabled."); Console.WriteLine("Installation id has been disabled.");
return false; return false;
@ -326,5 +324,10 @@ namespace Bit.Setup
_context.Parameters.Add(_context.Args[i].Substring(1), _context.Args[i + 1]); _context.Parameters.Add(_context.Args[i].Substring(1), _context.Args[i + 1]);
} }
} }
class InstallationValidationResponseModel
{
public bool Enabled { get; init; }
}
} }
} }