diff --git a/resources/views/v1/auth/login.twig b/resources/views/v1/auth/login.twig index 3a7b3366317..d9d7c98adcf 100644 --- a/resources/views/v1/auth/login.twig +++ b/resources/views/v1/auth/login.twig @@ -61,7 +61,7 @@

{{ 'sign_in_to_start'|_ }}

-
+
@@ -88,10 +88,10 @@
{% if allowRegistration %} - {{ 'register_new_account'|_ }}
+ {{ 'register_new_account'|_ }}
{% endif %} {% if allowReset %} - {{ 'forgot_my_password'|_ }} + {{ 'forgot_my_password'|_ }} {% endif %}
{% endblock %} diff --git a/resources/views/v1/auth/passwords/email.twig b/resources/views/v1/auth/passwords/email.twig index 90eebad93c5..748949fcfef 100644 --- a/resources/views/v1/auth/passwords/email.twig +++ b/resources/views/v1/auth/passwords/email.twig @@ -27,7 +27,7 @@ {% else %}

{{ 'reset_password'|_ }}

-
+
@@ -43,7 +43,7 @@ {% endif %} - {{ 'want_to_login'|_ }}
+ {{ 'want_to_login'|_ }}
{% if allowRegistration %} {{ 'register_new_account'|_ }}
{% endif %} diff --git a/resources/views/v1/auth/passwords/reset.twig b/resources/views/v1/auth/passwords/reset.twig index e0622ca8f05..82512ed5fbe 100644 --- a/resources/views/v1/auth/passwords/reset.twig +++ b/resources/views/v1/auth/passwords/reset.twig @@ -40,7 +40,7 @@ - {{ 'want_to_login'|_ }}
+ {{ 'want_to_login'|_ }}
{% if allowRegistration %} {{ 'register_new_account'|_ }}
{% endif %} diff --git a/resources/views/v1/auth/register.twig b/resources/views/v1/auth/register.twig index ff9e5b16e22..873870cf42e 100644 --- a/resources/views/v1/auth/register.twig +++ b/resources/views/v1/auth/register.twig @@ -15,7 +15,7 @@ {% include 'v1.partials.password-modal' %} diff --git a/resources/views/v1/partials/menu-sidebar.twig b/resources/views/v1/partials/menu-sidebar.twig index 636f5be0d58..b9de1279cc0 100644 --- a/resources/views/v1/partials/menu-sidebar.twig +++ b/resources/views/v1/partials/menu-sidebar.twig @@ -221,9 +221,14 @@ {% endif %} + + {% if 'remote_user_guard' != authGuard or '' != logoutUri %} +
  • - + {{ 'logout'|_ }} diff --git a/resources/views/v1/profile/index.twig b/resources/views/v1/profile/index.twig index d7709ee8342..e7077141ea6 100644 --- a/resources/views/v1/profile/index.twig +++ b/resources/views/v1/profile/index.twig @@ -52,7 +52,12 @@ {{ 'change_your_password'|_ }}
  • {% endif %} -
  • {{ 'logout'|_ }}
  • + + + +
  • {{ 'logout'|_ }}
  • {% if true == isInternalAuth and true == isInternalIdentity %}
  • diff --git a/resources/views/v2/auth/register.twig b/resources/views/v2/auth/register.twig index eecb4ec4297..c187cea454c 100644 --- a/resources/views/v2/auth/register.twig +++ b/resources/views/v2/auth/register.twig @@ -86,7 +86,7 @@
  • - {{ 'want_to_login'|_ }} + {{ 'want_to_login'|_ }}
  • {{ 'forgot_my_password'|_ }} diff --git a/resources/views/v2/partials/layout/navbar.twig b/resources/views/v2/partials/layout/navbar.twig index fc7df198314..e00088aba4d 100644 --- a/resources/views/v2/partials/layout/navbar.twig +++ b/resources/views/v2/partials/layout/navbar.twig @@ -50,6 +50,9 @@
  • diff --git a/routes/web.php b/routes/web.php index 3c68a467a8b..6eb7ddb5143 100644 --- a/routes/web.php +++ b/routes/web.php @@ -81,7 +81,7 @@ static function () { ['middleware' => 'user-simple-auth', 'namespace' => 'FireflyIII\Http\Controllers'], static function () { Route::get('error', ['uses' => 'DebugController@displayError', 'as' => 'error']); - Route::any('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']); + Route::post('logout', ['uses' => 'Auth\LoginController@logout', 'as' => 'logout']); Route::get('flush', ['uses' => 'DebugController@flush', 'as' => 'flush']); //Route::get('routes', ['uses' => 'DebugController@routes', 'as' => 'routes']); Route::get('debug', 'DebugController@index')->name('debug');