kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-14 16:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup showLoginForm()

Browse Source
This commit is contained in:
James Cole
2019-08-17 06:24:49 +02:00
parent fbd7c9ae07
commit 0796e422d4
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,6 @@ use Adldap;
use DB; use DB;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Cookie\CookieJar;
use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log; use Log;
@@ -126,20 +125,16 @@ class LoginController extends Controller
{ {
$count = DB::table('users')->count(); $count = DB::table('users')->count();
$loginProvider = config('firefly.login_provider'); $loginProvider = config('firefly.login_provider');
$pageTitle = (string)trans('firefly.login_page_title'); $title = (string)trans('firefly.login_page_title');
if (0 === $count && 'eloquent' === $loginProvider) { if (0 === $count && 'eloquent' === $loginProvider) {
return redirect(route('register')); // @codeCoverageIgnore return redirect(route('register')); // @codeCoverageIgnore
} }
// forget 2fa session thing.
$request->session()->forget('twoFactorAuthenticated');
// is allowed to? // is allowed to?
$singleUserMode = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $singleUserMode = app('fireflyconfig')->get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count();
$allowRegistration = true; $allowRegistration = true;
$allowReset = true; $allowReset = true;
if (true === $singleUserMode && $userCount > 0) { if (true === $singleUserMode && $count > 0) {
$allowRegistration = false; $allowRegistration = false;
} }
@@ -152,6 +147,6 @@ class LoginController extends Controller
$email = $request->old('email'); $email = $request->old('email');
$remember = $request->old('remember'); $remember = $request->old('remember');
return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'pageTitle')); return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title'));
} }
} }