Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't allow review of storage requests that were not submitted #51

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix: Prevent review of unsubmitted storage requests
Aya Bezine committed Dec 11, 2024
commit fc6f56f10d95171764718a736c6daa27850983be
24 changes: 14 additions & 10 deletions src/Http/Controllers/Views/StorageRequestController.php
Original file line number Diff line number Diff line change
@@ -76,15 +76,19 @@ public function create(Request $request)
*
* @return \Illuminate\Http\Response
*/
public function review($id)
{
$request = StorageRequest::whereNull('expires_at')
->with('files')
->findOrFail($id);
$this->authorize('approve', $request);

return view('user-storage::review', [
'request' => $request,
]);
}
public function review($id)
{
$request = StorageRequest::whereNull('expires_at')
->whereNotNull('submitted_at') // Add this condition
->with('files')
->findOrFail($id);

$this->authorize('approve', $request);

return view('user-storage::review', [
'request' => $request,
]);
}

}
23 changes: 16 additions & 7 deletions tests/Http/Controllers/Views/StorageRequestControllerTest.php
Original file line number Diff line number Diff line change
@@ -55,31 +55,40 @@ public function testReview()
{
$request = StorageRequest::factory()->create();
$id = $request->id;

$this->get("storage-requests/{$id}/review")->assertRedirect('login');

$this->actingAs($request->user)
->get("storage-requests/{$id}/review")
->assertStatus(403);

$user = UserTest::create([
'role_id' => Role::editorId(),
]);

$this->actingAs($user)
->get("storage-requests/{$id}/review")
->assertStatus(403);

$user->role_id = Role::adminId();
$user->save();

$this->actingAs($user)
->get("storage-requests/{$id}/review")
->assertViewIs('user-storage::review');

$request->update(['expires_at' => '2022-03-28 10:40:00']);
$this->actingAs($user)
->get("storage-requests/{$id}/review")
->assertStatus(404);

$unsubmittedRequest = StorageRequest::factory()->create([
'submitted_at' => null,
]);

$this->actingAs($user)
->get("storage-requests/{$unsubmittedRequest->id}/review")
->assertStatus(404);
}

}