fix redirect authproc

tvdijen · tvdijen · commit c0ea93b52a77 · 2021-08-27T23:53:51.000+02:00
diff --git a/modules/exampleauth/lib/Controller/ExampleAuth.php b/modules/exampleauth/lib/Controller/ExampleAuth.php
@@ -175,7 +175,7 @@ public function authpage(Request $request)
      *
      * @return \SimpleSAML\HTTP\RunnableResponse
      */
-    public function redirect(Request $request): RunnableResponse
+    public function redirecttest(Request $request): RunnableResponse
     {
         /**
          * Request handler for redirect filter test.
diff --git a/modules/exampleauth/routing/routes/routes.yml b/modules/exampleauth/routing/routes/routes.yml
@@ -1,9 +1,9 @@
 exampleauth-authpage:
     path:       /authpage
     defaults:   { _controller: 'SimpleSAML\Module\exampleauth\Controller\ExampleAuth::authpage' }
-exampleauth-redirect:
-    path:       /redirect
-    defaults:   { _controller: 'SimpleSAML\Module\exampleauth\Controller\ExampleAuth::redirect' }
+exampleauth-redirecttest:
+    path:       /redirecttest
+    defaults:   { _controller: 'SimpleSAML\Module\exampleauth\Controller\ExampleAuth::redirecttest' }
 exampleauth-resume:
     path:       /resume
     defaults:   { _controller: 'SimpleSAML\Module\exampleauth\Controller\ExampleAuth::resume' }
diff --git a/tests/modules/exampleauth/lib/Controller/ExampleAuthTest.php b/tests/modules/exampleauth/lib/Controller/ExampleAuthTest.php
@@ -197,14 +197,14 @@ public function testResume(): void
 
 
     /**
-     * Test that accessing the redirect-endpoint leads to a redirect
+     * Test that accessing the redirecttest-endpoint leads to a redirect
      *
      * @return void
      */
     public function testRedirect(): void
     {
         $request = Request::create(
-            '/redirect',
+            '/redirecttest',
             'GET',
             ['StateId' => 'someState']
         );
@@ -217,21 +217,21 @@ public static function loadState(string $id, string $stage, bool $allowMissing =
             }
         });
 
-        $response = $c->redirect($request);
+        $response = $c->redirecttest($request);
         $this->assertTrue($response->isSuccessful());
         $this->assertInstanceOf(RunnableResponse::class, $response);
     }
 
 
     /**
-     * Test that accessing the redirect-endpoint without StateId leads to an exception
+     * Test that accessing the redirecttest-endpoint without StateId leads to an exception
      *
      * @return void
      */
     public function testRedirectMissingStateId(): void
     {
         $request = Request::create(
-            '/redirect',
+            '/redirecttest',
             'GET',
         );
 
@@ -240,6 +240,6 @@ public function testRedirectMissingStateId(): void
         $this->expectException(Error\BadRequest::class);
         $this->expectExceptionMessage('Missing required StateId query parameter.');
 
-        $c->redirect($request);
+        $c->redirecttest($request);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public function authpage(Request $request)`
`175`	`175`	`*`
`176`	`176`	`* @return \SimpleSAML\HTTP\RunnableResponse`
`177`	`177`	`*/`
`178`		`- public function redirect(Request $request): RunnableResponse`
	`178`	`+ public function redirecttest(Request $request): RunnableResponse`
`179`	`179`	`{`
`180`	`180`	`/**`
`181`	`181`	`* Request handler for redirect filter test.`
Original file line number	Diff line number	Diff line change
`@@ -197,14 +197,14 @@ public function testResume(): void`
`197`	`197`
`198`	`198`
`199`	`199`	`/**`
`200`		`- * Test that accessing the redirect-endpoint leads to a redirect`
	`200`	`+ * Test that accessing the redirecttest-endpoint leads to a redirect`
`201`	`201`	`*`
`202`	`202`	`* @return void`
`203`	`203`	`*/`
`204`	`204`	`public function testRedirect(): void`
`205`	`205`	`{`
`206`	`206`	`$request = Request::create(`
`207`		`- '/redirect',`
	`207`	`+ '/redirecttest',`
`208`	`208`	`'GET',`
`209`	`209`	`['StateId' => 'someState']`
`210`	`210`	`);`
`@@ -217,21 +217,21 @@ public static function loadState(string $id, string $stage, bool $allowMissing =`
`217`	`217`	`}`
`218`	`218`	`});`
`219`	`219`
`220`		`- $response = $c->redirect($request);`
	`220`	`+ $response = $c->redirecttest($request);`
`221`	`221`	`$this->assertTrue($response->isSuccessful());`
`222`	`222`	`$this->assertInstanceOf(RunnableResponse::class, $response);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`
`226`	`226`	`/**`
`227`		`- * Test that accessing the redirect-endpoint without StateId leads to an exception`
	`227`	`+ * Test that accessing the redirecttest-endpoint without StateId leads to an exception`
`228`	`228`	`*`
`229`	`229`	`* @return void`
`230`	`230`	`*/`
`231`	`231`	`public function testRedirectMissingStateId(): void`
`232`	`232`	`{`
`233`	`233`	`$request = Request::create(`
`234`		`- '/redirect',`
	`234`	`+ '/redirecttest',`
`235`	`235`	`'GET',`
`236`	`236`	`);`
`237`	`237`
`@@ -240,6 +240,6 @@ public function testRedirectMissingStateId(): void`
`240`	`240`	`$this->expectException(Error\BadRequest::class);`
`241`	`241`	`$this->expectExceptionMessage('Missing required StateId query parameter.');`
`242`	`242`
`243`		`- $c->redirect($request);`
	`243`	`+ $c->redirecttest($request);`
`244`	`244`	`}`
`245`	`245`	`}`