a fork of iceshrimp.net but a tweaked frontend to my personal liking. waow
fediverse
social-media
social
iceshrimp
fedi
[backend/api] Switch to a shared JsonSerializerOptions object instead of explicitly specifying json property names via attributes
+127
-126
+1
-1
Iceshrimp.Backend/Controllers/Renderers/UserProfileRenderer.cs
+1
-1
Iceshrimp.Backend/Controllers/Renderers/UserProfileRenderer.cs
+16
-1
Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs
+16
-1
Iceshrimp.Backend/Core/Extensions/ServiceExtensions.cs
···
10
10
using Iceshrimp.Backend.Core.Middleware;
11
11
using Iceshrimp.Backend.Core.Services;
12
12
using Iceshrimp.Backend.Hubs.Authentication;
13
+
using Iceshrimp.Shared.Configuration;
13
14
using Microsoft.AspNetCore.Authentication;
14
15
using Microsoft.AspNetCore.DataProtection;
15
16
using Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption;
···
105
106
.ConfigureWithValidation<Config.StorageSection>(configuration, "Storage")
106
107
.ConfigureWithValidation<Config.LocalStorageSection>(configuration, "Storage:Local")
107
108
.ConfigureWithValidation<Config.ObjectStorageSection>(configuration, "Storage:ObjectStorage");
109
+
110
+
services.Configure<Microsoft.AspNetCore.Http.Json.JsonOptions>(options =>
111
+
{
112
+
options.SerializerOptions.PropertyNamingPolicy = JsonSerialization.Options.PropertyNamingPolicy;
113
+
foreach (var converter in JsonSerialization.Options.Converters)
114
+
options.SerializerOptions.Converters.Add(converter);
115
+
});
116
+
117
+
services.Configure<Microsoft.AspNetCore.Mvc.JsonOptions>(options =>
118
+
{
119
+
options.JsonSerializerOptions.PropertyNamingPolicy = JsonSerialization.Options.PropertyNamingPolicy;
120
+
foreach (var converter in JsonSerialization.Options.Converters)
121
+
options.JsonSerializerOptions.Converters.Add(converter);
122
+
});
108
123
}
109
124
110
125
private static IServiceCollection ConfigureWithValidation<T>(
···
260
275
services.AddAuthentication(options =>
261
276
{
262
277
options.AddScheme<HubAuthenticationHandler>("HubAuthenticationScheme", null);
263
-
278
+
264
279
// Add a stub authentication handler to bypass strange ASP.NET Core >=7.0 defaults
265
280
// Ref: https://github.com/dotnet/aspnetcore/issues/44661
266
281
options.AddScheme<IAuthenticationHandler>("StubAuthenticationHandler", null);
+6
-5
Iceshrimp.Frontend/Core/Services/ApiClient.cs
+6
-5
Iceshrimp.Frontend/Core/Services/ApiClient.cs
···
4
4
using System.Text;
5
5
using System.Text.Json;
6
6
using Iceshrimp.Frontend.Core.Miscellaneous;
7
+
using Iceshrimp.Shared.Configuration;
7
8
using Iceshrimp.Shared.Schemas;
8
9
using Microsoft.AspNetCore.Components.Forms;
9
10
using Microsoft.AspNetCore.Http;
···
22
23
if (res.IsSuccessStatusCode)
23
24
return;
24
25
25
-
var error = await res.Content.ReadFromJsonAsync<ErrorResponse>();
26
+
var error = await res.Content.ReadFromJsonAsync<ErrorResponse>(JsonSerialization.Options);
26
27
if (error == null)
27
28
throw new Exception("Deserialized API error was null");
28
29
throw new ApiException(error);
···
61
62
62
63
if (res.IsSuccessStatusCode)
63
64
{
64
-
var deserialized = await res.Content.ReadFromJsonAsync<T>();
65
+
var deserialized = await res.Content.ReadFromJsonAsync<T>(JsonSerialization.Options);
65
66
if (deserialized == null)
66
67
throw new Exception("Deserialized API response was null");
67
68
return (deserialized, null);
68
69
}
69
70
70
-
var error = await res.Content.ReadFromJsonAsync<ErrorResponse>();
71
+
var error = await res.Content.ReadFromJsonAsync<ErrorResponse>(JsonSerialization.Options);
71
72
if (error == null)
72
73
throw new Exception("Deserialized API error was null");
73
74
return (null, error);
···
102
103
}
103
104
else if (data is not null)
104
105
{
105
-
request.Content = new StringContent(JsonSerializer.Serialize(data), Encoding.UTF8,
106
-
MediaTypeNames.Application.Json);
106
+
request.Content = new StringContent(JsonSerializer.Serialize(data, JsonSerialization.Options),
107
+
Encoding.UTF8, MediaTypeNames.Application.Json);
107
108
}
108
109
109
110
return await client.SendAsync(request);