refactor(frontend): maintain a dedicated logout page to separate session termination from navigation handling, preventing related issues

lib/modules_exec.php

@@ -203,6 +203,7 @@ public function merge_response($request, $session, $page) {
             'router_module_list'  => $this->site_config->get_modules(),
             'router_app_name'     => $this->site_config->get('app_name', 'HM3'),
             'router_js_exclude_deps' => $this->site_config->get('js_exclude_deps'),
+            'router_get_export' => $request->get,
         ));
     }
 }

modules/core/functions.php

@@ -433,20 +433,20 @@ function setup_base_page($name, $source=false, $use_layout=true) {
     add_output($name, 'js_search_data', true, $source);
     add_output($name, 'header_end', false, $source);
     add_output($name, 'msgs', false, $source);
+    add_output($name, 'content_start', false, $source);
+    add_output($name, 'content_section_start', true, $source);
+    add_output($name, 'content_section_end', true, $source);
     if($use_layout) {
-        add_output($name, 'content_start', false, $source);
         add_output($name, 'login_start', false, $source);
         add_output($name, 'login', false, $source);
         add_output($name, 'login_end', false, $source);
         add_output($name, 'date', true, $source);
         add_output($name, 'folder_list_start', true, $source);
         add_output($name, 'folder_list_end', true, $source);
-        add_output($name, 'content_section_start', true, $source);
-        add_output($name, 'content_section_end', true, $source);
         add_output($name, 'modals', true, $source);
         add_output($name, 'save_reminder', true, $source);
-        add_output($name, 'content_end', false, $source, 'page_js', 'after');
     }
+    add_output($name, 'content_end', false, $source, 'page_js', 'after');
     add_output($name, 'page_js', false, $source);
 }}
 

modules/core/handler_modules.php

@@ -774,6 +774,14 @@ class Hm_Handler_logout extends Hm_Handler_Module {
      * Clean up everything on logout
      */
     public function process() {
+        if ($this->request->get['prompt'] ?? false) {
+            $backQuery = isset($this->request->get['back_query']) ? unserialize(base64_decode($this->request->get['back_query'])): [];
+
+            $this->out('cancel_logout_url', '?' . http_build_query($backQuery));
+
+            return;
+        }
+
         if (array_key_exists('logout', $this->request->post) && !$this->session->loaded) {
             $this->session->destroy($this->request);
             Hm_Msgs::add('Session destroyed on logout', 'info');

modules/core/navigation/navigation.js

@@ -30,6 +30,10 @@ window.addEventListener('popstate', function(event) {
 });
 
 window.addEventListener('load', function() {
+    if (!hm_is_logged()) {
+        return;
+    }
+
     const unMountCallback = renderPage(window.location.href);
     history.replaceState({ main: $('#cypht-main').prop('outerHTML'), scripts: extractCustomScripts($(document)) }, "");
 

modules/core/navigation/routes.js

@@ -94,4 +94,8 @@ Now let's validate and use handlers that are given.
 ROUTES = modulesRoutes.filter(route => typeof(window[route.handler]) === 'function').map(route => ({
     ...route,
     handler: window[route.handler]
-}))
+}));
+
+
+/* Output routes */
+OUTPUT_BARE_ROUTES = ['logout'];

modules/core/output_modules.php

@@ -305,6 +305,22 @@ protected function output() {
     }
 }
 
+class Hm_Output_logout extends Hm_Output_Module {
+    /**
+     * Outputs the logout confirmation markup
+     */
+    protected function output() {
+        $cancelUrl = $this->get('cancel_logout_url', '');
+        return '<div class="d-flex w-100 justify-content-center align-items-center vh-100 p-3 flex-column">
+            <p>Do you really want to end the session?</p>
+            <div class="d-flex gap-2">
+                <a class="btn btn-primary" href="'.$cancelUrl.'" ' . (!$cancelUrl ? 'style="display:none;"' : '') . '>'.$this->trans('No, go back').'</a>
+                <a class="btn btn-danger" href="#" id="confirm-logout">'.$this->trans('Yes, log me out').'</a>
+            </div>
+        </div>';
+    }
+}
+
 /**
  * Start the content section for the servers page
  * @subpackage core/output
@@ -1599,7 +1615,7 @@ class Hm_Output_folder_list_content_end extends Hm_Output_Module {
      */
     protected function output() {
         $res = '<div class="sidebar-footer">';
-        $res .= '<a class="logout_link" href="#" title="'. $this->trans('Logout') .'">';
+        $res .= '<a class="logout_link" href=\'?page=logout&prompt=true&back_query='. (base64_encode(serialize($this->get('router_get_export')))) .'\' title="'. $this->trans('Logout') .'">';
         if (!$this->get('hide_folder_icons')) {
             $res .= '<i class="bi bi-power menu-icon"></i>';
         }

modules/core/setup.php

@@ -146,6 +146,11 @@
 setup_base_page('notfound');
 add_output('notfound', 'notfound_content', true, 'core', 'content_section_start', 'after');
 
+/* logout page */
+setup_base_page('logout', 'core', false);
+add_handler('logout', 'logout', true, 'core');
+add_output('logout', 'logout', true, 'core', 'content_section_start', 'after');
+
 /* message action ajax request */
 setup_base_ajax_page('ajax_message_action', 'core');
 
@@ -218,7 +223,8 @@
         'search',
         'ajax_quick_servers_setup',
         'ajax_privacy_settings',
-        'ajax_combined_message_list'
+        'ajax_combined_message_list',
+        'logout',
     ),
     'allowed_output' => array(
         'date' => array(FILTER_UNSAFE_RAW, false),
@@ -282,6 +288,8 @@
         'sort' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'keyword' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
         'screen_emails' => FILTER_SANITIZE_FULL_SPECIAL_CHARS,
+        'prompt' => FILTER_VALIDATE_BOOLEAN,
+        'back_query' => FILTER_UNSAFE_RAW,
     ),
 
     'allowed_post' => array(

modules/core/site.js

@@ -1360,7 +1360,7 @@ var Hm_Folders = {
             return false;
         });
         $('.hide_folders').on("click", function() { return Hm_Folders.hide_folder_list(); });
-        $('.logout_link').on("click", function(e) { return Hm_Utils.confirm_logout(); });
+        // $('.logout_link').on("click", function(e) { return Hm_Utils.confirm_logout(); });
         if (hm_search_terms()) {
             $('.search_terms').val(hm_search_terms());
         }