Merge branch 'release/5.6.4'

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
+- [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
 
 ### Changed

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,
 

public/v1/js/ff/firefly.js

@@ -25,6 +25,13 @@ $(function () {
 
     configAccounting(currencySymbol);
 
+    // on submit of logout button:
+    $('.logout-link').click(function(e) {
+        e.preventDefault();
+        document.getElementById('logout-form').submit();
+        return false;
+    });
+
     // on submit of form, disable any button in form:
     $('form.form-horizontal:not(.nodisablebutton)').on('submit', function () {
         $('button[type="submit"]').prop('disabled', true);

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>

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>

resources/views/v1/profile/index.twig

@@ -53,11 +53,7 @@
                                         </li>
                                         {% endif %}
 
-                                        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
+                                        <li><a href="{{ route('logout') }}" class="logout-link">{{ 'logout'|_ }}</a></li>
-                                            <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>
 
                                         {% if true == isInternalAuth and true == isInternalIdentity %}
                                         <li>