From dc6ce0d62d87b832f73d20c96c3e1441ecaa96c4 Mon Sep 17 00:00:00 2001
From: Willem Poortman <git@wpoortman.nl>
Date: Tue, 21 Mar 2023 10:03:44 +0100
Subject: [PATCH] Added a custom onPageExpired handler callback

---
 src/view/frontend/layout/default_hyva.xml     |  4 +-
 .../page/js/magewire/plugin/error.phtml       | 50 +++++++++++++++++++
 .../page/js/magewire/plugin/exception.phtml   | 46 -----------------
 3 files changed, 52 insertions(+), 48 deletions(-)
 create mode 100644 src/view/frontend/templates/page/js/magewire/plugin/error.phtml
 delete mode 100644 src/view/frontend/templates/page/js/magewire/plugin/exception.phtml

diff --git a/src/view/frontend/layout/default_hyva.xml b/src/view/frontend/layout/default_hyva.xml
index fa14b27..ae32e89 100644
--- a/src/view/frontend/layout/default_hyva.xml
+++ b/src/view/frontend/layout/default_hyva.xml
@@ -46,8 +46,8 @@
                            ifconfig="dev/magewire/loader/enable"
                            template="Magewirephp_Magewire::page/js/magewire/plugin/loader.phtml"/>
 
-                    <block name="magewire.plugin.exception"
-                           template="Magewirephp_Magewire::page/js/magewire/plugin/exception.phtml"
+                    <block name="magewire.plugin.error"
+                           template="Magewirephp_Magewire::page/js/magewire/plugin/error.phtml"
                     >
                         <arguments>
                             <argument name="view_model" xsi:type="object">
diff --git a/src/view/frontend/templates/page/js/magewire/plugin/error.phtml b/src/view/frontend/templates/page/js/magewire/plugin/error.phtml
new file mode 100644
index 0000000..17dfd03
--- /dev/null
+++ b/src/view/frontend/templates/page/js/magewire/plugin/error.phtml
@@ -0,0 +1,50 @@
+<?php declare(strict_types=1);
+/**
+ * Copyright © Willem Poortman 2021-present. All rights reserved.
+ *
+ * Please read the README and LICENSE files for more
+ * details on copyrights and license information.
+ */
+
+/** @var Magewire $magewireScripts */
+/** @var Escaper $escaper */
+/** @var Template $block */
+
+use Magento\Framework\Escaper;
+use Magento\Framework\View\Element\Template;
+use Magewirephp\Magewire\ViewModel\Magewire;
+
+$magewireScripts = $block->getViewModel();
+$messages = $block->getData('status_messages');
+?>
+<script>
+    'use strict';
+
+    Magewire.onPageExpired(() => {
+        alert('<?= $escaper->escapeJs(__($messages[419] ?? 'Your session has expired due to inactivity.')) ?>')
+        window.location.reload()
+    })
+
+    Magewire.onError((status, response) => {
+        <?php /* We need to make sure Magewire reaches the native 419 handling. */ ?>
+        if (status === 419) {
+            return
+        }
+
+        <?php if ($magewireScripts->isProductionMode()): ?>
+        response.text().then((result) => {
+            let messages = <?= /** @noEscape */ json_encode(array_map('__', $messages)) ?>
+            result = JSON.parse(result)
+
+            console.error(
+                `Magewire: ${ messages[status] || result.message || 'Something went wrong' } (${ status })`
+            )
+        }).catch((exception) => {
+            console.error(exception)
+        })
+
+        return false
+        <?php endif ?>
+    })
+</script>
+
diff --git a/src/view/frontend/templates/page/js/magewire/plugin/exception.phtml b/src/view/frontend/templates/page/js/magewire/plugin/exception.phtml
deleted file mode 100644
index a8ded6d..0000000
--- a/src/view/frontend/templates/page/js/magewire/plugin/exception.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php declare(strict_types=1);
-/**
- * Copyright © Willem Poortman 2021-present. All rights reserved.
- *
- * Please read the README and LICENSE files for more
- * details on copyrights and license information.
- */
-
-/** @var Magewire $magewireScripts */
-/** @var Escaper $escaper */
-/** @var Template $block */
-
-use Magento\Framework\Escaper;
-use Magento\Framework\View\Element\Template;
-use Magewirephp\Magewire\ViewModel\Magewire;
-
-$magewireScripts = $block->getViewModel();
-$messages = $block->getData('status_messages');
-?>
-<?php if ($magewireScripts->isProductionMode()): ?>
-    <script>
-        'use strict';
-
-        Magewire.onError((status, response) => {
-            if (status === 419) {
-                alert('<?= $escaper->escapeJs(__($messages[419] ?? 'The session has expired.')) ?>')
-                window.location.reload()
-
-                return false
-            }
-
-            response.text().then((result) => {
-                let messages = <?= /** @noEscape */ json_encode(array_map('__', $messages)) ?>
-                result = JSON.parse(result)
-
-                console.error(
-                    `Magewire: ${ messages[status] || result.message || 'Something went wrong' } (${ status })`
-                )
-            }).catch((exception) => {
-                console.error(exception)
-            })
-
-            return false
-        })
-    </script>
-<?php endif ?>