## Summary - remove tenant-based Graph options access from runtime service paths and enforce provider-only resolution - add `MicrosoftGraphOptionsResolver` and `ProviderConfigurationRequiredException` for centralized, actionable provider-config errors - turn `Tenant::graphOptions()` into a fail-fast kill switch to prevent legacy runtime usage - add and update tests (including guardrail) to enforce no reintroduction in `app/` - update Spec 088 artifacts (`spec`, `plan`, `research`, `tasks`, checklist) ## Validation - `vendor/bin/sail bin pint --dirty` - `vendor/bin/sail artisan test --compact --filter=NoLegacyTenantGraphOptions` - `vendor/bin/sail artisan test --compact tests/Feature/Filament` - `CI=1 vendor/bin/sail artisan test --compact` ## Notes - Branch includes the guardrail test for legacy callsite detection in `app/`. - Full suite currently green: 1227 passed, 5 skipped. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Reviewed-on: #105
245 lines
8.4 KiB
PHP
245 lines
8.4 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Filament\Resources\TenantResource\Pages\ListTenants;
|
|
use App\Filament\Resources\TenantResource\Pages\ViewTenant;
|
|
use App\Filament\Widgets\Tenant\TenantVerificationReport;
|
|
use App\Jobs\ProviderConnectionHealthCheckJob;
|
|
use App\Models\OperationRun;
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\ProviderCredential;
|
|
use App\Services\Intune\RbacHealthService;
|
|
use App\Services\Intune\TenantConfigService;
|
|
use App\Services\Intune\TenantPermissionService;
|
|
use App\Support\OperationRunLinks;
|
|
use App\Support\Verification\VerificationReportWriter;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Support\Facades\Queue;
|
|
use Livewire\Livewire;
|
|
|
|
it('starts tenant verification from header action and links to the canonical run viewer', function (): void {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'operator', ensureDefaultMicrosoftProviderConnection: false);
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$connection = ProviderConnection::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => (string) $tenant->tenant_id,
|
|
'is_default' => true,
|
|
'status' => 'connected',
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'type' => 'client_secret',
|
|
'payload' => [
|
|
'client_id' => 'client-id',
|
|
'client_secret' => 'client-secret',
|
|
],
|
|
]);
|
|
|
|
Livewire::test(ViewTenant::class, ['record' => $tenant->getRouteKey()])
|
|
->callAction('verify');
|
|
|
|
$run = OperationRun::query()
|
|
->where('tenant_id', (int) $tenant->getKey())
|
|
->where('type', 'provider.connection.check')
|
|
->latest('id')
|
|
->first();
|
|
|
|
expect($run)->not->toBeNull();
|
|
|
|
$notifications = collect(session('filament.notifications', []));
|
|
expect($notifications)->not->toBeEmpty();
|
|
|
|
$last = $notifications->last();
|
|
$actionUrls = collect($last['actions'] ?? [])->pluck('url')->filter()->values()->all();
|
|
|
|
expect($actionUrls)->toContain(OperationRunLinks::tenantlessView($run));
|
|
|
|
Queue::assertPushed(ProviderConnectionHealthCheckJob::class, function (ProviderConnectionHealthCheckJob $job) use ($run, $connection): bool {
|
|
return (int) $job->providerConnectionId === (int) $connection->getKey()
|
|
&& (int) ($job->operationRun?->getKey() ?? 0) === (int) ($run?->getKey() ?? 0);
|
|
});
|
|
});
|
|
|
|
it('renders the tenant verification widget from stored run context only', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'readonly');
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$report = VerificationReportWriter::build('provider.connection.check', [
|
|
[
|
|
'key' => 'provider.connection.check',
|
|
'title' => 'Provider connection preflight',
|
|
'status' => 'fail',
|
|
'severity' => 'critical',
|
|
'blocking' => true,
|
|
'reason_code' => 'provider_connection_missing',
|
|
'message' => 'No provider connection configured.',
|
|
'evidence' => [],
|
|
'next_steps' => [],
|
|
],
|
|
]);
|
|
|
|
OperationRun::factory()->create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'type' => 'provider.connection.check',
|
|
'status' => 'completed',
|
|
'outcome' => 'blocked',
|
|
'context' => [
|
|
'target_scope' => [
|
|
'entra_tenant_id' => (string) $tenant->tenant_id,
|
|
],
|
|
'verification_report' => $report,
|
|
],
|
|
]);
|
|
|
|
bindFailHardGraphClient();
|
|
|
|
assertNoOutboundHttp(function () use ($user): void {
|
|
Livewire::actingAs($user)
|
|
->test(TenantVerificationReport::class)
|
|
->assertSee('Provider connection preflight')
|
|
->assertSee('Read-only:')
|
|
->assertSee('Insufficient permission — ask a tenant Owner.');
|
|
});
|
|
});
|
|
|
|
it('renders tenant detail without invoking synchronous verification or permission persistence services', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$this->mock(TenantConfigService::class, function ($mock): void {
|
|
$mock->shouldReceive('testConnectivity')->never();
|
|
});
|
|
|
|
$this->mock(TenantPermissionService::class, function ($mock): void {
|
|
$mock->shouldReceive('compare')->never();
|
|
});
|
|
|
|
$this->mock(RbacHealthService::class, function ($mock): void {
|
|
$mock->shouldReceive('check')->never();
|
|
});
|
|
|
|
bindFailHardGraphClient();
|
|
|
|
assertNoOutboundHttp(function () use ($user, $tenant): void {
|
|
$this->actingAs($user)
|
|
->get(route('filament.admin.resources.tenants.view', array_merge(
|
|
filamentTenantRouteParams($tenant),
|
|
['record' => $tenant]
|
|
)))
|
|
->assertOk()
|
|
->assertSee('Verification report');
|
|
});
|
|
});
|
|
|
|
it('starts verification from the embedded widget CTA and uses canonical view-run links', function (): void {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'operator', ensureDefaultMicrosoftProviderConnection: false);
|
|
$this->actingAs($user);
|
|
|
|
$connection = ProviderConnection::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => (string) $tenant->tenant_id,
|
|
'is_default' => true,
|
|
'status' => 'connected',
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'type' => 'client_secret',
|
|
'payload' => [
|
|
'client_id' => 'client-id',
|
|
'client_secret' => 'client-secret',
|
|
],
|
|
]);
|
|
|
|
Livewire::test(TenantVerificationReport::class, ['record' => $tenant])
|
|
->assertSee('No verification run has been started yet.')
|
|
->call('startVerification');
|
|
|
|
$run = OperationRun::query()
|
|
->where('tenant_id', (int) $tenant->getKey())
|
|
->where('type', 'provider.connection.check')
|
|
->latest('id')
|
|
->first();
|
|
|
|
expect($run)->not->toBeNull();
|
|
|
|
$notifications = collect(session('filament.notifications', []));
|
|
expect($notifications)->not->toBeEmpty();
|
|
|
|
$last = $notifications->last();
|
|
$actionUrls = collect($last['actions'] ?? [])->pluck('url')->filter()->values()->all();
|
|
|
|
expect($actionUrls)->toContain(OperationRunLinks::tenantlessView($run));
|
|
|
|
Queue::assertPushed(ProviderConnectionHealthCheckJob::class, 1);
|
|
});
|
|
|
|
it('starts tenant verification from the tenant list row action via the unified run path', function (): void {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'operator', ensureDefaultMicrosoftProviderConnection: false);
|
|
$this->actingAs($user);
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$connection = ProviderConnection::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => (string) $tenant->tenant_id,
|
|
'is_default' => true,
|
|
'status' => 'connected',
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'type' => 'client_secret',
|
|
'payload' => [
|
|
'client_id' => 'client-id',
|
|
'client_secret' => 'client-secret',
|
|
],
|
|
]);
|
|
|
|
Livewire::test(ListTenants::class)
|
|
->callTableAction('verify', $tenant);
|
|
|
|
$run = OperationRun::query()
|
|
->where('tenant_id', (int) $tenant->getKey())
|
|
->where('type', 'provider.connection.check')
|
|
->latest('id')
|
|
->first();
|
|
|
|
expect($run)->not->toBeNull()
|
|
->and($run?->context['surface']['kind'] ?? null)->toBe('tenant_list_row');
|
|
|
|
$notificationActionUrls = collect(session('filament.notifications', []))
|
|
->flatMap(static fn (array $notification): array => is_array($notification['actions'] ?? null)
|
|
? $notification['actions']
|
|
: [])
|
|
->pluck('url')
|
|
->filter(static fn (mixed $url): bool => is_string($url) && trim($url) !== '')
|
|
->values()
|
|
->all();
|
|
|
|
expect($notificationActionUrls)->toContain(OperationRunLinks::tenantlessView($run));
|
|
|
|
Queue::assertPushed(ProviderConnectionHealthCheckJob::class, 1);
|
|
});
|