aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Barron <barronpm@gmail.com>2020-05-23 15:33:14 -0400
committerPatrick Barron <barronpm@gmail.com>2020-05-23 15:33:14 -0400
commite8173df9dc67470748c3293745fe3948363373b4 (patch)
tree00fe5d3876993b33f6cdf4add93d2a529336cba1
parent99511b3be8dd63d832336c65b72d0c17efb9bc6b (diff)
Cleanup
-rw-r--r--Jellyfin.Server.Implementations/Users/UserManager.cs2
-rw-r--r--Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs3
2 files changed, 1 insertions, 4 deletions
diff --git a/Jellyfin.Server.Implementations/Users/UserManager.cs b/Jellyfin.Server.Implementations/Users/UserManager.cs
index 62c4b9b87..7c27a3c41 100644
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -2,10 +2,8 @@
using System;
using System.Collections.Generic;
-using System.Diagnostics;
using System.Globalization;
using System.Linq;
-using System.Runtime.InteropServices.ComTypes;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
diff --git a/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs
index a1895247f..a19638abf 100644
--- a/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs
@@ -87,14 +87,13 @@ namespace Jellyfin.Server.Migrations.Routines
policy.PasswordResetProviderId = typeof(DefaultPasswordResetProvider).FullName;
- var user = new User(mockup.Name, policy.AuthenticationProviderId, string.Empty)
+ var user = new User(mockup.Name, policy.AuthenticationProviderId, policy.PasswordResetProviderId)
{
Id = entry[1].ReadGuidFromBlob(),
InternalId = entry[0].ToInt64(),
MaxParentalAgeRating = policy.MaxParentalRating,
EnableUserPreferenceAccess = policy.EnableUserPreferenceAccess,
RemoteClientBitrateLimit = policy.RemoteClientBitrateLimit,
- PasswordResetProviderId = policy.PasswordResetProviderId,
InvalidLoginAttemptCount = policy.InvalidLoginAttemptCount,
LoginAttemptsBeforeLockout = policy.LoginAttemptsBeforeLockout == -1 ? null : new int?(policy.LoginAttemptsBeforeLockout),
SubtitleMode = config.SubtitleMode,