IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix huntr.dev logout issue.

Browse Source
This commit is contained in:
James Cole 2021-11-09 18:46:49 +01:00
parent 81f4e92231
commit 47fa9e3956
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5
9 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/v1/auth/login.twig
View File

@ -61,7 +61,7 @@
<div class="login-box-body">
<p class="login-box-msg">{{ 'sign_in_to_start'|_ }}</p>
<form action="{{ URL.to('/login') }}" method="post">
<form action="{{ route('login') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="form-group has-feedback">
@ -88,10 +88,10 @@
</div>
</form>
{% if allowRegistration %}
<a href="{{ URL.to('/register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
{% endif %}
{% if allowReset %}
<a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
<a href="{{ route('password.reset.request') }}">{{ 'forgot_my_password'|_ }}</a>
{% endif %}
</div>
{% endblock %}

4
resources/views/v1/auth/passwords/email.twig
View File

@ -27,7 +27,7 @@
{% else %}
<p class="login-box-msg">{{ 'reset_password'|_ }}</p>
<form role="form" method="POST" action="{{ URL.to('/password/email') }}">
<form role="form" method="POST" action="{{ route('password.email') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="form-group has-feedback">
@ -43,7 +43,7 @@
</form>
{% endif %}
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br>
<a href="{{ route('login') }}">{{ 'want_to_login'|_ }}</a><br>
{% if allowRegistration %}
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
{% endif %}

2
resources/views/v1/auth/passwords/reset.twig
View File

@ -40,7 +40,7 @@
</form>
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br>
<a href="{{ route('login') }}">{{ 'want_to_login'|_ }}</a><br>
{% if allowRegistration %}
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
{% endif %}

6
resources/views/v1/auth/register.twig
View File

@ -15,7 +15,7 @@
<div class="register-box-body">
<p class="login-box-msg">{{ 'register_new_account'|_ }}</p>
<form id="register" method="POST" action="{{ URL.to('/register') }}">
<form id="register" method="POST" action="{{ route('register') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="form-group has-feedback">
@ -41,8 +41,8 @@
</div>
</form>
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br>
<a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
<a href="{{ route('login') }}">{{ 'want_to_login'|_ }}</a><br>
<a href="{{ route('password.reset.request') }}">{{ 'forgot_my_password'|_ }}</a>
</div>
{% include 'v1.partials.password-modal' %}

7
resources/views/v1/partials/menu-sidebar.twig
View File

@ -221,9 +221,14 @@
{% endif %}
</ul>
</li>
{% 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') }}">
<a href="{{ route('logout') }}" onclick="event.preventDefault();document.getElementById('logout-form').submit();">
<span class="fa fa-sign-out fa-fw"></span>
<span>{{ 'logout'|_ }}</span>
</a>

7
resources/views/v1/profile/index.twig
View File

@ -52,7 +52,12 @@
<a href="{{ route('profile.change-password') }}">{{ 'change_your_password'|_ }}</a>
</li>
{% endif %}
<li><a href="{{ route('logout') }}">{{ 'logout'|_ }}</a></li>
<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>
{% if true == isInternalAuth and true == isInternalIdentity %}
<li>

2
resources/views/v2/auth/register.twig
View File

@ -86,7 +86,7 @@
</a>
</li>
<li>
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a>
<a href="{{ route('login') }}">{{ 'want_to_login'|_ }}</a>
</li>
<li>
<a href="{{ route('password.reset.request') }}">{{ 'forgot_my_password'|_ }}</a>

5
resources/views/v2/partials/layout/navbar.twig
View File

@ -50,6 +50,9 @@
</li>
<!-- Notifications Dropdown Menu -->
<li class="nav-item dropdown">
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
</form>
<a class="nav-link" data-toggle="dropdown" href="#">
<span class="far fa-user"></span>
</a>
@ -62,7 +65,7 @@
<span class="fas fa-fw fa-cogs mr-2"></span> {{ 'preferences'|_ }}
</a>
<div class="dropdown-divider"></div>
<a href="{{ route('logout') }}" class="dropdown-item">
<a href="{{ route('logout') }}" class="dropdown-item" onclick="event.preventDefault();document.getElementById('logout-form').submit();">
<span class="fas fa-sign-out-alt mr-2"></span> {{ 'logout'|_ }}
</a>
</div>

2
routes/web.php
View File

@ -81,7 +81,7 @@ Route::group(
['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');