Fix request

tvdijen · tvdijen · commit 71f916eebd61 · 2021-08-27T23:27:36.000+02:00
diff --git a/modules/exampleauth/lib/Auth/Source/External.php b/modules/exampleauth/lib/Auth/Source/External.php
@@ -183,16 +183,18 @@ public function authenticate(array &$state): void
      * This function resumes the authentication process after the user has
      * entered his or her credentials.
      *
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     *
      * @throws \SimpleSAML\Error\BadRequest
      * @throws \SimpleSAML\Error\Exception
      */
-    public static function resume(): void
+    public static function resume(Request $request): void
     {
         /*
          * First we need to restore the $state-array. We should have the identifier for
          * it in the 'State' request parameter.
          */
-        if (!isset($_REQUEST['State'])) {
+        if (!$request->has('State')) {
             throw new Error\BadRequest('Missing "State" parameter.');
         }
 
@@ -201,7 +203,7 @@ public static function resume(): void
          * match the string we used in the saveState-call above.
          */
         /** @var array $state */
-        $state = Auth\State::loadState($_REQUEST['State'], 'exampleauth:External');
+        $state = Auth\State::loadState($request->get('State'), 'exampleauth:External');
 
         /*
          * Now we have the $state-array, and can use it to locate the authentication
diff --git a/modules/exampleauth/lib/Controller/ExampleAuth.php b/modules/exampleauth/lib/Controller/ExampleAuth.php
@@ -200,15 +200,14 @@ public function redirect(Request $request): RunnableResponse
      *
      * @return \SimpleSAML\HTTP\RunnableResponse
      */
-    public function resume(/** @scrutinizer ignore-unused */ Request $request): RunnableResponse
+    public function resume(Request $request): RunnableResponse
     {
         /**
          * This page serves as the point where the user's authentication
          * process is resumed after the login page.
          *
          * It simply passes control back to the class.
          */
-
-        return new RunnableResponse([External::class, 'resume'], []);
+        return new RunnableResponse([External::class, 'resume'], [$request]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -200,15 +200,14 @@ public function redirect(Request $request): RunnableResponse`
`200`	`200`	`*`
`201`	`201`	`* @return \SimpleSAML\HTTP\RunnableResponse`
`202`	`202`	`*/`
`203`		`- public function resume(/** @scrutinizer ignore-unused */ Request $request): RunnableResponse`
	`203`	`+ public function resume(Request $request): RunnableResponse`
`204`	`204`	`{`
`205`	`205`	`/**`
`206`	`206`	`* This page serves as the point where the user's authentication`
`207`	`207`	`* process is resumed after the login page.`
`208`	`208`	`*`
`209`	`209`	`* It simply passes control back to the class.`
`210`	`210`	`*/`
`211`		`-`
`212`		`- return new RunnableResponse([External::class, 'resume'], []);`
	`211`	`+ return new RunnableResponse([External::class, 'resume'], [$request]);`
`213`	`212`	`}`
`214`	`213`	`}`