alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-19 04:34:18 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix circular dependency

Browse Source
This commit is contained in:
Patrick Barron
2020-06-20 17:58:09 -04:00
parent 3b085f6a03
commit 303c175714
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Jellyfin.Server.Implementations/Users/UserManager.cs
View File

@@ -54,17 +54,13 @@ namespace Jellyfin.Server.Implementations.Users
/// <param name="appHost">The application host.</param>
/// <param name="imageProcessor">The image processor.</param>
/// <param name="logger">The logger.</param>
/// <param name="passwordResetProviders">A function that returns available password reset providers.</param>
/// <param name="authenticationProviders">A function that returns available authentication providers.</param>
public UserManager(
JellyfinDbProvider dbProvider,
ICryptoProvider cryptoProvider,
INetworkManager networkManager,
IApplicationHost appHost,
IImageProcessor imageProcessor,
ILogger<UserManager> logger,
Func<IReadOnlyCollection<IPasswordResetProvider>> passwordResetProviders,
Func<IReadOnlyCollection<IAuthenticationProvider>> authenticationProviders)
ILogger<UserManager> logger)
{
_dbProvider = dbProvider;
_cryptoProvider = cryptoProvider;
@@ -73,8 +69,8 @@ namespace Jellyfin.Server.Implementations.Users
_imageProcessor = imageProcessor;
_logger = logger;
_passwordResetProviders = passwordResetProviders.Invoke();
_authenticationProviders = authenticationProviders.Invoke();
_passwordResetProviders = appHost.GetExports<IPasswordResetProvider>();
_authenticationProviders = appHost.GetExports<IAuthenticationProvider>();
_invalidAuthProvider = _authenticationProviders.OfType<InvalidAuthProvider>().First();
_defaultAuthenticationProvider = _authenticationProviders.OfType<DefaultAuthenticationProvider>().First();
@@ -537,7 +533,12 @@ namespace Jellyfin.Server.Implementations.Users
if (user != null && isInNetwork)
{
var passwordResetProvider = GetPasswordResetProvider(user);
return await passwordResetProvider.StartForgotPasswordProcess(user, isInNetwork).ConfigureAwait(false);
var result = await passwordResetProvider
.StartForgotPasswordProcess(user, isInNetwork)
.ConfigureAwait(false);
await UpdateUserAsync(user).ConfigureAwait(false);
return result;
}
return new ForgotPasswordResult