diff --git a/Emby.Server.Implementations/Syncplay/SyncplayManager.cs b/Emby.Server.Implementations/Syncplay/SyncplayManager.cs
index f76d243d58..f6311d098f 100644
--- a/Emby.Server.Implementations/Syncplay/SyncplayManager.cs
+++ b/Emby.Server.Implementations/Syncplay/SyncplayManager.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Logging;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Session;
using MediaBrowser.Controller.Syncplay;
+using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Syncplay;
namespace Emby.Server.Implementations.Syncplay
@@ -21,6 +22,11 @@ namespace Emby.Server.Implementations.Syncplay
///
private readonly ILogger _logger;
+ ///
+ /// The user manager.
+ ///
+ private readonly IUserManager _userManager;
+
///
/// The session manager.
///
@@ -42,9 +48,11 @@ namespace Emby.Server.Implementations.Syncplay
public SyncplayManager(
ILogger logger,
+ IUserManager userManager,
ISessionManager sessionManager)
{
_logger = logger;
+ _userManager = userManager;
_sessionManager = sessionManager;
_sessionManager.SessionEnded += _sessionManager_SessionEnded;
@@ -125,8 +133,16 @@ namespace Emby.Server.Implementations.Syncplay
///
public void NewGroup(SessionInfo session)
{
+ var user = _userManager.GetUserById(session.UserId);
+
+ if (user.Policy.SyncplayAccess != SyncplayAccess.CreateAndJoinGroups)
{
+ // TODO: shall an error message be sent back to the client?
+ return;
+ }
+
if (IsSessionInGroup(session))
+ {
LeaveGroup(session);
}
@@ -139,6 +155,14 @@ namespace Emby.Server.Implementations.Syncplay
///
public void JoinGroup(SessionInfo session, string groupId)
{
+ var user = _userManager.GetUserById(session.UserId);
+
+ if (user.Policy.SyncplayAccess == SyncplayAccess.None)
+ {
+ // TODO: shall an error message be sent back to the client?
+ return;
+ }
+
if (IsSessionInGroup(session))
{
if (GetSessionGroup(session).Equals(groupId)) return;
@@ -163,6 +187,8 @@ namespace Emby.Server.Implementations.Syncplay
///
public void LeaveGroup(SessionInfo session)
{
+ // TODO: what happens to users that are in a group and get their permissions revoked?
+
ISyncplayController group;
_sessionToGroupMap.TryGetValue(session.Id, out group);
@@ -186,6 +212,13 @@ namespace Emby.Server.Implementations.Syncplay
///
public List ListGroups(SessionInfo session)
{
+ var user = _userManager.GetUserById(session.UserId);
+
+ if (user.Policy.SyncplayAccess == SyncplayAccess.None)
+ {
+ return new List();
+ }
+
// Filter by playing item if the user is viewing something already
if (session.NowPlayingItem != null)
{
@@ -207,6 +240,14 @@ namespace Emby.Server.Implementations.Syncplay
///
public void HandleRequest(SessionInfo session, SyncplayRequestInfo request)
{
+ var user = _userManager.GetUserById(session.UserId);
+
+ if (user.Policy.SyncplayAccess == SyncplayAccess.None)
+ {
+ // TODO: same as LeaveGroup
+ return;
+ }
+
ISyncplayController group;
_sessionToGroupMap.TryGetValue(session.Id, out group);
diff --git a/MediaBrowser.Model/Configuration/SyncplayAccess.cs b/MediaBrowser.Model/Configuration/SyncplayAccess.cs
new file mode 100644
index 0000000000..cddf68c42d
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/SyncplayAccess.cs
@@ -0,0 +1,23 @@
+namespace MediaBrowser.Model.Configuration
+{
+ ///
+ /// Enum SyncplayAccess.
+ ///
+ public enum SyncplayAccess
+ {
+ ///
+ /// User can create groups and join them.
+ ///
+ CreateAndJoinGroups,
+
+ ///
+ /// User can only join already existing groups.
+ ///
+ JoinGroups,
+
+ ///
+ /// Syncplay is disabled for the user.
+ ///
+ None
+ }
+}
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index ae2b3fd4e9..cf576c3582 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -80,6 +80,12 @@ namespace MediaBrowser.Model.Users
public string AuthenticationProviderId { get; set; }
public string PasswordResetProviderId { get; set; }
+ ///
+ /// Gets or sets a value indicating what Syncplay features the user can access.
+ ///
+ /// Access level to Syncplay features.
+ public SyncplayAccess SyncplayAccess { get; set; }
+
public UserPolicy()
{
IsHidden = true;
@@ -125,6 +131,7 @@ namespace MediaBrowser.Model.Users
EnableContentDownloading = true;
EnablePublicSharing = true;
EnableRemoteAccess = true;
+ SyncplayAccess = SyncplayAccess.CreateAndJoinGroups;
}
}
}