Replace the manual `$request->route('formSubmissionActionFailure')` workaround
with type-hinted parameters. Implicit route model binding now resolves
FormSubmissionActionFailure correctly on both the platform admin route
(/admin/form-failures/{id}) and the org-scoped route
(/organisations/{organisation}/form-failures/{id}).
Root cause:
On the nested org-scoped route, Laravel's implicit binding triggers its
scoped-binding code path: for the second URL segment, it tries to resolve
the failure as a relation of the route's parent ({organisation}) by calling
`$organisation->formSubmissionActionFailures()`. Organisation has no such
relation (failures live under FormSubmission, not Organisation directly),
so the lookup silently fell through and the controller received a raw
string. PHP then raised a TypeError on the type-hinted parameter.
A second issue compounded it: with the controller method declaring
`(FormSubmissionActionFailure $formSubmissionActionFailure, ?Organisation $organisation)`
the parameter order did NOT match the URL parameter order
(/{organisation}/.../{formSubmissionActionFailure}), so Laravel's
resolveMethodDependencies — which falls back to positional binding when
parameter counts diverge — bound them to the wrong slots.
Fix:
- Register an explicit `Route::bind('formSubmissionActionFailure', ...)`
in AppServiceProvider that loads the model `withoutGlobalScopes()` and
throws ModelNotFoundException on miss. This sidesteps the scoped-binding
parent-relation lookup entirely.
- Add `->withoutScopedBindings()` to all four org-scoped routes (show,
retry, resolve, dismiss) as a belt-and-braces guarantee that Laravel
never enters the scoped-binding path for these nested routes.
- Reorder controller method signatures to put `?Organisation $organisation`
FIRST, matching URL parameter order so positional binding lands the
ULID strings on the correct method parameters.
- Drop the now-unused private `resolveFailure()` helper.
- Tenant scoping continues to be enforced by FormSubmissionActionFailurePolicy
via the failure.submission.organisation_id FK chain (RFC V3); cross-
tenant access still translates denied → 404, never 403.
Tests: all 9 controller tests pass (cross-tenant 404 contract verified for
view, dismiss, and resolve).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
155 lines
5.1 KiB
PHP
155 lines
5.1 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace Tests\Feature\FormBuilder\Api;
|
|
|
|
use App\Enums\FormBuilder\DismissalReasonType;
|
|
use App\Models\FormBuilder\FormSchema;
|
|
use App\Models\FormBuilder\FormSubmission;
|
|
use App\Models\FormBuilder\FormSubmissionActionFailure;
|
|
use App\Models\Organisation;
|
|
use App\Models\User;
|
|
use Database\Seeders\RoleSeeder;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Laravel\Sanctum\Sanctum;
|
|
use Tests\TestCase;
|
|
|
|
/**
|
|
* RFC-WS-6 §3 (Q5) + §4 (V3) — admin endpoints. Cross-tenant access
|
|
* MUST return 404, never 403, to prevent enumeration. The IDOR-class
|
|
* tests below assert this contract explicitly.
|
|
*/
|
|
final class FormSubmissionActionFailureControllerTest extends TestCase
|
|
{
|
|
use RefreshDatabase;
|
|
|
|
private Organisation $orgA;
|
|
|
|
private Organisation $orgB;
|
|
|
|
private User $superAdmin;
|
|
|
|
private User $orgAdminA;
|
|
|
|
private User $orgAdminB;
|
|
|
|
private FormSubmissionActionFailure $failureInOrgA;
|
|
|
|
protected function setUp(): void
|
|
{
|
|
parent::setUp();
|
|
$this->seed(RoleSeeder::class);
|
|
|
|
$this->orgA = Organisation::factory()->create();
|
|
$this->orgB = Organisation::factory()->create();
|
|
|
|
$this->superAdmin = User::factory()->create();
|
|
$this->superAdmin->assignRole('super_admin');
|
|
|
|
$this->orgAdminA = User::factory()->create();
|
|
$this->orgA->users()->attach($this->orgAdminA, ['role' => 'org_admin']);
|
|
|
|
$this->orgAdminB = User::factory()->create();
|
|
$this->orgB->users()->attach($this->orgAdminB, ['role' => 'org_admin']);
|
|
|
|
$schema = FormSchema::factory()->create(['organisation_id' => $this->orgA->id]);
|
|
$submission = FormSubmission::factory()->create([
|
|
'form_schema_id' => $schema->id,
|
|
'organisation_id' => $this->orgA->id,
|
|
]);
|
|
$this->failureInOrgA = FormSubmissionActionFailure::factory()
|
|
->for($submission, 'submission')
|
|
->create();
|
|
}
|
|
|
|
public function test_unauthenticated_returns_401(): void
|
|
{
|
|
$this->getJson("/api/v1/admin/form-failures/{$this->failureInOrgA->id}")
|
|
->assertStatus(401);
|
|
}
|
|
|
|
public function test_super_admin_can_view_failure(): void
|
|
{
|
|
$this->withoutExceptionHandling();
|
|
Sanctum::actingAs($this->superAdmin);
|
|
$this
|
|
->getJson("/api/v1/admin/form-failures/{$this->failureInOrgA->id}")
|
|
->assertOk()
|
|
->assertJsonPath('data.id', (string) $this->failureInOrgA->id);
|
|
}
|
|
|
|
public function test_org_admin_can_view_own_org_failure(): void
|
|
{
|
|
Sanctum::actingAs($this->orgAdminA);
|
|
$this->getJson("/api/v1/organisations/{$this->orgA->id}/form-failures/{$this->failureInOrgA->id}")
|
|
->assertOk();
|
|
}
|
|
|
|
/**
|
|
* RFC V3 IDOR-class — admin from org B must NOT see a failure
|
|
* whose submission belongs to org A. 404, NOT 403.
|
|
*/
|
|
public function test_cross_tenant_access_returns_404_not_403(): void
|
|
{
|
|
Sanctum::actingAs($this->orgAdminB);
|
|
$this
|
|
->getJson("/api/v1/organisations/{$this->orgA->id}/form-failures/{$this->failureInOrgA->id}")
|
|
->assertStatus(404);
|
|
}
|
|
|
|
public function test_resolve_endpoint_with_note(): void
|
|
{
|
|
Sanctum::actingAs($this->superAdmin);
|
|
$this
|
|
->postJson("/api/v1/admin/form-failures/{$this->failureInOrgA->id}/resolve", [
|
|
'note' => 'fixed via direct edit',
|
|
])
|
|
->assertOk()
|
|
->assertJsonPath('data.state', 'resolved')
|
|
->assertJsonPath('data.resolved_note', 'fixed via direct edit');
|
|
}
|
|
|
|
public function test_dismiss_endpoint_with_enum_reason(): void
|
|
{
|
|
Sanctum::actingAs($this->superAdmin);
|
|
$this
|
|
->postJson("/api/v1/admin/form-failures/{$this->failureInOrgA->id}/dismiss", [
|
|
'reason_type' => DismissalReasonType::SCHEMA_DELETED->value,
|
|
])
|
|
->assertOk()
|
|
->assertJsonPath('data.state', 'dismissed')
|
|
->assertJsonPath('data.dismissed_reason_type', DismissalReasonType::SCHEMA_DELETED->value);
|
|
}
|
|
|
|
public function test_dismiss_other_without_note_fails_422(): void
|
|
{
|
|
Sanctum::actingAs($this->superAdmin);
|
|
$this
|
|
->postJson("/api/v1/admin/form-failures/{$this->failureInOrgA->id}/dismiss", [
|
|
'reason_type' => DismissalReasonType::OTHER->value,
|
|
])
|
|
->assertStatus(422)
|
|
->assertJsonValidationErrors(['note']);
|
|
}
|
|
|
|
public function test_cross_tenant_dismiss_returns_404(): void
|
|
{
|
|
Sanctum::actingAs($this->orgAdminB);
|
|
$this
|
|
->postJson("/api/v1/organisations/{$this->orgA->id}/form-failures/{$this->failureInOrgA->id}/dismiss", [
|
|
'reason_type' => DismissalReasonType::OTHER->value,
|
|
'note' => 'evil',
|
|
])
|
|
->assertStatus(404);
|
|
}
|
|
|
|
public function test_cross_tenant_resolve_returns_404(): void
|
|
{
|
|
Sanctum::actingAs($this->orgAdminB);
|
|
$this
|
|
->postJson("/api/v1/organisations/{$this->orgA->id}/form-failures/{$this->failureInOrgA->id}/resolve", [])
|
|
->assertStatus(404);
|
|
}
|
|
}
|