mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Fix second issue in #3809
This commit is contained in:
parent
7a80caf26b
commit
cbeb2675fd
@ -66,13 +66,6 @@ class LoginController extends Controller
|
|||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
$this->middleware('guest')->except('logout');
|
$this->middleware('guest')->except('logout');
|
||||||
|
|
||||||
$loginProvider = config('firefly.login_provider');
|
|
||||||
$authGuard = config('firefly.authentication_guard');
|
|
||||||
$route = request()->route()->getName();
|
|
||||||
if (('eloquent' !== $loginProvider || 'web' !== $authGuard) && 'logout' !== $route) {
|
|
||||||
throw new FireflyException('Using external identity provider. Cannot continue.');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -134,7 +127,15 @@ class LoginController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function showLoginForm(Request $request)
|
public function showLoginForm(Request $request)
|
||||||
{
|
{
|
||||||
Log::channel('audit')->info('Show login form (1.0).');
|
$loginProvider = config('firefly.login_provider');
|
||||||
|
$authGuard = config('firefly.authentication_guard');
|
||||||
|
$route = request()->route()->getName();
|
||||||
|
if (('eloquent' !== $loginProvider || 'web' !== $authGuard) && 'logout' !== $route) {
|
||||||
|
throw new FireflyException('Using external identity provider. Cannot continue.');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Log::channel('audit')->info('Show login form (1.1).');
|
||||||
|
|
||||||
$count = DB::table('users')->count();
|
$count = DB::table('users')->count();
|
||||||
$loginProvider = config('firefly.login_provider');
|
$loginProvider = config('firefly.login_provider');
|
||||||
|
Loading…
Reference in New Issue
Block a user