Beta version

This commit is too large to list all changes.

app/Http/Controllers/Auth/LoginController.php

@@ -2,9 +2,11 @@
 
 namespace App\Http\Controllers\Auth;
 
+use App\User;
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
@@ -19,7 +21,9 @@ class LoginController extends Controller
     |
     */
 
-    use AuthenticatesUsers;
+    use AuthenticatesUsers {
+        attemptLogin as protected originalAttemptLogin;
+    }
 
     /**
      * Where to redirect users after login.
@@ -37,4 +41,29 @@ class LoginController extends Controller
     {
         $this->middleware('guest')->except('logout');
     }
+
+    // We can't customise the error message, since that would imply overriding the login method, which is large.
+    // Also, the user should never know that they're banned.
+    public function attemptLogin(Request $request) 
+    {
+        $user = User::where('email', $request->email)->first();
+
+        if ($user)
+        {
+            $isBanned = $user->isBanned();
+            if ($isBanned)
+            {
+                return false;
+            }
+            else
+            {
+                return $this->originalAttemptLogin($request);
+            }
+        }
+        
+        return $this->originalAttemptLogin($request);
+        
+    }
+
+
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -43,6 +43,21 @@ class RegisterController extends Controller
         $this->middleware('guest');
     }
 
+    public function showRegistrationForm()
+    {
+        $users = User::where('originalIP', \request()->ip())->get();
+
+        foreach($users as $user)
+        {
+            if ($user && $user->isBanned())
+            {
+                abort(403, 'You do not have permission to access this page.');
+            }
+        }
+
+        return view('auth.register');
+    }
+
     /**
      * Get a validator for an incoming registration request.
      *
@@ -78,15 +93,10 @@ class RegisterController extends Controller
             'originalIP' => request()->ip()
         ]);
 
-        Profile::create([
-
-            'profileShortBio' => 'Write a one-liner about you here!',
-            'profileAboutMe' => 'Tell us a bit about you.',
-            'socialLinks' => '{}',
-            'userID' => $user->id
-
-        ]);
+        // It's not the registration controller's concern to create a profile for the user,
+        // so this code has been moved to it's respective observer, following the separation of concerns pattern.
 
+        $user->assignRole('user');
         return $user;
     }
 }