change show-draft permissions to be configurable

2sic/2sxc#3394
2sic · Jun 3, 2024 · 46ce735 · 46ce735
1 parent 04b0214
commit 46ce735
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 18 deletions.
diff --git a/ToSic.Eav.Apps/Eav.Context/Internal/ContextOfApp.cs b/ToSic.Eav.Apps/Eav.Context/Internal/ContextOfApp.cs
@@ -77,8 +77,8 @@ protected virtual IAppIdentity AppIdentity
 
     #region User Permissions / May Edit
 
-    AdminPermissions IContextOfUserPermissions.Permissions => _permissions ??= new(UserMayEdit || User.IsContentAdmin, UserMayAdmin);
-    private AdminPermissions _permissions;
+    EffectivePermissions IContextOfUserPermissions.Permissions => _permissions ??= new(isSiteAdmin: UserMayAdmin, isContentAdmin: UserMayEdit || User.IsContentAdmin);
+    private EffectivePermissions _permissions;
 
     private bool UserMayEdit => _userMayEditGet.Get(() => Log.GetterM(() =>
     {

diff --git a/ToSic.Eav.Apps/Eav.Context/Internal/ContextOfSite.cs b/ToSic.Eav.Apps/Eav.Context/Internal/ContextOfSite.cs
@@ -51,8 +51,9 @@ protected ContextOfSite(MyServicesBase<MyServices> services, string logName) : b
         return u.IsSystemAdmin || u.IsSiteAdmin || u.IsSiteDeveloper;
     });
 
-    AdminPermissions IContextOfUserPermissions.Permissions => _permissions ??= UserMayAdmin.Map(mayAdmin => new AdminPermissions(mayAdmin || (User?.IsContentAdmin ?? false), mayAdmin));
-    private AdminPermissions _permissions;
+    EffectivePermissions IContextOfUserPermissions.Permissions => _permissions
+        ??= UserMayAdmin.Map(mayAdmin => new EffectivePermissions(isSiteAdmin: mayAdmin, isContentAdmin: mayAdmin || (User?.IsContentAdmin ?? false)));
+    private EffectivePermissions _permissions;
 
     /// <inheritdoc />
     public IContextOfSite Clone(ILog parentLog) => new ContextOfSite(Services, Log.NameId).LinkLog(parentLog);

diff --git a/ToSic.Eav.Core/Context/ContextOfUserPermissions.cs b/ToSic.Eav.Core/Context/ContextOfUserPermissions.cs
@@ -8,14 +8,14 @@ namespace ToSic.Eav.Context;
 /// </summary>
 internal class ContextOfUserPermissions(IUser user) : ServiceBase("Eav.CtxSec"), IContextOfUserPermissions
 {
-    AdminPermissions IContextOfUserPermissions.Permissions => _permissions ??= GetPermissions();
-    private AdminPermissions _permissions;
+    EffectivePermissions IContextOfUserPermissions.Permissions => _permissions ??= GetPermissions();
+    private EffectivePermissions _permissions;
 
-    private AdminPermissions GetPermissions()
+    private EffectivePermissions GetPermissions()
     {
         var userIsSiteAdmin = UserMayAdmin();
         var isContentAdmin = userIsSiteAdmin || (user?.IsContentAdmin ?? false);
-        return new(isContentAdmin, userIsSiteAdmin);
+        return new(isSiteAdmin: userIsSiteAdmin, isContentAdmin: isContentAdmin);
     }
 
     private bool UserMayAdmin()

diff --git a/ToSic.Eav.Core/Context/ContextResolverUserPermissions.cs b/ToSic.Eav.Core/Context/ContextResolverUserPermissions.cs
@@ -3,5 +3,5 @@
 internal class ContextResolverUserPermissions(IContextOfUserPermissions userPermissions)
     : IContextResolverUserPermissions
 {
-    public AdminPermissions UserPermissions() => userPermissions.Permissions;
+    public EffectivePermissions UserPermissions() => userPermissions.Permissions;
 }
diff --git a/ToSic.Eav.Core/Context/AdminPermissions.cs → ....Eav.Core/Context/EffectivePermissions.cs b/ToSic.Eav.Core/Context/AdminPermissions.cs → ....Eav.Core/Context/EffectivePermissions.cs
@@ -6,21 +6,23 @@
 /// and this object is used to provide them.
 ///
 /// For better understanding: the user itself has these permissions, but sometimes
-/// additional information (eg. an App containing more configuration)
+/// additional information (e.g. an App containing more configuration)
 /// can extend the permissions. So a provider would then combine that with the user to get more permissions.
 /// </summary>
 /// <param name="isContentAdmin"></param>
 /// <param name="isSiteAdmin"></param>
 [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-public class AdminPermissions(bool isContentAdmin, bool isSiteAdmin)
+public class EffectivePermissions(bool isSiteAdmin, bool isContentAdmin, bool isContentEditor, bool showDrafts)
 {
-    public AdminPermissions(bool both) : this(both, both) { }
+    public EffectivePermissions(bool all) : this(all, all, all, all) { }
+
+    public EffectivePermissions(bool isSiteAdmin, bool isContentAdmin) : this(isSiteAdmin, isContentAdmin, isContentAdmin, isContentAdmin) { }
 
     public bool IsContentAdmin { get; } = isContentAdmin;
 
-    public bool IsContentEditor { get; } = isContentAdmin;
+    public bool IsContentEditor { get; } = isContentEditor;
 
     public bool IsSiteAdmin { get; } = isSiteAdmin;
 
-    public bool ShowDraftData => IsContentAdmin;
+    public bool ShowDraftData => showDrafts;
 }
diff --git a/ToSic.Eav.Core/Context/IContextOfUserPermissions.cs b/ToSic.Eav.Core/Context/IContextOfUserPermissions.cs
@@ -9,5 +9,5 @@
 public interface IContextOfUserPermissions
 {
     [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
-    AdminPermissions Permissions { get; }
+    EffectivePermissions Permissions { get; }
 }
diff --git a/ToSic.Eav.Core/Context/IContextResolverUserPermissions.cs b/ToSic.Eav.Core/Context/IContextResolverUserPermissions.cs
@@ -9,5 +9,5 @@
 [System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
 public interface IContextResolverUserPermissions
 {
-    AdminPermissions UserPermissions();
+    EffectivePermissions UserPermissions();
 }
diff --git a/ToSic.Eav.DataSources/DataSources/Security/PublishingFilter.cs b/ToSic.Eav.DataSources/DataSources/Security/PublishingFilter.cs
@@ -21,7 +21,7 @@ namespace ToSic.Eav.DataSources;
     DynamicOut = false, 
     HelpLink = "https://go.2sxc.org/DsPublishingFilter")]
 
-public class PublishingFilter : Eav.DataSource.DataSourceBase
+public class PublishingFilter : DataSourceBase
 {
 
     #region Configuration-properties
@@ -54,7 +54,9 @@ private IImmutableList<IEntity> PublishingFilterList()
     {
         var showDraftsAsSet = ShowDrafts;
         var l = Log.Fn<IImmutableList<IEntity>>();
-        var finalShowDrafts = showDraftsAsSet ?? _userPermissions.UserPermissions()?.IsContentAdmin ?? QueryConstants.ParamsShowDraftsDefault;
+        var finalShowDrafts = showDraftsAsSet
+                              ?? _userPermissions.UserPermissions()?.ShowDraftData
+                              ?? QueryConstants.ParamsShowDraftsDefault;
         var outStreamName = finalShowDrafts ? StreamDraftsName : StreamPublishedName;
         var result = In[outStreamName].List.ToImmutableList();
         return l.Return(result, $"showDraftSet:'{showDraftsAsSet}'; final:{finalShowDrafts}; stream: {outStreamName}; count: {result.Count}");