From 16391fe99c88a42bf4152cff5c0038cf92456a55 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 13 Nov 2021 10:54:04 +0100
Subject: [PATCH 1/5] Fix #5276

---
 public/v1/js/ff/firefly.js                    | 6 ++++++
 resources/views/v1/layout/default.twig        | 3 +++
 resources/views/v1/partials/menu-sidebar.twig | 5 +----
 resources/views/v1/profile/index.twig         | 6 +-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/v1/js/ff/firefly.js b/public/v1/js/ff/firefly.js
index fe919d3dc8..6715e3db06 100644
--- a/public/v1/js/ff/firefly.js
+++ b/public/v1/js/ff/firefly.js
@@ -25,6 +25,12 @@ $(function () {
 
     configAccounting(currencySymbol);
 
+    // on submit of logout button:
+    $('.logout-link').click(function(e) {
+        e.preventDefault();
+        document.getElementById('logout-form').submit();
+    });
+
     // on submit of form, disable any button in form:
     $('form.form-horizontal:not(.nodisablebutton)').on('submit', function () {
         $('button[type="submit"]').prop('disabled', true);
diff --git a/resources/views/v1/layout/default.twig b/resources/views/v1/layout/default.twig
index cf02557e28..254e6f207f 100644
--- a/resources/views/v1/layout/default.twig
+++ b/resources/views/v1/layout/default.twig
@@ -239,6 +239,9 @@
         );
     }
 </script>
+<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+    <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+</form>
 
 </body>
 </html>
diff --git a/resources/views/v1/partials/menu-sidebar.twig b/resources/views/v1/partials/menu-sidebar.twig
index b9de1279cc..07a57665c5 100644
--- a/resources/views/v1/partials/menu-sidebar.twig
+++ b/resources/views/v1/partials/menu-sidebar.twig
@@ -224,11 +224,8 @@
 
 
     {% if 'remote_user_guard' != authGuard or '' != logoutUri %}
-        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
-            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
-        </form>
         <li>
-            <a href="{{ route('logout') }}" onclick="event.preventDefault();document.getElementById('logout-form').submit();">
+            <a href="{{ route('logout') }}" class="logout-link">
                 <span class="fa fa-sign-out fa-fw"></span>
                 <span>{{ 'logout'|_ }}</span>
             </a>
diff --git a/resources/views/v1/profile/index.twig b/resources/views/v1/profile/index.twig
index e7077141ea..631dd0e3b5 100644
--- a/resources/views/v1/profile/index.twig
+++ b/resources/views/v1/profile/index.twig
@@ -53,11 +53,7 @@
                                         </li>
                                         {% endif %}
 
-                                        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
-                                            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
-                                        </form>
-
-                                        <li><a href="{{ route('logout') }}" onclick="event.preventDefault();document.getElementById('logout-form').submit();">{{ 'logout'|_ }}</a></li>
+                                        <li><a href="{{ route('logout') }}" class="logout-link">{{ 'logout'|_ }}</a></li>
 
                                         {% if true == isInternalAuth and true == isInternalIdentity %}
                                         <li>

From 3caf1f2d369ae88c960ccd022c44e809f908d6e1 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 13 Nov 2021 11:00:42 +0100
Subject: [PATCH 2/5] Add return statement

---
 public/v1/js/ff/firefly.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/v1/js/ff/firefly.js b/public/v1/js/ff/firefly.js
index 6715e3db06..91ee63eaeb 100644
--- a/public/v1/js/ff/firefly.js
+++ b/public/v1/js/ff/firefly.js
@@ -29,6 +29,7 @@ $(function () {
     $('.logout-link').click(function(e) {
         e.preventDefault();
         document.getElementById('logout-form').submit();
+        return false;
     });
 
     // on submit of form, disable any button in form:

From 8b84a4b3362c91146e5dc5f5a385c42db9695db7 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 13 Nov 2021 11:04:42 +0100
Subject: [PATCH 3/5] Add changelog.

---
 changelog.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/changelog.md b/changelog.md
index a39376102a..9006cd4b7c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 5.6.4 - 2021-11-13
+
+### Fixed
+- #5276 Sloppy release, this fixes an issue with logging out.
+
 ## 5.6.3 - 2021-11-12
 
 ### Changed

From 72fd263ddfe079ccf6b869f3e8c8db3988267ed8 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 13 Nov 2021 11:05:57 +0100
Subject: [PATCH 4/5] Update version

---
 config/firefly.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/firefly.php b/config/firefly.php
index 84b71ad0e6..85f81f924e 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -101,7 +101,7 @@ return [
         'webhooks'     => true,
         'handle_debts' => true,
     ],
-    'version'                      => '5.6.3',
+    'version'                      => '5.6.4',
     'api_version'                  => '1.5.4',
     'db_version'                   => 18,
 

From 2c9733e7391b72bc3ef7513ec59c1eb9720f723f Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 13 Nov 2021 11:11:32 +0100
Subject: [PATCH 5/5] Update meta files for new release.

---
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 9006cd4b7c..654b79e437 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,7 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## 5.6.4 - 2021-11-13
 
 ### Fixed
-- #5276 Sloppy release, this fixes an issue with logging out.
+- [Issue 5276](https://github.com/firefly-iii/firefly-iii/issues/5276) Sloppy release, this fixes an issue with logging out.
 
 ## 5.6.3 - 2021-11-12