1717use League \OAuth2 \Client \Token \AccessToken ;
1818use Symfony \Component \HttpFoundation \RedirectResponse ;
1919use Symfony \Component \HttpFoundation \RequestStack ;
20+ use Symfony \Component \HttpFoundation \Request ;
2021use Symfony \Component \HttpFoundation \Session \SessionInterface ;
2122
2223class OAuth2Client implements OAuth2ClientInterface
@@ -93,13 +94,13 @@ public function getAccessToken(array $options = [])
9394
9495 if (!$ this ->isStateless ()) {
9596 $ expectedState = $ this ->getSession ()->get (self ::OAUTH2_SESSION_STATE_KEY );
96- $ actualState = $ this ->getRequestParameter ('state ' );
97+ $ actualState = $ this ->getRequestParameter ($ request , 'state ' );
9798 if (!$ actualState || ($ actualState !== $ expectedState )) {
9899 throw new InvalidStateException ('Invalid state ' );
99100 }
100101 }
101102
102- $ code = $ this ->getRequestParameter ('code ' );
103+ $ code = $ this ->getRequestParameter ($ request , 'code ' );
103104
104105 if (!$ code ) {
105106 throw new MissingAuthorizationCodeException ('No "code" parameter was found (usually this is a query parameter)! ' );
@@ -170,7 +171,7 @@ protected function isStateless(): bool
170171 }
171172
172173 /**
173- * @return \Symfony\Component\HttpFoundation\ Request
174+ * @return Request
174175 */
175176 private function getCurrentRequest ()
176177 {
@@ -196,12 +197,12 @@ private function getSession()
196197 }
197198
198199 /**
199- * @param RequestStack $request
200+ * @param Request $request
200201 * @param string $key
201202 *
202203 * @return string|int|float|bool|null
203204 */
204- private function getRequestParameter (RequestStack $ request , string $ key )
205+ private function getRequestParameter (Request $ request , string $ key )
205206 {
206207 if ($ request ->query ->has ($ key )) {
207208 return $ request ->query ->get ($ key );
0 commit comments