diff --git a/app/Http/Controllers/DietController.php b/app/Http/Controllers/DietController.php index 3615469..c9deb64 100644 --- a/app/Http/Controllers/DietController.php +++ b/app/Http/Controllers/DietController.php @@ -8,6 +8,7 @@ use Illuminate\Http\Request; use Illuminate\View\View; use Spatie\QueryBuilder\AllowedFilter; use Spatie\QueryBuilder\QueryBuilder; +use Illuminate\Support\Facades\Gate; class DietController extends Controller { @@ -51,6 +52,10 @@ class DietController extends Controller public function edit(Diet $diet): View { + if (! $this->canEditDiet($diet)) { + abort(403, 'Unauthorized action.'); + } + return view('diet/edit_form', ['diet' => $diet]); } @@ -64,4 +69,9 @@ class DietController extends Controller return view('diet/show', ['diet' => $diet]); } + + private function canEditDiet(Diet $diet): bool + { + return Gate::allows('edit', $diet); + } } diff --git a/app/Policies/BlogPostPolicy.php b/app/Policies/BlogPostPolicy.php index ccb1f6e..9151f0b 100644 --- a/app/Policies/BlogPostPolicy.php +++ b/app/Policies/BlogPostPolicy.php @@ -9,10 +9,10 @@ class BlogPostPolicy { public function edit(User $user, BlogPost $blogPost): bool { - return $this->isAuthorPlan($user, $blogPost) || $user->hasRole('admin') || $user->hasRole('moderator'); + return $this->isAuthorBlogPost($user, $blogPost) || $user->hasRole('admin') || $user->hasRole('moderator'); } - private function isAuthorPlan(User $user, BlogPost $blogPost): bool + private function isAuthorBlogPost(User $user, BlogPost $blogPost): bool { return $user->id === $blogPost->author()->first()->id; } diff --git a/app/Policies/DietPolicy.php b/app/Policies/DietPolicy.php new file mode 100644 index 0000000..7d3ecec --- /dev/null +++ b/app/Policies/DietPolicy.php @@ -0,0 +1,19 @@ +isAuthorDiet($user, $diet) || $user->hasRole('admin') || $user->hasRole('moderator'); + } + + private function isAuthorDiet(User $user, Diet $diet): bool + { + return $user->id === $diet->author()->first()->id; + } +} diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 2299d64..852c2d3 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -7,6 +7,10 @@ use App\Models\Recipe; use App\Policies\PlanPolicy; use App\Policies\RecipePolicy; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use App\Policies\BlogPostPolicy; +use App\Models\BlogPost; +use App\Models\Diet; +use App\Policies\DietPolicy; class AuthServiceProvider extends ServiceProvider { @@ -18,6 +22,8 @@ class AuthServiceProvider extends ServiceProvider protected $policies = [ Plan::class => PlanPolicy::class, Recipe::class => RecipePolicy::class, + BlogPost::class => BlogPostPolicy::class, + Diet::class => DietPolicy::class, // 'App\Models\Model' => 'App\Policies\ModelPolicy', ]; diff --git a/tests/Feature/Diet/EditTest.php b/tests/Feature/Diet/EditTest.php index 725ebfe..8a695bd 100644 --- a/tests/Feature/Diet/EditTest.php +++ b/tests/Feature/Diet/EditTest.php @@ -32,13 +32,48 @@ class EditTest extends TestCase $this->diet = Diet::factory()->create(); } - public function test_show_form_edit_diet(): void + + public function test_show_form_edit_diet_success_for_author(): void { + $this->diet->author()->attach($this->user->id); + + $response = $this + ->actingAs($this->user) + ->get(route('diet.edit', $this->diet)); + $response->assertSuccessful(); + } + + public function test_show_form_edit_diet_success_for_admin(): void + { + $this->diet->author()->attach($this->user->id); + + $response = $this + ->actingAs($this->user->assignRole('admin')) + ->get(route('diet.edit', $this->diet)); + $response->assertSuccessful(); + } + + + public function test_show_form_edit_diet_success_for_moderator(): void + { + $this->diet->author()->attach($this->user->id); + + $response = $this + ->actingAs($this->user->assignRole('moderator')) + ->get(route('diet.edit', $this->diet)); + $response->assertSuccessful(); + } + + public function test_show_form_edit_diet_forbidden_for_user(): void + { + $user = User::factory()->create(); + $this->diet->author()->attach($user->id); + $response = $this ->actingAs($this->user) ->get(route('diet.edit', $this->diet)); - $response->assertSuccessful(); + $response->assertForbidden(); } public function test_publish_new_diet_success(): void