Refactor logout-code

Author: tvdijen

routing/routes/routes.yml

@@ -1,3 +1,9 @@
 consentadmin-main:
     path:       /
     defaults:   { _controller: 'SimpleSAML\Module\consentadmin\Controller\ConsentAdmin::main' }
+    methods: [GET]
+
+consentadmin-logout:
+    path:       /logout
+    defaults:   { _controller: 'SimpleSAML\Module\consentadmin\Controller\ConsentAdmin::logout' }
+    methods: [GET]

src/Controller/ConsentAdmin.php

@@ -131,26 +131,31 @@ public function setConsent(Consent $consent): void
     /**
      * @param \Symfony\Component\HttpFoundation\Request $request The current request.
      *
-     * @return \SimpleSAML\XHTML\Template
+     * @return void
      */
-    public function main(Request $request): Template
+    public function logout(Request $request): void
     {
         $authority = $this->moduleConfig->getValue('authority');
-
         $as = new $this->authSimple($authority);
 
-        // If request is a logout request
-        $logout = $request->get('logout');
-        if ($logout !== null) {
-            $returnURL = $this->moduleConfig->getValue('returnURL');
-            $as->logout($returnURL);
-        }
+        $returnURL = $this->moduleConfig->getValue('returnURL');
+        $as->logout($returnURL);
+    }
 
-        $hashAttributes = $this->moduleConfig->getOptionalValue('attributes.hash', false);
 
+    /**
+     * @param \Symfony\Component\HttpFoundation\Request $request The current request.
+     *
+     * @return \SimpleSAML\XHTML\Template
+     */
+    public function main(Request $request): Template
+    {
+        $hashAttributes = $this->moduleConfig->getOptionalValue('attributes.hash', false);
         $excludeAttributes = $this->moduleConfig->getOptionalValue('attributes.exclude', []);
 
         // Check if valid local session exists
+        $authority = $this->moduleConfig->getValue('authority');
+        $as = new $this->authSimple($authority);
         $as->requireAuth();
 
         // Get released attributes

templates/consentadmin.twig

@@ -77,6 +77,6 @@
 <p>{{ '{consentAdmin:consentadmin:consentadmin_description2}'|trans|raw }}</p>
 
 <h2>Logout</h2>
-<p><a href="/{{ baseurlpath }}module.php/consentAdmin/consentAdmin.php?logout=1">Logout</a></p>
+<p><a href="{{ moduleURL('consentAdmin/consentAdmin/logout'}}">Logout</a></p>
 
 {% endblock %}