diff --git a/app/Http/Controllers/Admin/UserManagement.php b/app/Http/Controllers/Admin/UserManagement.php index 07cb8d8e..06d8405b 100644 --- a/app/Http/Controllers/Admin/UserManagement.php +++ b/app/Http/Controllers/Admin/UserManagement.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Http\Requests; +use App\Http\Requests\CreateNewUser; use App\Models\User; -use Illuminate\Contracts\Hashing\Hasher; use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; @@ -43,18 +43,12 @@ class UserManagement extends Controller * * This method saves new user into database * - * @param Request $request + * @param CreateNewUser $request + * + * @return \Illuminate\Http\RedirectResponse */ - protected function postRegistration(Request $request) + protected function postRegistration(CreateNewUser $request) { - - // validate input data - $this->validate($request, [ - 'role' => 'required', - 'email' => 'required|email|max:128|unique:users', - 'password' => 'required|min:6' - ]); - // when user did not provide any username, use his email $username = isset($request->username) && !empty($request->username) ? $request->username : $request->email; diff --git a/app/Http/Requests/CreateNewUser.php b/app/Http/Requests/CreateNewUser.php new file mode 100644 index 00000000..8295ddc3 --- /dev/null +++ b/app/Http/Requests/CreateNewUser.php @@ -0,0 +1,33 @@ +role == User::ROLE_ADMIN; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'role' => 'required', + 'email' => 'required|email|max:128|unique:users', + 'password' => 'required|min:6' + ]; + } +}