mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-12 15:35:15 +00:00
Fix huntr.dev logout issue.
This commit is contained in:
@@ -61,7 +61,7 @@
|
|||||||
<div class="login-box-body">
|
<div class="login-box-body">
|
||||||
<p class="login-box-msg">{{ 'sign_in_to_start'|_ }}</p>
|
<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() }}"/>
|
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
|
||||||
|
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
@@ -88,10 +88,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
{% if allowRegistration %}
|
{% 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 %}
|
{% endif %}
|
||||||
{% if allowReset %}
|
{% if allowReset %}
|
||||||
<a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
|
<a href="{{ route('password.reset.request') }}">{{ 'forgot_my_password'|_ }}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@@ -27,7 +27,7 @@
|
|||||||
{% else %}
|
{% else %}
|
||||||
<p class="login-box-msg">{{ 'reset_password'|_ }}</p>
|
<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() }}"/>
|
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
|
||||||
|
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
</form>
|
</form>
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br>
|
<a href="{{ route('login') }}">{{ 'want_to_login'|_ }}</a><br>
|
||||||
{% if allowRegistration %}
|
{% if allowRegistration %}
|
||||||
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
|
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br>
|
<a href="{{ route('login') }}">{{ 'want_to_login'|_ }}</a><br>
|
||||||
{% if allowRegistration %}
|
{% if allowRegistration %}
|
||||||
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
|
<a href="{{ route('register') }}" class="text-center">{{ 'register_new_account'|_ }}</a><br>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
<div class="register-box-body">
|
<div class="register-box-body">
|
||||||
<p class="login-box-msg">{{ 'register_new_account'|_ }}</p>
|
<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() }}">
|
<input type="hidden" name="_token" value="{{ csrf_token() }}">
|
||||||
|
|
||||||
<div class="form-group has-feedback">
|
<div class="form-group has-feedback">
|
||||||
@@ -41,8 +41,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a><br>
|
<a href="{{ route('login') }}">{{ 'want_to_login'|_ }}</a><br>
|
||||||
<a href="{{ URL.to('/password/reset') }}">{{ 'forgot_my_password'|_ }}</a>
|
<a href="{{ route('password.reset.request') }}">{{ 'forgot_my_password'|_ }}</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% include 'v1.partials.password-modal' %}
|
{% include 'v1.partials.password-modal' %}
|
||||||
|
@@ -221,9 +221,14 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
|
||||||
{% if 'remote_user_guard' != authGuard or '' != logoutUri %}
|
{% 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>
|
<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 class="fa fa-sign-out fa-fw"></span>
|
||||||
<span>{{ 'logout'|_ }}</span>
|
<span>{{ 'logout'|_ }}</span>
|
||||||
</a>
|
</a>
|
||||||
|
@@ -52,7 +52,12 @@
|
|||||||
<a href="{{ route('profile.change-password') }}">{{ 'change_your_password'|_ }}</a>
|
<a href="{{ route('profile.change-password') }}">{{ 'change_your_password'|_ }}</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% 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 %}
|
{% if true == isInternalAuth and true == isInternalIdentity %}
|
||||||
<li>
|
<li>
|
||||||
|
@@ -86,7 +86,7 @@
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ URL.to('/login') }}">{{ 'want_to_login'|_ }}</a>
|
<a href="{{ route('login') }}">{{ 'want_to_login'|_ }}</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href="{{ route('password.reset.request') }}">{{ 'forgot_my_password'|_ }}</a>
|
<a href="{{ route('password.reset.request') }}">{{ 'forgot_my_password'|_ }}</a>
|
||||||
|
@@ -50,6 +50,9 @@
|
|||||||
</li>
|
</li>
|
||||||
<!-- Notifications Dropdown Menu -->
|
<!-- Notifications Dropdown Menu -->
|
||||||
<li class="nav-item dropdown">
|
<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="#">
|
<a class="nav-link" data-toggle="dropdown" href="#">
|
||||||
<span class="far fa-user"></span>
|
<span class="far fa-user"></span>
|
||||||
</a>
|
</a>
|
||||||
@@ -62,7 +65,7 @@
|
|||||||
<span class="fas fa-fw fa-cogs mr-2"></span> {{ 'preferences'|_ }}
|
<span class="fas fa-fw fa-cogs mr-2"></span> {{ 'preferences'|_ }}
|
||||||
</a>
|
</a>
|
||||||
<div class="dropdown-divider"></div>
|
<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'|_ }}
|
<span class="fas fa-sign-out-alt mr-2"></span> {{ 'logout'|_ }}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -81,7 +81,7 @@ Route::group(
|
|||||||
['middleware' => 'user-simple-auth', 'namespace' => 'FireflyIII\Http\Controllers'],
|
['middleware' => 'user-simple-auth', 'namespace' => 'FireflyIII\Http\Controllers'],
|
||||||
static function () {
|
static function () {
|
||||||
Route::get('error', ['uses' => 'DebugController@displayError', 'as' => 'error']);
|
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('flush', ['uses' => 'DebugController@flush', 'as' => 'flush']);
|
||||||
//Route::get('routes', ['uses' => 'DebugController@routes', 'as' => 'routes']);
|
//Route::get('routes', ['uses' => 'DebugController@routes', 'as' => 'routes']);
|
||||||
Route::get('debug', 'DebugController@index')->name('debug');
|
Route::get('debug', 'DebugController@index')->name('debug');
|
||||||
|
Reference in New Issue
Block a user