From 9993bcfe97a5bc98a041878d21a7320415b0f60c Mon Sep 17 00:00:00 2001
From: Gavin Faux <gavin.faux@nvisage.co.uk>
Date: Fri, 25 Nov 2022 16:10:03 +0000
Subject: [PATCH 1/2] Fix #2

If current user not authenticated assume scheduled publishing as root.
NOTE: Root user should be added to User Exception list
---
 ContentProtector/Components/ActionBlocker.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ContentProtector/Components/ActionBlocker.cs b/ContentProtector/Components/ActionBlocker.cs
index 6fcb4b9..fbbf0a5 100644
--- a/ContentProtector/Components/ActionBlocker.cs
+++ b/ContentProtector/Components/ActionBlocker.cs
@@ -41,7 +41,7 @@ private void ContentService_Trashing(IContentService sender,MoveEventArgs<IConte
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
             }
 
             try {
@@ -72,7 +72,7 @@ private void ContentService_Deleting(IContentService sender,DeleteEventArgs<ICon
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
             }
 
             try {
@@ -103,7 +103,7 @@ private void ContentService_RollingBack(IContentService sender,RollbackEventArgs
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
             }
 
             try {
@@ -132,7 +132,7 @@ private void ContentService_Unpublishing(IContentService sender,PublishEventArgs
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
             }
 
             try {
@@ -163,7 +163,7 @@ private void ContentService_Publishing(IContentService sender,ContentPublishingE
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
             }
 
             try {
@@ -194,7 +194,7 @@ private void ContentService_Publishing(IContentService sender,ContentPublishingE
         //    int _currentUserId;
 
         //    using(var contextReference = _context.EnsureUmbracoContext()) {
-        //        _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+        //        _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
         //    }
 
         //    try {
@@ -226,7 +226,7 @@ private void ContentService_Publishing(IContentService sender,ContentPublishingE
         //    int _currentUserId;
 
         //    using(var contextReference = _context.EnsureUmbracoContext()) {
-        //        _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+        //        _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
         //    }
 
         //    try {
@@ -257,7 +257,7 @@ private void ContentService_Saving(IContentService sender,ContentSavingEventArgs
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.CurrentUser.Id;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
             }
 
             try {

From 2d2615cd9231c78fb39b4598d4b6641f8d21f2a3 Mon Sep 17 00:00:00 2001
From: Gavin Faux <gavin.faux@nvisage.co.uk>
Date: Thu, 1 Dec 2022 10:06:47 +0000
Subject: [PATCH 2/2] Use Umbraco Constant

---
 ContentProtector/Components/ActionBlocker.cs | 36 ++++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/ContentProtector/Components/ActionBlocker.cs b/ContentProtector/Components/ActionBlocker.cs
index fbbf0a5..c397f51 100644
--- a/ContentProtector/Components/ActionBlocker.cs
+++ b/ContentProtector/Components/ActionBlocker.cs
@@ -41,7 +41,7 @@ private void ContentService_Trashing(IContentService sender,MoveEventArgs<IConte
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
             }
 
             try {
@@ -57,9 +57,9 @@ private void ContentService_Trashing(IContentService sender,MoveEventArgs<IConte
             }
 
             foreach(var node in eventArgs.MoveInfoCollection) {
-                if(trash != null) {                    
+                if(trash != null) {
                     if(trash.nodes.Contains(node.Entity.Id.ToString()) || trash.disableAction) {
-                        if(!trash.userExceptions.Split(',').Contains(_currentUserId.ToString())) {                            
+                        if(!trash.userExceptions.Split(',').Contains(_currentUserId.ToString())) {
                             eventArgs.CancelOperation(new EventMessage("Action rejected. Contact website admin","You cannot trash " + node.Entity.Name,EventMessageType.Error));
                         }
                     }
@@ -72,7 +72,7 @@ private void ContentService_Deleting(IContentService sender,DeleteEventArgs<ICon
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
             }
 
             try {
@@ -103,7 +103,7 @@ private void ContentService_RollingBack(IContentService sender,RollbackEventArgs
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
             }
 
             try {
@@ -117,14 +117,14 @@ private void ContentService_RollingBack(IContentService sender,RollbackEventArgs
             catch(Exception ex) {
                 _logger.Error<ActionModel>("Failed to get Content Protector setting for rollBack action: " + ex.Message);
             }
-            
+
             if(rollBack != null) {
                 if(rollBack.nodes.Contains(eventArgs.Entity.Id.ToString()) || rollBack.disableAction) {
                     if(!rollBack.userExceptions.Split(',').Contains(_currentUserId.ToString())) {
-                        eventArgs.CancelOperation(new EventMessage("Action rejected. Contact website admin","You cannot rollBack " + eventArgs.Entity.Name,EventMessageType.Error));                        
+                        eventArgs.CancelOperation(new EventMessage("Action rejected. Contact website admin","You cannot rollBack " + eventArgs.Entity.Name,EventMessageType.Error));
                     }
                 }
-            }            
+            }
         }
 
         private void ContentService_Unpublishing(IContentService sender,PublishEventArgs<IContent> eventArgs) {
@@ -132,7 +132,7 @@ private void ContentService_Unpublishing(IContentService sender,PublishEventArgs
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
             }
 
             try {
@@ -163,7 +163,7 @@ private void ContentService_Publishing(IContentService sender,ContentPublishingE
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
             }
 
             try {
@@ -194,7 +194,7 @@ private void ContentService_Publishing(IContentService sender,ContentPublishingE
         //    int _currentUserId;
 
         //    using(var contextReference = _context.EnsureUmbracoContext()) {
-        //        _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
+        //        _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
         //    }
 
         //    try {
@@ -208,17 +208,17 @@ private void ContentService_Publishing(IContentService sender,ContentPublishingE
         //    catch(Exception ex) {
         //        _logger.Error<ActionModel>("Failed to get Content Protector setting for copy action: " + ex.Message);
         //    }
-            
+
         //    if(copy != null) {
         //        if(copy.nodes.Contains(eventArgs.Copy.Id.ToString())) {
-        //            if(!copy.userExceptions.Split(',').Contains(_currentUserId.ToString())) {                                        
+        //            if(!copy.userExceptions.Split(',').Contains(_currentUserId.ToString())) {
         //                eventArgs.Cancel = true;
         //                eventArgs.CanCancel = true;
         //                eventArgs.Messages.Add(new EventMessage("Action rejected. Contact website admin","You cannot copy " + eventArgs.Copy.Name,EventMessageType.Error));
         //            }
         //        }
         //    }
-            
+
         //}
 
         //private void ContentService_Moving(IContentService sender,MoveEventArgs<IContent> eventArgs) {
@@ -226,7 +226,7 @@ private void ContentService_Publishing(IContentService sender,ContentPublishingE
         //    int _currentUserId;
 
         //    using(var contextReference = _context.EnsureUmbracoContext()) {
-        //        _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
+        //        _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
         //    }
 
         //    try {
@@ -257,7 +257,7 @@ private void ContentService_Saving(IContentService sender,ContentSavingEventArgs
             int _currentUserId;
 
             using(var contextReference = _context.EnsureUmbracoContext()) {
-                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : -1;
+                _currentUserId = contextReference.UmbracoContext.Security.IsAuthenticated() ? contextReference.UmbracoContext.Security.CurrentUser.Id : Umbraco.Core.Constants.Security.SuperUserId;
             }
 
             try {
@@ -280,8 +280,8 @@ private void ContentService_Saving(IContentService sender,ContentSavingEventArgs
                         }
                     }
                 }
-            }            
-        }       
+            }
+        }
 
         public void Terminate() {
         }