More fixes

Author: riasvdv

src/Element/Concerns/Draftable.php

@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Element\Concerns;
 
+use Craft;
 use craft\elements\User as UserElement;
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Element\Events\AuthorizeCreateDrafts;
-use CraftCms\Cms\User\Models\User;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
 
@@ -127,7 +127,7 @@ public function handleDraftDelete(): void
     /**
      * {@inheritdoc}
      */
-    public function canCreateDrafts(User $user): bool
+    public function canCreateDrafts(UserElement $user): bool
     {
         if (Event::hasListeners(AuthorizeCreateDrafts::class)) {
             Event::dispatch($event = new AuthorizeCreateDrafts($this, $user));
@@ -144,7 +144,7 @@ public function canCreateDrafts(User $user): bool
     public function canDuplicateAsDraft(UserElement $user): bool
     {
         // if anything, this will be more lenient than canDuplicate()
-        return \Craft::$app->getElements()->canDuplicate($this, $user);
+        return Craft::$app->getElements()->canDuplicate($this, $user);
     }
 
     /**

src/Element/Events/AuthorizeCreateDrafts.php

@@ -5,7 +5,7 @@
 namespace CraftCms\Cms\Element\Events;
 
 use craft\base\ElementInterface;
-use CraftCms\Cms\User\Models\User;
+use craft\elements\User;
 
 final class AuthorizeCreateDrafts
 {

yii2-adapter/legacy/base/Element.php

@@ -3799,7 +3799,7 @@ public function canCreateDrafts(User $user): bool
             return $event->authorized;
         }
 
-        return $this->traitCanCreateDrafts(\CraftCms\Cms\User\Models\User::findOrFail($user->id));
+        return $this->traitCanCreateDrafts($user);
     }
 
     /**

yii2-adapter/src/Web/User.php

@@ -24,7 +24,7 @@ public function getIdentity($autoRenew = true)
             return $this->_identity;
         }
 
-        $identity = $this->getIlluminateAuthManager()->user();
+        $identity = $this->getIlluminateAuthManager()->guard('craft')->user();
 
         if ($identity !== null) {
             $identity = $this->convertIlluminateIdentity($identity);
@@ -58,7 +58,7 @@ public function switchIdentity($identity, $duration = 0): void
         $this->setIdentity($identity);
 
         if ($identity === null) {
-            $this->getIlluminateAuthManager()->logout();
+            $this->getIlluminateAuthManager()->guard('craft')->logout();
 
             return;
         }
@@ -73,7 +73,7 @@ public function switchIdentity($identity, $duration = 0): void
          * When "Remember me for 2 weeks" is checked, the duration will be larger
          * than 3600, so we pass remember to Laravel's auth as well.
          */
-        $this->getIlluminateAuthManager()->loginUsingId($id, remember: $duration > 3600);
+        $this->getIlluminateAuthManager()->guard('craft')->loginUsingId($id, remember: $duration > 3600);
     }
 
     protected function convertIlluminateIdentity(mixed $identity): IdentityInterface