Merge pull request #16 from trendyminds/1.3.1

1.3.1
trendyminds · Jun 10, 2020 · 2f00d6c · 2f00d6c
2 parents a9d68ba + 5829e3d
commit 2f00d6c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes for Isolate
 
+## 1.3.1 - 2020-06-10
+
+### Fixed
+- Don't run Isolate event when a user is not signed in or it is invoked via console commands/migrations
+
 ## 1.3.0 - 2020-06-09
 
 ### Changed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "trendyminds/isolate",
     "description": "Restrict your Craft CMS users on a per-entry basis",
     "type": "craft-plugin",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "keywords": [
         "permissions",
         "entry permission",

diff --git a/src/Isolate.php b/src/Isolate.php
@@ -119,6 +119,16 @@ function(RegisterUserPermissionsEvent $event) {
             Entry::class,
             Entry::EVENT_AFTER_SAVE,
             function (ModelEvent $event) {
+                // Don't do anything if this is a console request
+                if (Craft::$app->getRequest()->isConsoleRequest) {
+                    return false;
+                }
+
+                // Don't do anything if the user is not signed in
+                if (Craft::$app->getUser()->isGuest) {
+                    return false;
+                }
+
                 // If the user isn't isolated
                 if (!Isolate::$plugin->isolateService->isUserIsolated(Craft::$app->getUser()->id)) {
                     return false;