diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index d267886..d74001a 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -15,6 +15,9 @@ class Kernel extends HttpKernel */ protected $middleware = [ \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class, + \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, + \App\Http\Middleware\TrimStrings::class, + \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, ]; /** diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php new file mode 100644 index 0000000..943e9a4 --- /dev/null +++ b/app/Http/Middleware/TrimStrings.php @@ -0,0 +1,18 @@ + 'required|max:50', - 'proposal_date' => 'date|date_format:Y-m-d', - 'proposal_value' => 'numeric', - 'customer_id' => 'numeric', - 'customer_name' => 'required_without:customer_id|max:60', - 'customer_email' => 'required_without:customer_id|email|unique:users,email', - 'description' => 'max:255', + 'name' => 'required|max:50', + 'proposal_date' => 'nullable|date|date_format:Y-m-d', + 'proposal_value' => 'nullable|numeric', + 'customer_id' => 'nullable|numeric', + 'customer_name' => 'nullable|required_without:customer_id|max:60', + 'customer_email' => 'nullable|required_without:customer_id|email|unique:users,email', + 'description' => 'nullable|max:255', ]; } diff --git a/app/Http/Requests/Users/UpdateRequest.php b/app/Http/Requests/Users/UpdateRequest.php index 57ee8c1..ba3d4c2 100644 --- a/app/Http/Requests/Users/UpdateRequest.php +++ b/app/Http/Requests/Users/UpdateRequest.php @@ -24,11 +24,11 @@ class UpdateRequest extends Request public function rules() { return [ - 'name' => 'required|min:5', - 'username' => 'required|alpha_dash|min:4|unique:users,username,' . $this->segment(2), - 'email' => 'required|email|unique:users,email,' . $this->segment(2), - 'role' => 'required|array', - 'password' => 'required_with:password_confirmation|between:6,15|confirmed', + 'name' => 'required|min:5', + 'username' => 'required|alpha_dash|min:4|unique:users,username,' . $this->segment(2), + 'email' => 'required|email|unique:users,email,' . $this->segment(2), + 'role' => 'required|array', + 'password' => 'nullable|required_with:password_confirmation|between:6,15|confirmed', 'password_confirmation' => 'required_with:password', ]; } diff --git a/routes/channels.php b/routes/channels.php new file mode 100644 index 0000000..f16a20b --- /dev/null +++ b/routes/channels.php @@ -0,0 +1,16 @@ +id === (int) $id; +});