Don't allow login if user is pending or rejected; some refactoring of the registration code

app/Http/Controllers/Auth/LoginController.php

@@ -2,8 +2,13 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+use App\Http\Controllers\Controller;
+use App\Models\Enums\PilotState;
 
 class LoginController extends Controller
 {
@@ -20,4 +25,32 @@ class LoginController extends Controller
     {
         return $this->view('auth/login');
     }
+
+    protected function sendLoginResponse(Request $request)
+    {
+        $request->session()->regenerate();
+        $this->clearLoginAttempts($request);
+
+        $user = Auth::user();
+
+        // TODO: How to handle ON_LEAVE?
+        if($user->state !== PilotState::ACTIVE) {
+
+            // Log them out
+            $this->guard()->logout();
+            $request->session()->invalidate();
+
+            // Redirect to one of the error pages
+            if($user->state === PilotState::PENDING) {
+                return $this->view('auth.pending');
+            }
+
+            elseif ($user->state === PilotState::REJECTED) {
+                return $this->view('auth.rejected');
+            }
+        }
+
+        return $this->authenticated($request, $this->guard()->user())
+            ?: redirect()->intended($this->redirectPath());
+    }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers\Auth;
 
+use App\Models\Enums\PilotState;
+use Log;
 use App\Facades\Utils;
 use App\Models\User;
 use Illuminate\Support\Facades\Hash;
@@ -70,14 +72,6 @@ class RegisterController extends Controller
      */
     protected function create(array $data)
     {
-        $this->validate(request(), [
-            'name' => 'required',
-            'email' => 'required|email',
-            'airline' => 'required',
-            'home_airport' => 'required',
-            'password' => 'required|confirmed'
-        ]);
-
         $opts = [
             'name' => $data['name'],
             'email' => $data['email'],
@@ -91,6 +85,32 @@ class RegisterController extends Controller
         $user = User::create($opts);
         $user = $this->userService->createPilot($user);
 
+        Log::info('User registered: ', $user->toArray());
+
         return $user;
     }
+
+    /**
+     * Handle a registration request for the application.
+     * @throws \RuntimeException
+     */
+    public function register(Request $request)
+    {
+        $this->validate(request(), [
+            'name' => 'required',
+            'email' => 'required|unique:users|email',
+            'airline' => 'required',
+            'home_airport' => 'required',
+            'password' => 'required|confirmed'
+        ]);
+
+        $user = $this->create($request->all());
+
+        if($user->state === PilotState::PENDING) {
+            return $this->view('auth.pending');
+        }
+
+        $this->guard()->login($user);
+        return redirect('/dashboard');
+    }
 }