From 5a658cf260c18c8f17e2ffc02af43832b9076a53 Mon Sep 17 00:00:00 2001
From: ZadenRB <zaden.ruggieroboune@gmail.com>
Date: Sun, 12 Apr 2020 19:17:46 -0600
Subject: Fix casing of JSON in Jellyfin API. Currently only affects startup
 wizard.

---
 Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs')

diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index dd4f9cd23..8e124d070 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -71,6 +71,10 @@ namespace Jellyfin.Server.Extensions
                 // Clear app parts to avoid other assemblies being picked up
                 .ConfigureApplicationPartManager(a => a.ApplicationParts.Clear())
                 .AddApplicationPart(typeof(StartupController).Assembly)
+                .AddJsonOptions(options => 
+                {
+                    options.JsonSerializerOptions.PropertyNamingPolicy = null;
+                })
                 .AddControllersAsServices();
         }
 
-- 
cgit v1.2.3


From 72862d7b46a1656f7d798cf13e66f3cd6b820866 Mon Sep 17 00:00:00 2001
From: ZadenRB <zaden.ruggieroboune@gmail.com>
Date: Wed, 15 Apr 2020 00:24:15 -0600
Subject: Lowercase actual parameters in code and remove whitespace to comply
 with StyleCopAnalyzers

---
 Jellyfin.Api/Controllers/StartupController.cs          | 18 +++++++++---------
 .../Extensions/ApiServiceCollectionExtensions.cs       |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs')

diff --git a/Jellyfin.Api/Controllers/StartupController.cs b/Jellyfin.Api/Controllers/StartupController.cs
index 1e490faae..afc9b8f3d 100644
--- a/Jellyfin.Api/Controllers/StartupController.cs
+++ b/Jellyfin.Api/Controllers/StartupController.cs
@@ -60,18 +60,18 @@ namespace Jellyfin.Api.Controllers
         /// <summary>
         /// Endpoint for updating the initial startup wizard configuration.
         /// </summary>
-        /// <param name="UICulture">The UI language culture.</param>
-        /// <param name="MetadataCountryCode">The metadata country code.</param>
-        /// <param name="PreferredMetadataLanguage">The preferred language for metadata.</param>
+        /// <param name="uiCulture">The UI language culture.</param>
+        /// <param name="metadataCountryCode">The metadata country code.</param>
+        /// <param name="preferredMetadataLanguage">The preferred language for metadata.</param>
         [HttpPost("Configuration")]
         public void UpdateInitialConfiguration(
-            [FromForm] string UICulture,
-            [FromForm] string MetadataCountryCode,
-            [FromForm] string PreferredMetadataLanguage)
+            [FromForm] string uiCulture,
+            [FromForm] string metadataCountryCode,
+            [FromForm] string preferredMetadataLanguage)
         {
-            _config.Configuration.UICulture = UICulture;
-            _config.Configuration.MetadataCountryCode = MetadataCountryCode;
-            _config.Configuration.PreferredMetadataLanguage = PreferredMetadataLanguage;
+            _config.Configuration.UICulture = uiCulture;
+            _config.Configuration.MetadataCountryCode = metadataCountryCode;
+            _config.Configuration.PreferredMetadataLanguage = preferredMetadataLanguage;
             _config.SaveConfiguration();
         }
 
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index 8e124d070..0347511e6 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -71,7 +71,7 @@ namespace Jellyfin.Server.Extensions
                 // Clear app parts to avoid other assemblies being picked up
                 .ConfigureApplicationPartManager(a => a.ApplicationParts.Clear())
                 .AddApplicationPart(typeof(StartupController).Assembly)
-                .AddJsonOptions(options => 
+                .AddJsonOptions(options =>
                 {
                     options.JsonSerializerOptions.PropertyNamingPolicy = null;
                 })
-- 
cgit v1.2.3


From bb288e16cce65fdf48b673204b7e67b94b21c034 Mon Sep 17 00:00:00 2001
From: ZadenRB <zaden.ruggieroboune@gmail.com>
Date: Wed, 15 Apr 2020 17:02:43 -0600
Subject: Document JSON options change

---
 Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs')

diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index 0347511e6..71ef9a69a 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -73,6 +73,7 @@ namespace Jellyfin.Server.Extensions
                 .AddApplicationPart(typeof(StartupController).Assembly)
                 .AddJsonOptions(options =>
                 {
+                    // Setting the naming policy to null leaves the property names as-is when serializing objects to JSON.
                     options.JsonSerializerOptions.PropertyNamingPolicy = null;
                 })
                 .AddControllersAsServices();
-- 
cgit v1.2.3