Fix #20308: Allow CompositeAuth auth methods to use their own user if…

… defined Co-authored-by: Stefano Mtangoo <stefano@hosannahighertech.co.tz>
yiisoft · Jan 14, 2025 · b0b7832 · b0b7832
1 parent fd866da
commit b0b7832
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -26,6 +26,7 @@ Yii Framework 2 Change Log
 - Bug #20296: Fix broken enum test (briedis)
 - Bug #20300: Clear stat cache in `FileCache::setValue()` (rob006)
 - Enh #20306: Add new `yii\helpers\ArrayHelper::flatten()` method (xcopy)
+- Bug #20308: Allow CompositeAuth auth methods to use their own user if defined (mtangoo)
 
 2.0.51 July 18, 2024
 --------------------

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 yii\web\User');
+            } elseif ($authUser != null) {
+                $user = $authUser;
+            }
+
             $identity = $auth->authenticate($user, $request, $response);
             if ($identity !== null) {
                 return $identity;