diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
index cb965c3f91..7a984fc002 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
private SQLiteConnection _connection;
private readonly ILogger _logger;
-
+
///
/// Gets the name of the repository
///
@@ -192,7 +192,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
var idParam = cmd.Parameters.Add("@id", DbType.Guid);
idParam.Value = displayPreferencesId;
- using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
+ using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow))
{
if (reader.Read())
{
@@ -203,7 +203,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
}
}
- return null;
+ return new DisplayPreferences { Id = displayPreferencesId };
}
///
diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfo.cs b/MediaBrowser.WebDashboard/Api/DashboardInfo.cs
index 48670eb83a..3935c29de9 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardInfo.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardInfo.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Session;
+using MediaBrowser.Model.Session;
using MediaBrowser.Model.System;
using MediaBrowser.Model.Tasks;
using System;
@@ -34,12 +33,6 @@ namespace MediaBrowser.WebDashboard.Api
///
/// The active connections.
public SessionInfoDto[] ActiveConnections { get; set; }
-
- ///
- /// Gets or sets the users.
- ///
- /// The users.
- public UserDto[] Users { get; set; }
}
}
diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
index 30eabb63dd..4b19ceaf26 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
@@ -30,11 +30,6 @@ namespace MediaBrowser.WebDashboard.Api
/// The task manager.
private readonly ITaskManager _taskManager;
- ///
- /// The _user manager
- ///
- private readonly IUserManager _userManager;
- private readonly ILibraryManager _libraryManager;
private readonly ISessionManager _sessionManager;
///
@@ -43,15 +38,12 @@ namespace MediaBrowser.WebDashboard.Api
/// The app host.
/// The logger.
/// The task manager.
- /// The user manager.
- /// The library manager.
- public DashboardInfoWebSocketListener(IServerApplicationHost appHost, ILogger logger, ITaskManager taskManager, IUserManager userManager, ILibraryManager libraryManager, ISessionManager sessionManager)
+ /// The session manager.
+ public DashboardInfoWebSocketListener(IServerApplicationHost appHost, ILogger logger, ITaskManager taskManager, ISessionManager sessionManager)
: base(logger)
{
_appHost = appHost;
_taskManager = taskManager;
- _userManager = userManager;
- _libraryManager = libraryManager;
_sessionManager = sessionManager;
}
@@ -62,7 +54,7 @@ namespace MediaBrowser.WebDashboard.Api
/// Task{IEnumerable{TaskInfo}}.
protected override Task GetDataToSend(object state)
{
- return DashboardService.GetDashboardInfo(_appHost, Logger, _taskManager, _userManager, _libraryManager, _sessionManager);
+ return Task.FromResult(DashboardService.GetDashboardInfo(_appHost, _taskManager, _sessionManager));
}
}
}
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index cfca97f237..a58d5affcd 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -107,19 +107,10 @@ namespace MediaBrowser.WebDashboard.Api
/// The task manager.
private readonly ITaskManager _taskManager;
- ///
- /// The _user manager
- ///
- private readonly IUserManager _userManager;
-
///
/// The _app host
///
private readonly IServerApplicationHost _appHost;
- ///
- /// The _library manager
- ///
- private readonly ILibraryManager _libraryManager;
///
/// The _server configuration manager
@@ -132,16 +123,13 @@ namespace MediaBrowser.WebDashboard.Api
/// Initializes a new instance of the class.
///
/// The task manager.
- /// The user manager.
/// The app host.
- /// The library manager.
/// The server configuration manager.
- public DashboardService(ITaskManager taskManager, IUserManager userManager, IServerApplicationHost appHost, ILibraryManager libraryManager, IServerConfigurationManager serverConfigurationManager, ISessionManager sessionManager)
+ /// The session manager.
+ public DashboardService(ITaskManager taskManager, IServerApplicationHost appHost, IServerConfigurationManager serverConfigurationManager, ISessionManager sessionManager)
{
_taskManager = taskManager;
- _userManager = userManager;
_appHost = appHost;
- _libraryManager = libraryManager;
_serverConfigurationManager = serverConfigurationManager;
_sessionManager = sessionManager;
}
@@ -182,7 +170,7 @@ namespace MediaBrowser.WebDashboard.Api
/// System.Object.
public object Get(GetDashboardInfo request)
{
- var result = GetDashboardInfo(_appHost, Logger, _taskManager, _userManager, _libraryManager, _sessionManager).Result;
+ var result = GetDashboardInfo(_appHost, _taskManager, _sessionManager);
return ResultFactory.GetOptimizedResult(RequestContext, result);
}
@@ -191,27 +179,15 @@ namespace MediaBrowser.WebDashboard.Api
/// Gets the dashboard info.
///
/// The app host.
- /// The logger.
/// The task manager.
- /// The user manager.
- /// The library manager.
/// The connection manager.
/// DashboardInfo.
- public static async Task GetDashboardInfo(IServerApplicationHost appHost,
- ILogger logger,
+ public static DashboardInfo GetDashboardInfo(IServerApplicationHost appHost,
ITaskManager taskManager,
- IUserManager userManager,
- ILibraryManager libraryManager,
ISessionManager connectionManager)
{
var connections = connectionManager.Sessions.Where(i => i.IsActive).ToArray();
- var dtoBuilder = new UserDtoBuilder(logger);
-
- var tasks = userManager.Users.Where(u => connections.Any(c => c.User != null && c.User.Id == u.Id)).Select(dtoBuilder.GetUserDto);
-
- var users = await Task.WhenAll(tasks).ConfigureAwait(false);
-
return new DashboardInfo
{
SystemInfo = appHost.GetSystemInfo(),
@@ -222,9 +198,7 @@ namespace MediaBrowser.WebDashboard.Api
ApplicationUpdateTaskId = taskManager.ScheduledTasks.First(t => t.ScheduledTask.GetType().Name.Equals("SystemUpdateTask", StringComparison.OrdinalIgnoreCase)).Id,
- ActiveConnections = connections.Select(SessionInfoDtoBuilder.GetSessionInfoDto).ToArray(),
-
- Users = users.ToArray()
+ ActiveConnections = connections.Select(SessionInfoDtoBuilder.GetSessionInfoDto).ToArray()
};
}