From 1ee87901897290e971c2c65020f5576c08b0dc43 Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Thu, 23 Jul 2020 21:50:41 -0400
Subject: [PATCH 1/2] Use System.Text.Json in DefaultPasswordResetProvider

---
 .../Users/DefaultPasswordResetProvider.cs          | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs b/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
index 007c296436..9b0201bfbf 100644
--- a/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Security.Cryptography;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Common;
@@ -11,7 +12,6 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Users;
 
 namespace Jellyfin.Server.Implementations.Users
@@ -23,7 +23,6 @@ namespace Jellyfin.Server.Implementations.Users
     {
         private const string BaseResetFileName = "passwordreset";
 
-        private readonly IJsonSerializer _jsonSerializer;
         private readonly IApplicationHost _appHost;
 
         private readonly string _passwordResetFileBase;
@@ -33,16 +32,11 @@ namespace Jellyfin.Server.Implementations.Users
         /// Initializes a new instance of the <see cref="DefaultPasswordResetProvider"/> class.
         /// </summary>
         /// <param name="configurationManager">The configuration manager.</param>
-        /// <param name="jsonSerializer">The JSON serializer.</param>
         /// <param name="appHost">The application host.</param>
-        public DefaultPasswordResetProvider(
-            IServerConfigurationManager configurationManager,
-            IJsonSerializer jsonSerializer,
-            IApplicationHost appHost)
+        public DefaultPasswordResetProvider(IServerConfigurationManager configurationManager, IApplicationHost appHost)
         {
             _passwordResetFileBaseDir = configurationManager.ApplicationPaths.ProgramDataPath;
             _passwordResetFileBase = Path.Combine(_passwordResetFileBaseDir, BaseResetFileName);
-            _jsonSerializer = jsonSerializer;
             _appHost = appHost;
             // TODO: Remove the circular dependency on UserManager
         }
@@ -63,7 +57,7 @@ namespace Jellyfin.Server.Implementations.Users
                 SerializablePasswordReset spr;
                 await using (var str = File.OpenRead(resetFile))
                 {
-                    spr = await _jsonSerializer.DeserializeFromStreamAsync<SerializablePasswordReset>(str).ConfigureAwait(false);
+                    spr = await JsonSerializer.DeserializeAsync<SerializablePasswordReset>(str).ConfigureAwait(false);
                 }
 
                 if (spr.ExpirationDate < DateTime.UtcNow)
@@ -119,7 +113,7 @@ namespace Jellyfin.Server.Implementations.Users
 
             await using (FileStream fileStream = File.OpenWrite(filePath))
             {
-                _jsonSerializer.SerializeToStream(spr, fileStream);
+                fileStream.Write(JsonSerializer.SerializeToUtf8Bytes(spr));
                 await fileStream.FlushAsync().ConfigureAwait(false);
             }
 

From 1aa853067a5b6daf54bfd01b38e4a4c8256d07c3 Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Sat, 25 Jul 2020 13:07:12 -0400
Subject: [PATCH 2/2] Use async json serialization.

---
 .../Users/DefaultPasswordResetProvider.cs                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs b/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
index 9b0201bfbf..6cb13cd23e 100644
--- a/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/DefaultPasswordResetProvider.cs
@@ -113,7 +113,7 @@ namespace Jellyfin.Server.Implementations.Users
 
             await using (FileStream fileStream = File.OpenWrite(filePath))
             {
-                fileStream.Write(JsonSerializer.SerializeToUtf8Bytes(spr));
+                await JsonSerializer.SerializeAsync(fileStream, spr).ConfigureAwait(false);
                 await fileStream.FlushAsync().ConfigureAwait(false);
             }