Allow CompositeAuth auth methods to use their own user if defined

yiisoft · Jan 13, 2025 · e51d587 · e51d587
1 parent fd866da
commit e51d587
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/framework/filters/auth/CompositeAuth.php b/framework/filters/auth/CompositeAuth.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
@@ -85,6 +86,13 @@ public function authenticate($user, $request, $response)
                 continue;
             }
 
+            $authUser = $auth->user;
+            if ($authUser != null && !$authUser instanceof \yii\web\User) {
+                throw new InvalidConfigException(get_class($authUser) . ' must implement of a type yii\web\User');
+            } elseif ($authUser != null) {
+                $user = $authUser;
+            }
+
             $identity = $auth->authenticate($user, $request, $response);
             if ($identity !== null) {
                 return $identity;