|
@@ -79,6 +79,8 @@ namespace Emby.Server.Implementations.Library
|
|
|
private IAuthenticationProvider[] _authenticationProviders;
|
|
|
private DefaultAuthenticationProvider _defaultAuthenticationProvider;
|
|
|
|
|
|
+ private InvalidAuthProvider _invalidAuthProvider;
|
|
|
+
|
|
|
private IPasswordResetProvider[] _passwordResetProviders;
|
|
|
private DefaultPasswordResetProvider _defaultPasswordResetProvider;
|
|
|
|
|
@@ -141,6 +143,8 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
|
_defaultAuthenticationProvider = _authenticationProviders.OfType<DefaultAuthenticationProvider>().First();
|
|
|
|
|
|
+ _invalidAuthProvider = _authenticationProviders.OfType<InvalidAuthProvider>().First();
|
|
|
+
|
|
|
_passwordResetProviders = passwordResetProviders.ToArray();
|
|
|
|
|
|
_defaultPasswordResetProvider = passwordResetProviders.OfType<DefaultPasswordResetProvider>().First();
|
|
@@ -307,8 +311,7 @@ namespace Emby.Server.Implementations.Library
|
|
|
user = Users
|
|
|
.FirstOrDefault(i => string.Equals(username, i.Name, StringComparison.OrdinalIgnoreCase));
|
|
|
|
|
|
- var hasNewUserPolicy = authenticationProvider as IHasNewUserPolicy;
|
|
|
- if (hasNewUserPolicy != null)
|
|
|
+ if (authenticationProvider is IHasNewUserPolicy hasNewUserPolicy)
|
|
|
{
|
|
|
var policy = hasNewUserPolicy.GetNewUserPolicy();
|
|
|
UpdateUserPolicy(user, policy, true);
|
|
@@ -400,7 +403,9 @@ namespace Emby.Server.Implementations.Library
|
|
|
|
|
|
if (providers.Length == 0)
|
|
|
{
|
|
|
- providers = new IAuthenticationProvider[] { _defaultAuthenticationProvider };
|
|
|
+ // Assign the user to the InvalidAuthProvider since no configured auth provider was valid/found
|
|
|
+ _logger.LogWarning("User {UserName} was found with invalid/missing Authentication Provider {AuthenticationProviderId}. Assigning user to InvalidAuthProvider until this is corrected", user.Name, user.Policy.AuthenticationProviderId);
|
|
|
+ providers = new IAuthenticationProvider[] { _invalidAuthProvider };
|
|
|
}
|
|
|
|
|
|
return providers;
|