nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-30 07:36:14 -05:00
Code Activity

Fix organization_license not reading camelCase (#1832)

Browse Source 
* Fix organization_license not reading camelCase

* Fix formatting
This commit is contained in:
Justin Baur
2022-02-01 12:26:50 -05:00
committed by GitHub
parent 1b233370eb
commit b47c30d4f4
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Api/Utilities/ApiHelpers.cs
View File

@ -21,15 +21,8 @@ namespace Bit.Api.Utilities
{
try
{
using (var stream = file.OpenReadStream())
using (var reader = new StreamReader(stream))
{
var s = await reader.ReadToEndAsync();
if (!string.IsNullOrWhiteSpace(s))
{
obj = JsonSerializer.Deserialize<T>(s);
}
}
using var stream = file.OpenReadStream();
obj = await JsonSerializer.DeserializeAsync<T>(stream, JsonHelpers.IgnoreCase);
}
catch { }
}

6
src/Core/Utilities/JsonHelpers.cs
View File

@ -9,6 +9,7 @@ namespace Bit.Core.Utilities
{
public static JsonSerializerOptions Default { get; }
public static JsonSerializerOptions Indented { get; }
public static JsonSerializerOptions IgnoreCase { get; }
public static JsonSerializerOptions IgnoreWritingNull { get; }
public static JsonSerializerOptions CamelCase { get; }
public static JsonSerializerOptions IgnoreWritingNullAndCamelCase { get; }
@ -22,6 +23,11 @@ namespace Bit.Core.Utilities
WriteIndented = true,
};
IgnoreCase = new JsonSerializerOptions
{
PropertyNameCaseInsensitive = true,
};
IgnoreWritingNull = new JsonSerializerOptions
{
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,