From abbeb572a8362d8fe7c9ff391092365be91f3f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 18 May 2021 19:24:11 +0200 Subject: [PATCH 1/8] Update ticket fix auth on request --- app/Http/Requests/UpdateTicket.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/UpdateTicket.php b/app/Http/Requests/UpdateTicket.php index 167da51..cdc15b9 100644 --- a/app/Http/Requests/UpdateTicket.php +++ b/app/Http/Requests/UpdateTicket.php @@ -11,11 +11,10 @@ class UpdateTicket extends StoreTicket if (auth()->user()->project_id) { $this->merge([ 'project_id' => auth()->user()->project_id, - 'status' => TicketStatus::new()->value, + 'status' => $this->project->status->value, ]); } - return auth()->check() or - auth()->user()->role === 1 or - request()->route()->ticket->created_by === auth()->user()->id; + return auth()->check() and (auth()->user()->role === 1 or + request()->route()->ticket->created_by === auth()->user()->id); } } From ff5984d227d4565fe15650c3121e36222bda6a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 18 May 2021 19:24:58 +0200 Subject: [PATCH 2/8] Force suscribe to its own ticket on create --- app/Http/Controllers/TicketController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index f8fc8f2..80f6f97 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -128,7 +128,10 @@ class TicketController extends Controller } $ticket->user()->associate(auth()->user()); - $ticket->save(); + $ticket->saveOrFail(); + /** @var \App\Models\User */ + $user = auth()->user(); + $user->subscriptions()->toggle($ticket->id); if (config('mail.MAIL_ADMIN')) { Mail::to(config('mail.MAIL_ADMIN'))->send(new NewTicket($ticket)); @@ -136,7 +139,7 @@ class TicketController extends Controller throw new Exception('Missing MAIL_ADMIN in .env'); } - return redirect()->route('home')->with('success', 'Ticket enregistré !'); + return redirect()->route('ticket.show', $ticket)->with('success', 'Ticket enregistré !'); } // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClass From 39dfb703f4625c25796298b330992925e0784ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 18 May 2021 19:25:40 +0200 Subject: [PATCH 3/8] Check user role on store project (has to be admin) --- app/Http/Requests/StoreProject.php | 3 ++- app/Http/Requests/UpdateProject.php | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Requests/StoreProject.php b/app/Http/Requests/StoreProject.php index b607417..0ce8310 100644 --- a/app/Http/Requests/StoreProject.php +++ b/app/Http/Requests/StoreProject.php @@ -13,7 +13,8 @@ class StoreProject extends FormRequest */ public function authorize() { - return auth()->check(); + return auth()->check() and + auth()->user()->role === 1; } /** diff --git a/app/Http/Requests/UpdateProject.php b/app/Http/Requests/UpdateProject.php index 307790d..2cc5353 100644 --- a/app/Http/Requests/UpdateProject.php +++ b/app/Http/Requests/UpdateProject.php @@ -2,7 +2,6 @@ namespace App\Http\Requests; - class UpdateProject extends StoreProject { } From 59bb0a3fbd43a31d5567275c813f8f08868b9f9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 18 May 2021 19:33:36 +0200 Subject: [PATCH 4/8] Only admins can change ticket status --- app/Http/Requests/ChangeTicketStatus.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Http/Requests/ChangeTicketStatus.php b/app/Http/Requests/ChangeTicketStatus.php index 4d681d0..f66afef 100644 --- a/app/Http/Requests/ChangeTicketStatus.php +++ b/app/Http/Requests/ChangeTicketStatus.php @@ -7,6 +7,17 @@ use Illuminate\Foundation\Http\FormRequest; class ChangeTicketStatus extends FormRequest { + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + return auth()->check() and + auth()->user()->role === 1; + } + /** * Get the validation rules that apply to the request. * From 7909856b9d99a8612a166fcdfa2dfc649fbe5ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 18 May 2021 20:07:42 +0200 Subject: [PATCH 5/8] subscribe on ticket while answering --- app/Http/Controllers/TicketController.php | 11 ++++++++++- app/Http/Requests/CreateMessage.php | 15 +++++++++++++++ resources/views/ticket/show.blade.php | 21 +++++++++++++++++++-- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index 80f6f97..278482e 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -187,7 +187,16 @@ class TicketController extends Controller $message = new Message($request->validated()); $message->user()->associate(auth()->user()); $message->ticket()->associate($ticket); - $message->save(); + $message->saveOrFail(); + + /** @var \App\Models\User */ + $user = auth()->user(); + + if ($request->subscribe) { + $user->subscriptions()->attach($ticket->id); + } else { + $user->subscriptions()->detach($ticket->id); + } if ($request->file_message) { $projectSlug = Str::slug($ticket->project->name); diff --git a/app/Http/Requests/CreateMessage.php b/app/Http/Requests/CreateMessage.php index 3e7e58e..8372c88 100644 --- a/app/Http/Requests/CreateMessage.php +++ b/app/Http/Requests/CreateMessage.php @@ -6,6 +6,20 @@ use Illuminate\Foundation\Http\FormRequest; class CreateMessage extends FormRequest { + /** + * Determine if the user is authorized to make this request. + * + * @return bool + */ + public function authorize() + { + $this->merge([ + 'subscribe' => $this->subscribe ? true : false + ]); + return auth()->check() and (auth()->user()->role === 1 or + $this->ticket->project->id === auth()->user()->project_id); + } + /** * Get the validation rules that apply to the request. * @@ -14,6 +28,7 @@ class CreateMessage extends FormRequest public function rules() { return [ + 'subscribe' => 'required|boolean', 'message' => 'required|min:' . (auth()->user()->role == 1 ? '5' : '20'), 'file_message' => 'sometimes|mimes:jpeg,jpg,png,pdf|max:2048' ]; diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index 18e7aaa..534746c 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -63,8 +63,25 @@