diff --git a/api/app/Policies/FormPolicy.php b/api/app/Policies/FormPolicy.php index 6555623ad..ea3947376 100644 --- a/api/app/Policies/FormPolicy.php +++ b/api/app/Policies/FormPolicy.php @@ -40,6 +40,14 @@ public function create(User $user) return !$user->is_readonly; } + /** + * Determine whether the user can perform write operations on the model. + */ + private function canPerformWriteOperation(User $user, Form $form): bool + { + return $user->ownsForm($form) && !$user->is_readonly; + } + /** * Determine whether the user can update the model. * @@ -47,7 +55,7 @@ public function create(User $user) */ public function update(User $user, Form $form) { - return $user->ownsForm($form) && !$user->is_readonly; + return $this->canPerformWriteOperation($user, $form); } /** @@ -57,7 +65,7 @@ public function update(User $user, Form $form) */ public function delete(User $user, Form $form) { - return $user->ownsForm($form) && !$user->is_readonly; + return $this->canPerformWriteOperation($user, $form); } /** @@ -67,7 +75,7 @@ public function delete(User $user, Form $form) */ public function restore(User $user, Form $form) { - return $user->ownsForm($form) && !$user->is_readonly; + return $this->canPerformWriteOperation($user, $form); } /** @@ -77,6 +85,6 @@ public function restore(User $user, Form $form) */ public function forceDelete(User $user, Form $form) { - return $user->ownsForm($form) && !$user->is_readonly; + return $this->canPerformWriteOperation($user, $form); } } diff --git a/api/app/Policies/TemplatePolicy.php b/api/app/Policies/TemplatePolicy.php index de49a9689..93ba2e9b0 100644 --- a/api/app/Policies/TemplatePolicy.php +++ b/api/app/Policies/TemplatePolicy.php @@ -12,8 +12,6 @@ class TemplatePolicy /** * Determine whether the user can create models. - * - * @return \Illuminate\Auth\Access\Response|bool */ public function create(User $user) { @@ -21,22 +19,20 @@ public function create(User $user) } /** - * Determine whether the user can update the model. - * - * @return mixed + * Determine whether the user can perform write operations on the model. */ - public function update(User $user, Template $template) + private function canPerformWriteOperation(User $user, Template $template): bool { return ($user->admin || $user->template_editor || $template->creator_id === $user->id) && !$user->is_readonly; } - /** - * Determine whether the user can delete the model. - * - * @return mixed - */ + public function update(User $user, Template $template) + { + return $this->canPerformWriteOperation($user, $template); + } + public function delete(User $user, Template $template) { - return ($user->admin || $user->template_editor || $template->creator_id === $user->id) && !$user->is_readonly; + return $this->canPerformWriteOperation($user, $template); } }