fixes prompt=login process

Author: nojimage

src/Controller/OAuthController.php

@@ -54,9 +54,9 @@ public function initialize(): void
      * on Controller.initialize
      *
      * @param Event $event the event
-     * @return void
+     * @return Response|null
      */
-    public function beforeFilter(Event $event): void
+    public function beforeFilter(Event $event): ?Response
     {
         // if prompt=login on authorize action, then logout and remove prompt params
         if (
@@ -67,11 +67,14 @@ public function beforeFilter(Event $event): void
 
             $query = $this->request->getQueryParams();
             unset($query['prompt']);
-            $uri = $this->request->getUri();
-            $this->request = $this->request
-                ->withQueryParams($query)
-                ->withUri($uri->withQuery(http_build_query($query)));
+
+            return $this->redirect([
+                'action' => 'authorize',
+                '?' => $query,
+            ]);
         }
+
+        return null;
     }
 
     /**

tests/TestCase/Controller/OAuthControllerTest.php

@@ -139,7 +139,7 @@ public function testAuthorizeLoginRedirectWhenWithPromptLogin()
         $this->get($authorizeUrl);
 
         $this->assertSession(null, 'Auth.User.id', 'will logged out');
-        $this->assertRedirect(['plugin' => false, 'controller' => 'Users', 'action' => 'login', '?' => ['redirect' => $expectedLoginRedirectUrl]]);
+        $this->assertRedirect($expectedLoginRedirectUrl);
     }
 
     public function testAuthorizationCodeDeny()