Removed redundant items, upgraded to laravel 5.6

app/Http/Controllers/Auth/LoginController.php

@@ -36,11 +36,4 @@ class LoginController extends Controller
     {
         $this->middleware('guest')->except('logout');
     }
-
-	public function showLoginForm()
-	{
-		return view('auth.login',[
-			'site_social'=>[['name'=>'facebook','url'=>'#'],['name'=>'twitter','url'=>'#']],
-		]);
-	}
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Auth;
 
 use App\User;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
@@ -51,6 +52,9 @@ class RegisterController extends Controller
             'name' => 'required|string|max:255',
             'email' => 'required|string|email|max:255|unique:users',
             'password' => 'required|string|min:6|confirmed',
+            'token'    => 'required|doorman:email',
+            'password' => 'required|min:6|confirmed',
+            'terms'    => 'required',
         ]);
     }
 
@@ -62,10 +66,25 @@ class RegisterController extends Controller
      */
     protected function create(array $data)
     {
-        return User::create([
+        $fields = [
             'name' => $data['name'],
             'email' => $data['email'],
-            'password' => bcrypt($data['password']),
-        ]);
+            'password' => Hash::make($data['password']),
+        ];
+
+        if (config('auth.providers.users.field','email') === 'username' && isset($data['username'])) {
+            $fields['username'] = $data['username'];
+        }
+
+        try {
+            Doorman::redeem($data['token'],$data['email']);
+
+        // @todo Want to direct or display an appropriate error message (although the form validation does it anyway).
+        } catch (DoormanException $e) {
+            redirect('/error');
+            abort(403);
+        }
+
+        return User::create($fields);
     }
 }