Fix user registration when user is deleted

src/Controllers/Auth/RegisterController.php

@@ -59,7 +59,7 @@ protected function validator(array $data)
         return Validator::make($data, [
             'last_name' => 'required|max:255',
             'first_name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users',
+            'email' => 'required|email|max:255|unique:users,email,NULL,id,deleted_at,NULL',
             'password' => 'required|min:6|confirmed',
         ]);
     }
@@ -85,7 +85,7 @@ protected function create(array $data)
         $userModel = config('auth.providers.users.model');
         $roleModel = config('laratrust.role');
 
-        $user = $userModel::create([
+        $user = $userModel::withTrashed()->updateOrCreate(['email' => $data['email']], [
             'active' => true,
             'first_name' => $data['first_name'],
             'last_name' => $data['last_name'],
@@ -98,8 +98,9 @@ protected function create(array $data)
             $admin = $roleModel::whereName('admin')->first();
             $user->attachRole($admin);
         } else {
+            $user->restore();
             $role = $roleModel::whereName(config('boilerplate.auth.register_role'))->first();
-            $user->attachRole($role);
+            $user->roles()->sync([$role->id]);
         }
 
         return $user;