From 7e01cce884b70f4fa1709287bebdd2a85788a962 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Sun, 13 Dec 2020 16:58:28 -0500
Subject: Merge pull request #4716 from OancaAndrei/syncplay-new-auth-policies

(cherry picked from commit 4f6a585424ac8fc66d1f2d5a7fc71a9e85cd23de)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
---
 Jellyfin.Data/Entities/User.cs                     |  4 ++--
 Jellyfin.Data/Enums/SyncPlayAccess.cs              | 23 ------------------
 .../Enums/SyncPlayAccessRequirementType.cs         | 28 ++++++++++++++++++++++
 Jellyfin.Data/Enums/SyncPlayUserAccessType.cs      | 23 ++++++++++++++++++
 4 files changed, 53 insertions(+), 25 deletions(-)
 delete mode 100644 Jellyfin.Data/Enums/SyncPlayAccess.cs
 create mode 100644 Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs
 create mode 100644 Jellyfin.Data/Enums/SyncPlayUserAccessType.cs

(limited to 'Jellyfin.Data')

diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs
index 6d46819143..0fd8cb224f 100644
--- a/Jellyfin.Data/Entities/User.cs
+++ b/Jellyfin.Data/Entities/User.cs
@@ -71,7 +71,7 @@ namespace Jellyfin.Data.Entities
             EnableAutoLogin = false;
             PlayDefaultAudioTrack = true;
             SubtitleMode = SubtitlePlaybackMode.Default;
-            SyncPlayAccess = SyncPlayAccess.CreateAndJoinGroups;
+            SyncPlayAccess = SyncPlayUserAccessType.CreateAndJoinGroups;
 
             AddDefaultPermissions();
             AddDefaultPreferences();
@@ -326,7 +326,7 @@ namespace Jellyfin.Data.Entities
         /// <summary>
         /// Gets or sets the level of sync play permissions this user has.
         /// </summary>
-        public SyncPlayAccess SyncPlayAccess { get; set; }
+        public SyncPlayUserAccessType SyncPlayAccess { get; set; }
 
         /// <summary>
         /// Gets or sets the row version.
diff --git a/Jellyfin.Data/Enums/SyncPlayAccess.cs b/Jellyfin.Data/Enums/SyncPlayAccess.cs
deleted file mode 100644
index 8c13b37a13..0000000000
--- a/Jellyfin.Data/Enums/SyncPlayAccess.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Jellyfin.Data.Enums
-{
-    /// <summary>
-    /// Enum SyncPlayAccess.
-    /// </summary>
-    public enum SyncPlayAccess
-    {
-        /// <summary>
-        /// User can create groups and join them.
-        /// </summary>
-        CreateAndJoinGroups = 0,
-
-        /// <summary>
-        /// User can only join already existing groups.
-        /// </summary>
-        JoinGroups = 1,
-
-        /// <summary>
-        /// SyncPlay is disabled for the user.
-        /// </summary>
-        None = 2
-    }
-}
diff --git a/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs b/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs
new file mode 100644
index 0000000000..8c3e6cb17e
--- /dev/null
+++ b/Jellyfin.Data/Enums/SyncPlayAccessRequirementType.cs
@@ -0,0 +1,28 @@
+namespace Jellyfin.Data.Enums
+{
+    /// <summary>
+    /// Enum SyncPlayAccessRequirementType.
+    /// </summary>
+    public enum SyncPlayAccessRequirementType
+    {
+        /// <summary>
+        /// User must have access to SyncPlay, in some form.
+        /// </summary>
+        HasAccess = 0,
+
+        /// <summary>
+        /// User must be able to create groups.
+        /// </summary>
+        CreateGroup = 1,
+
+        /// <summary>
+        /// User must be able to join groups.
+        /// </summary>
+        JoinGroup = 2,
+
+        /// <summary>
+        /// User must be in a group.
+        /// </summary>
+        IsInGroup = 3
+    }
+}
diff --git a/Jellyfin.Data/Enums/SyncPlayUserAccessType.cs b/Jellyfin.Data/Enums/SyncPlayUserAccessType.cs
new file mode 100644
index 0000000000..030d16fb90
--- /dev/null
+++ b/Jellyfin.Data/Enums/SyncPlayUserAccessType.cs
@@ -0,0 +1,23 @@
+namespace Jellyfin.Data.Enums
+{
+    /// <summary>
+    /// Enum SyncPlayUserAccessType.
+    /// </summary>
+    public enum SyncPlayUserAccessType
+    {
+        /// <summary>
+        /// User can create groups and join them.
+        /// </summary>
+        CreateAndJoinGroups = 0,
+
+        /// <summary>
+        /// User can only join already existing groups.
+        /// </summary>
+        JoinGroups = 1,
+
+        /// <summary>
+        /// SyncPlay is disabled for the user.
+        /// </summary>
+        None = 2
+    }
+}
-- 
cgit v1.2.3