kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Code for #4023

Browse Source
This commit is contained in:
James Cole
2020-11-07 17:19:23 +01:00
parent febcbac1de
commit 4fa92ed5f7
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Auth/LoginController.php
View File

@@ -198,6 +198,9 @@ class LoginController extends Controller
if ('remote_user_guard' === $authGuard && '' !== $logoutUri) {
return redirect($logoutUri);
}
if ('remote_user_guard' === $authGuard && '' === $logoutUri) {
session()->flash('error',trans('firefly.cant_logout_guard'));
}
$this->guard()->logout();

7
app/Http/Controllers/Controller.php
View File

@@ -62,6 +62,13 @@ abstract class Controller extends BaseController
app('view')->share('DEMO_PASSWORD', config('firefly.demo_password'));
app('view')->share('FF_VERSION', config('firefly.version'));
// share custom auth guard info.
$authGuard = config('firefly.authentication_guard');
$logoutUri = config('firefly.custom_logout_uri');
app('view')->share('authGuard', $authGuard);
app('view')->share('logoutUri', $logoutUri);
// upload size
$maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = app('steam')->phpBytes(ini_get('post_max_size'));