Migrate old www-script to controller (#1764)

tvdijen · web-flow · commit 6e0519fa7767 · 2023-02-22T07:38:59.000+01:00
* Migrate old www-script to controller

* Add unit test
diff --git a/modules/admin/routing/routes/routes.yml b/modules/admin/routing/routes/routes.yml
@@ -13,6 +13,9 @@ admin-sandbox:
 admin-test:
     path:       /test/{as}
     defaults:   { _controller: 'SimpleSAML\Module\admin\Controller\Test::main', as: null }
+core-logout:
+    path:       /logout
+    defaults:   { _controller: 'SimpleSAML\Module\admin\Controller\Test::logout' }
 admin-fed:
     path:       /federation
     defaults:   { _controller: 'SimpleSAML\Module\admin\Controller\Federation::main' }
diff --git a/modules/admin/src/Controller/Test.php b/modules/admin/src/Controller/Test.php
@@ -122,7 +122,7 @@ public function main(Request $request, string $as = null): Response
             $authsource = new $this->authSimple($as);
 
             if (!is_null($request->query->get('logout'))) {
-                return new RunnableResponse([$authsource, 'logout'], [$this->config->getBasePath() . 'logout.php']);
+                return new RunnableResponse([$authsource, 'logout'], [Module::getModuleURL('admin/logout')]);
             } elseif (!is_null($request->query->get(Auth\State::EXCEPTION_PARAM))) {
                 // This is just a simple example of an error
                 /** @var array $state */
@@ -160,4 +160,16 @@ public function main(Request $request, string $as = null): Response
         $this->menu->addOption('logout', $this->authUtils->getAdminLogoutURL(), Translate::noop('Log out'));
         return $this->menu->insert($t);
     }
+
+
+    /**
+     * Page to show after logout completed
+     *
+     * @param \Symfony\Component\HttpFoundation\Request $request
+     * @return \SimpleSAML\XHTML\Template
+     */
+    public function logout(Request $request): Template
+    {
+        return new Template($this->config, 'admin:logout.twig');
+    }
 }
diff --git a/modules/admin/templates/logout.twig b/modules/admin/templates/logout.twig
@@ -7,6 +7,6 @@
     <h3>{% trans %}You have been logged out.{% endtrans %}</h3>
     <br>
     {% if text %}
-    <p><a href="{{ link }}">{{ text|trans }}</a></p>
+    <p><a href="index.php">{{ 'Go back to SimpleSAMLphp installation page'|trans }}</a></p>
     {% endif %}
-{% endblock %}
+{% endblock %}
diff --git a/public/logout.php b/public/logout.php
diff --git a/tests/modules/admin/src/Controller/TestTest.php b/tests/modules/admin/src/Controller/TestTest.php
@@ -119,6 +119,23 @@ public function logout($params = null): void
     }
 
 
+    /**
+     */
+    public function testLogoutReturnsTemplate(): void
+    {
+        $request = Request::create(
+            '/logout',
+            'GET'
+        );
+
+        $c = new TestController($this->config, $this->session);
+        $response = $c->logout($request);
+
+        $this->assertInstanceOf(Template::class, $response);
+        $this->assertTrue($response->isSuccessful());
+    }
+
+
     /**
      */
     public function testMainWithAuthSourceAndException(): void
