Fix #20313: Allow CompositeAuth auth methods to use their own request…

… and response if defined Co-authored-by: Stefano Mtangoo <[email protected]>
yiisoft · Jan 17, 2025 · d146307 · d146307
1 parent a05f60b
commit d146307
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -27,6 +27,7 @@ Yii Framework 2 Change Log
 - 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)
+- Bug #20313: Allow CompositeAuth auth methods to use their own request and response if defined (mtangoo)
 
 2.0.51 July 18, 2024
 --------------------

diff --git a/framework/filters/auth/CompositeAuth.php b/framework/filters/auth/CompositeAuth.php
@@ -93,6 +93,20 @@ public function authenticate($user, $request, $response)
                 $user = $authUser;
             }
 
+            $authRequest = $auth->request;
+            if ($authRequest != null && !$authRequest instanceof \yii\web\Request) {
+                throw new InvalidConfigException(get_class($authRequest) . ' must implement yii\web\Request');
+            } elseif ($authRequest != null) {
+                $request = $authRequest;
+            }
+
+            $authResponse = $auth->response;
+            if ($authResponse != null && !$authResponse instanceof \yii\web\Response) {
+                throw new InvalidConfigException(get_class($authResponse) . ' must implement yii\web\Response');
+            } elseif ($authResponse != null) {
+                $response = $authResponse;
+            }
+
             $identity = $auth->authenticate($user, $request, $response);
             if ($identity !== null) {
                 return $identity;