Fix compatibility

Author: riasvdv

yii2-adapter/legacy/services/Elements.php

@@ -1555,7 +1555,7 @@ public function propagateElement(
      */
     public function canView(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('view', $element);
+        return $this->_checkAuthorization($element, 'view', $user);
     }
 
     /**
@@ -1570,7 +1570,7 @@ public function canView(ElementInterface $element, ?User $user = null): bool
      */
     public function canSave(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('save', $element);
+        return $this->_checkAuthorization($element, 'save', $user);
     }
 
     /**
@@ -1585,7 +1585,14 @@ public function canSave(ElementInterface $element, ?User $user = null): bool
      */
     public function canSaveCanonical(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('saveCanonical', $element);
+        if ($element->getIsUnpublishedDraft()) {
+            $fakeCanonical = clone $element;
+            $fakeCanonical->draftId = null;
+
+            return $this->canSave($fakeCanonical, $user);
+        }
+
+        return $this->canSave($element->getCanonical(true), $user);
     }
 
     /**
@@ -1602,7 +1609,7 @@ public function canSaveCanonical(ElementInterface $element, ?User $user = null):
      */
     public function canDuplicate(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('duplicate', $element);
+        return $this->_checkAuthorization($element, 'duplicate', $user);
     }
 
     /**
@@ -1617,7 +1624,7 @@ public function canDuplicate(ElementInterface $element, ?User $user = null): boo
      */
     public function canDuplicateAsDraft(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('duplicateAsDraft', $element);
+        return $this->_checkAuthorization($element, 'duplicateAsDraft', $user);
     }
 
     /**
@@ -1634,7 +1641,7 @@ public function canDuplicateAsDraft(ElementInterface $element, ?User $user = nul
      */
     public function canCopy(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('copy', $element);
+        return $this->_checkAuthorization($element, 'copy', $user);
     }
 
     /**
@@ -1651,7 +1658,7 @@ public function canCopy(ElementInterface $element, ?User $user = null): bool
      */
     public function canDelete(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('delete', $element);
+        return $this->_checkAuthorization($element, 'delete', $user);
     }
 
     /**
@@ -1668,7 +1675,7 @@ public function canDelete(ElementInterface $element, ?User $user = null): bool
      */
     public function canDeleteForSite(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('deleteForSite', $element);
+        return $this->_checkAuthorization($element, 'deleteForSite', $user);
     }
 
     /**
@@ -1685,7 +1692,18 @@ public function canDeleteForSite(ElementInterface $element, ?User $user = null):
      */
     public function canCreateDrafts(ElementInterface $element, ?User $user = null): bool
     {
-        return Gate::forUser($user)->check('createDrafts', $element);
+        return $this->_checkAuthorization($element, 'createDrafts', $user);
+    }
+
+    private function _checkAuthorization(ElementInterface $element, string $ability, ?User $user = null): bool
+    {
+        $user ??= Auth::user();
+
+        if (!$user) {
+            return false;
+        }
+
+        return Gate::forUser($user)->check($ability, $element);
     }
 
     private static function _authCheck(ElementInterface $element, User $user, string $eventName): ?bool
@@ -1941,7 +1959,7 @@ public static function registerEvents(): void
                 return null;
             }
 
-            return self::_authCheck($element, $user, $ability);
+            return self::_authCheck($element, $user, $event);
         });
     }
 }

yii2-adapter/tests/unit/services/ElementsTest.php

@@ -11,17 +11,20 @@
 namespace crafttests\unit\services;
 
 use Craft;
+use craft\events\AuthorizationCheckEvent;
 use craft\services\Elements;
 use craft\test\TestCase;
 use craft\test\TestSetup;
 use CraftCms\Cms\Entry\Elements\Entry;
 use CraftCms\Cms\Support\Str;
+use CraftCms\Yii2Adapter\IdentityWrapper;
 use crafttests\fixtures\AssetFixture;
 use crafttests\fixtures\EntryFixture;
 use crafttests\fixtures\GlobalSetFixture;
 use crafttests\fixtures\settings\GeneralConfigSettingFixture;
 use crafttests\fixtures\SitesFixture;
 use crafttests\fixtures\UserFixture;
+use Illuminate\Support\Facades\Auth;
 
 /**
  * Unit tests for the config service
@@ -86,6 +89,36 @@ public function testParseRefs(): void
         }
     }
 
+    public function testCanViewFallsBackToCurrentUser(): void
+    {
+        $entry = $this->_getEntry();
+        $user = $this->_getUser();
+
+        Auth::login($user);
+        Craft::$app->getUser()->setIdentity(new IdentityWrapper($user));
+
+        $this->elements->on(Elements::EVENT_AUTHORIZE_VIEW, function(AuthorizationCheckEvent $event) use ($user) {
+            self::assertSame($user->id, $event->user->id);
+            $event->authorized = true;
+        });
+
+        self::assertTrue($this->elements->canView($entry));
+    }
+
+    public function testCanSaveCanonicalUsesAuthorizeSaveEvent(): void
+    {
+        $entry = clone $this->_getEntry();
+        $user = $this->_getUser();
+        $entry->draftId = 100;
+
+        $this->elements->on(Elements::EVENT_AUTHORIZE_SAVE, function(AuthorizationCheckEvent $event) use ($user) {
+            self::assertSame($user->id, $event->user->id);
+            $event->authorized = true;
+        });
+
+        self::assertTrue($this->elements->canSaveCanonical($entry, $user));
+    }
+
     /**
      * @inheritdoc
      */
@@ -127,4 +160,17 @@ protected function _before(): void
         parent::_before();
         $this->elements = Craft::$app->getElements();
     }
+
+    private function _getEntry(): Entry
+    {
+        return Entry::find()
+            ->site('*')
+            ->status(null)
+            ->one();
+    }
+
+    private function _getUser()
+    {
+        return Craft::$app->getUsers()->getUserById(1);
+    }
 }