Merge pull request #8608 from ecamp/renovate/knpuniversity-oauth2-client-bundle-2.x

fix(deps): update dependency knpuniversity/oauth2-client-bundle to v2.20.0

Author: renovate[bot]

api/composer.json

@@ -29,7 +29,7 @@
         "gesdinet/jwt-refresh-token-bundle": "1.5.0",
         "google/recaptcha": "1.3.1",
         "guzzlehttp/guzzle": "7.10.0",
-        "knpuniversity/oauth2-client-bundle": "2.19.0",
+        "knpuniversity/oauth2-client-bundle": "2.20.0",
         "league/oauth2-google": "4.0.1",
         "lexik/jwt-authentication-bundle": "3.1.1",
         "nelmio/cors-bundle": "2.6.0",

api/composer.lock

@@ -110,12 +110,13 @@ public function redirect(array $scopes = [], array $options = []): RedirectRespo
      */
     #[\Override]
     public function getAccessToken(array $options = []): AccessTokenInterface {
-        $jwt = $this->getCurrentRequest()->cookies->get(static::getCookieName($this->cookiePrefix));
+        $request = $this->getCurrentRequest();
+        $jwt = $request->cookies->get(static::getCookieName($this->cookiePrefix));
         if (null === $jwt) {
             throw new InvalidStateException('Expired state');
         }
 
-        $actualState = $this->getCurrentRequest()->get('state');
+        $actualState = $request->query->get('state');
 
         try {
             if ($this->decodeStateJWT($jwt) !== $actualState) {

api/src/OAuth/JWTStateOAuth2Client.php

@@ -130,7 +130,7 @@ public function testGetAccessToken() {
         $cookieBag = new InputBag();
         $cookieBag->set('test_prefix_oauth_state_jwt', 'test jwt value');
         $requestMock->cookies = $cookieBag;
-        $requestMock->method('get')->willReturn($state);
+        $requestMock->query = new InputBag(['state' => $state, 'code' => $state]);
 
         $jwtEncoderMock = $this->createMock(JWTEncoderInterface::class);
         $jwtEncoderMock->expects($this->once())
@@ -175,7 +175,7 @@ public function testGetAccessTokenThrowsIfJWTCannotBeDecoded() {
         $cookieBag = new InputBag();
         $cookieBag->set('test_prefix_oauth_state_jwt', 'test jwt value');
         $requestMock->cookies = $cookieBag;
-        $requestMock->method('get')->willReturn($state);
+        $requestMock->query = new InputBag(['state' => $state, 'code' => $state]);
 
         $jwtEncoderMock = $this->createMock(JWTEncoderInterface::class);
         $jwtEncoderMock->expects($this->once())
@@ -220,7 +220,7 @@ public function testGetAccessTokenThrowsIfJWTStateDoesNotMatch() {
         $cookieBag = new InputBag();
         $cookieBag->set('test_prefix_oauth_state_jwt', 'test jwt value');
         $requestMock->cookies = $cookieBag;
-        $requestMock->method('get')->willReturn($state);
+        $requestMock->query = new InputBag(['state' => $state, 'code' => $state]);
 
         $jwtEncoderMock = $this->createMock(JWTEncoderInterface::class);
         $jwtEncoderMock->expects($this->once())
@@ -265,7 +265,7 @@ public function testGetAccessTokenThrowsIfNoMatchingStateEntryInTheDatabase() {
         $cookieBag = new InputBag();
         $cookieBag->set('test_prefix_oauth_state_jwt', 'test jwt value');
         $requestMock->cookies = $cookieBag;
-        $requestMock->method('get')->willReturn($state);
+        $requestMock->query = new InputBag(['state' => $state, 'code' => $state]);
 
         $jwtEncoderMock = $this->createMock(JWTEncoderInterface::class);
         $jwtEncoderMock->expects($this->once())
@@ -311,7 +311,7 @@ public function testGetAccessTokenThrowsIfMultipleMatchingStateEntriesInTheDatab
         $cookieBag = new InputBag();
         $cookieBag->set('test_prefix_oauth_state_jwt', 'test jwt value');
         $requestMock->cookies = $cookieBag;
-        $requestMock->method('get')->willReturn($state);
+        $requestMock->query = new InputBag(['state' => $state, 'code' => $state]);
 
         $jwtEncoderMock = $this->createMock(JWTEncoderInterface::class);
         $jwtEncoderMock->expects($this->once())
@@ -357,7 +357,7 @@ public function testGetAccessTokenRemovesSavedStateFromDatabase() {
         $cookieBag = new InputBag();
         $cookieBag->set('test_prefix_oauth_state_jwt', 'test jwt value');
         $requestMock->cookies = $cookieBag;
-        $requestMock->method('get')->willReturn($state);
+        $requestMock->query = new InputBag(['state' => $state, 'code' => $state]);
 
         $jwtEncoderMock = $this->createMock(JWTEncoderInterface::class);
         $jwtEncoderMock->expects($this->once())