Make sure login form shows errors again.

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace FireflyIII\Http\Controllers\Auth;
+
+use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Providers\RouteServiceProvider;
+use Illuminate\Foundation\Auth\ConfirmsPasswords;
+
+/**
+ * Class ConfirmPasswordController
+ */
+class ConfirmPasswordController extends Controller
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Confirm Password Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller is responsible for handling password confirmations and
+    | uses a simple trait to include the behavior. You're free to explore
+    | this trait and override any functions that require customization.
+    |
+    */
+
+    use ConfirmsPasswords;
+
+    /**
+     * Where to redirect users when the intended url fails.
+     *
+     * @var string
+     */
+    protected $redirectTo = RouteServiceProvider::HOME;
+
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware('auth');
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * LoginController.php
- * Copyright (c) 2019 thegrumpydictator@gmail.com
+ * Copyright (c) 2020 thegrumpydictator@gmail.com
  *
  * This file is part of Firefly III (https://github.com/firefly-iii).
  *
@@ -25,8 +25,10 @@ namespace FireflyIII\Http\Controllers\Auth;
 use Adldap;
 use DB;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
 use Log;
 
 /**
@@ -47,10 +49,12 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = RouteServiceProvider::HOME;
 
     /**
      * Create a new controller instance.
+     *
+     * @return void
      */
     public function __construct()
     {
@@ -58,12 +62,14 @@ class LoginController extends Controller
         $this->middleware('guest')->except('logout');
     }
 
+
     /**
-     * Log in a user.
+     * Handle a login request to the application.
      *
-     * @param Request $request
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
      *
-     * @return \Illuminate\Http\Response|\Symfony\Component\HttpFoundation\Response|void
      * @throws \Illuminate\Validation\ValidationException
      */
     public function login(Request $request)
@@ -80,6 +86,7 @@ class LoginController extends Controller
             /** @var Adldap\Connections\Provider $provider */
             Adldap::getProvider('default')->setSchema(new $schema);
         }
+
         $this->validateLogin($request);
 
         /** Copied directly from AuthenticatesUsers, but with logging added: */
@@ -114,9 +121,7 @@ class LoginController extends Controller
     /**
      * Show the application's login form.
      *
-     * @param Request $request
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\Response|\Illuminate\View\View
      */
     public function showLoginForm(Request $request)
     {
@@ -146,4 +151,26 @@ class LoginController extends Controller
 
         return view('auth.login', compact('allowRegistration', 'email', 'remember', 'allowReset', 'title'));
     }
+
+    /**
+     * Get the failed login response instance.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws ValidationException
+     */
+    protected function sendFailedLoginResponse(Request $request)
+    {
+        $exception             = ValidationException::withMessages(
+            [
+                $this->username() => [trans('auth.failed')],
+            ]
+        );
+        $exception->redirectTo = route('login');
+
+        throw $exception;
+    }
+
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -23,6 +23,7 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Auth;
 
+use FireflyIII\Events\RegisteredUser;
 use FireflyIII\Http\Controllers\Controller;
 use FireflyIII\Support\Http\Controllers\CreateStuff;
 use FireflyIII\Support\Http\Controllers\RequestInformation;
@@ -30,6 +31,7 @@ use FireflyIII\User;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
+use Log;
 
 /**
  * Class RegisterController
@@ -88,10 +90,10 @@ class RegisterController extends Controller
             return view('error', compact('message'));
         }
 
-        /** @noinspection PhpUndefinedMethodInspection */
         $this->validator($request->all())->validate();
-
-        event(new Registered($user = $this->createUser($request->all())));
+        $user = $this->createUser($request->all());
+        Log::info(sprintf('Registered new user %s', $user->email));
+        event(new RegisteredUser($user, $request->ip()));
 
         $this->guard()->login($user);
 

app/Http/Controllers/Auth/TwoFactorController.php

@@ -22,11 +22,8 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers\Auth;
 
-use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Http\Requests\TokenFormRequest;
 use FireflyIII\User;
-use Illuminate\Cookie\CookieJar;
 use Illuminate\Http\Request;
 use Log;
 use PragmaRX\Google2FALaravel\Support\Authenticator;