From ae8c2aa66ea264130e1f1724a99d24c21f654751 Mon Sep 17 00:00:00 2001 From: saparatayev Date: Thu, 24 Mar 2022 15:58:01 +0500 Subject: [PATCH 1/2] Revert "fix: logout without csrf" This reverts commit f4bfc93f1869ce6d718774a7ad1a5839784e908c. --- app/Http/Middleware/VerifyCsrfToken.php | 1 - resources/js/Layouts/AppLayout.vue | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 4965a26..6d1b985 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -14,6 +14,5 @@ class VerifyCsrfToken extends Middleware protected $except = [ '/exports/import', '/imports/import', - '/logout', ]; } diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue index d99edfc..8616bed 100644 --- a/resources/js/Layouts/AppLayout.vue +++ b/resources/js/Layouts/AppLayout.vue @@ -28,9 +28,7 @@ {{ trans("Logout") }} -
- -
+
@@ -46,6 +44,10 @@ export default { } }, + data() { + return {}; + }, + computed: { links() { return [ @@ -104,8 +106,7 @@ export default { }, logout() { - event.preventDefault() - document.getElementById('logout-form').submit() + this.$inertia.post(this.route("logout")); }, }, }; From 3b2a736d640f3e7d52857b7a48aad43aaba4d828 Mon Sep 17 00:00:00 2001 From: saparatayev Date: Thu, 24 Mar 2022 15:59:58 +0500 Subject: [PATCH 2/2] Revert "return to inertia logout" This reverts commit 8a543d317aa6ae1e32dd667e9816f6255b6459a3. --- resources/js/Layouts/AppLayout.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/resources/js/Layouts/AppLayout.vue b/resources/js/Layouts/AppLayout.vue index 8616bed..8c2ef66 100644 --- a/resources/js/Layouts/AppLayout.vue +++ b/resources/js/Layouts/AppLayout.vue @@ -28,7 +28,9 @@ {{ trans("Logout") }} - +
+ +
@@ -45,7 +47,9 @@ export default { }, data() { - return {}; + return { + csrf: document.querySelector('meta[name="csrf-token"]').getAttribute('content') + }; }, computed: { @@ -106,7 +110,8 @@ export default { }, logout() { - this.$inertia.post(this.route("logout")); + event.preventDefault() + document.getElementById('logout-form').submit() }, }, };