Register and construct IAuthenticationRepository correctly

This commit is contained in:
Mark Monteiro 2020-04-04 19:36:27 -04:00
parent 4daa5436fc
commit a5234dfd88
2 changed files with 4 additions and 15 deletions

View File

@ -254,8 +254,6 @@ namespace Emby.Server.Implementations
/// <value>The user data repository.</value>
private IUserDataManager UserDataManager { get; set; }
private IAuthenticationRepository AuthenticationRepository { get; set; }
/// <summary>
/// Gets the installation manager.
/// </summary>
@ -655,8 +653,7 @@ namespace Emby.Server.Implementations
serviceCollection.AddSingleton<IItemRepository, SqliteItemRepository>();
AuthenticationRepository = GetAuthenticationRepository();
serviceCollection.AddSingleton(AuthenticationRepository);
serviceCollection.AddSingleton<IAuthenticationRepository, AuthenticationRepository>();
serviceCollection.AddSingleton<IUserRepository, SqliteUserRepository>();
@ -755,6 +752,7 @@ namespace Emby.Server.Implementations
_sessionManager = Resolve<ISessionManager>();
_httpServer = Resolve<IHttpServer>();
((AuthenticationRepository)Resolve<IAuthenticationRepository>()).Initialize();
((SqliteUserRepository)Resolve<IUserRepository>()).Initialize();
((ActivityRepository)Resolve<IActivityRepository>()).Initialize();
_displayPreferencesRepository.Initialize();
@ -839,15 +837,6 @@ namespace Emby.Server.Implementations
}
}
private IAuthenticationRepository GetAuthenticationRepository()
{
var repo = new AuthenticationRepository(LoggerFactory, ServerConfigurationManager);
repo.Initialize();
return repo;
}
/// <summary>
/// Dirty hacks.
/// </summary>

View File

@ -15,8 +15,8 @@ namespace Emby.Server.Implementations.Security
{
public class AuthenticationRepository : BaseSqliteRepository, IAuthenticationRepository
{
public AuthenticationRepository(ILoggerFactory loggerFactory, IServerConfigurationManager config)
: base(loggerFactory.CreateLogger(nameof(AuthenticationRepository)))
public AuthenticationRepository(ILogger<AuthenticationRepository> logger, IServerConfigurationManager config)
: base(logger)
{
DbFilePath = Path.Combine(config.ApplicationPaths.DataPath, "authentication.db");
}