alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 17:14:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

consolidate slideout panels

Browse Source
This commit is contained in:
Luke Pulverenti
2015-05-29 19:51:33 -04:00
parent 81a90a49b3
commit 4e04d31c7d
34 changed files with 171 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Server.Implementations/Session/SessionManager.cs
View File

@@ -1203,22 +1203,22 @@ namespace MediaBrowser.Server.Implementations.Session
/// <param name="userId">The user identifier.</param>
/// <exception cref="System.UnauthorizedAccessException">Cannot modify additional users without authenticating first.</exception>
/// <exception cref="System.ArgumentException">The requested user is already the primary user of the session.</exception>
public void AddAdditionalUser(string sessionId, Guid userId)
public void AddAdditionalUser(string sessionId, string userId)
{
var session = GetSession(sessionId);
if (session.UserId.HasValue && session.UserId.Value == userId)
if (session.UserId.HasValue && session.UserId.Value == new Guid(userId))
{
throw new ArgumentException("The requested user is already the primary user of the session.");
}
if (session.AdditionalUsers.All(i => new Guid(i.UserId) != userId))
if (session.AdditionalUsers.All(i => new Guid(i.UserId) != new Guid(userId)))
{
var user = _userManager.GetUserById(userId);
session.AdditionalUsers.Add(new SessionUserInfo
{
UserId = userId.ToString("N"),
UserId = userId,
UserName = user.Name
});
}
@@ -1231,16 +1231,16 @@ namespace MediaBrowser.Server.Implementations.Session
/// <param name="userId">The user identifier.</param>
/// <exception cref="System.UnauthorizedAccessException">Cannot modify additional users without authenticating first.</exception>
/// <exception cref="System.ArgumentException">The requested user is already the primary user of the session.</exception>
public void RemoveAdditionalUser(string sessionId, Guid userId)
public void RemoveAdditionalUser(string sessionId, string userId)
{
var session = GetSession(sessionId);
if (session.UserId.HasValue && session.UserId.Value == userId)
if (session.UserId.HasValue && session.UserId.Value == new Guid(userId))
{
throw new ArgumentException("The requested user is already the primary user of the session.");
}
var user = session.AdditionalUsers.FirstOrDefault(i => new Guid(i.UserId) == userId);
var user = session.AdditionalUsers.FirstOrDefault(i => new Guid(i.UserId) == new Guid(userId));
if (user != null)
{