## 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
105 lines
3.2 KiB
PHP
105 lines
3.2 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Jobs\ProviderConnectionHealthCheckJob;
|
|
use App\Models\OperationRun;
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\ProviderCredential;
|
|
use App\Services\Verification\StartVerification;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Support\Facades\Queue;
|
|
|
|
it('dedupes verification starts while a run is active', 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' => $tenant->getKey(),
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => fake()->uuid(),
|
|
'status' => 'connected',
|
|
]);
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
]);
|
|
|
|
$starter = app(StartVerification::class);
|
|
|
|
$first = $starter->providerConnectionCheck(
|
|
tenant: $tenant,
|
|
connection: $connection,
|
|
initiator: $user,
|
|
extraContext: ['wizard' => ['flow' => 'managed_tenant_onboarding']],
|
|
);
|
|
|
|
$second = $starter->providerConnectionCheck(
|
|
tenant: $tenant,
|
|
connection: $connection,
|
|
initiator: $user,
|
|
extraContext: ['wizard' => ['flow' => 'managed_tenant_onboarding']],
|
|
);
|
|
|
|
expect($first->run->getKey())->toBe($second->run->getKey());
|
|
expect($first->status)->toBe('started');
|
|
expect($second->status)->toBe('deduped');
|
|
|
|
expect(OperationRun::query()
|
|
->where('tenant_id', $tenant->getKey())
|
|
->where('type', 'provider.connection.check')
|
|
->count())->toBe(1);
|
|
|
|
Queue::assertPushed(ProviderConnectionHealthCheckJob::class, 1);
|
|
});
|
|
|
|
it('dedupes tenant-default verification starts while a run is active', 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' => $tenant->getKey(),
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => fake()->uuid(),
|
|
'status' => 'connected',
|
|
'is_default' => true,
|
|
]);
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
]);
|
|
|
|
$starter = app(StartVerification::class);
|
|
|
|
$first = $starter->providerConnectionCheckForTenant(
|
|
tenant: $tenant,
|
|
initiator: $user,
|
|
extraContext: ['surface' => ['kind' => 'tenant_view_header']],
|
|
);
|
|
|
|
$second = $starter->providerConnectionCheckForTenant(
|
|
tenant: $tenant,
|
|
initiator: $user,
|
|
extraContext: ['surface' => ['kind' => 'tenant_view_header']],
|
|
);
|
|
|
|
expect($first->run->getKey())->toBe($second->run->getKey());
|
|
expect($first->status)->toBe('started');
|
|
expect($second->status)->toBe('deduped');
|
|
|
|
expect(OperationRun::query()
|
|
->where('tenant_id', $tenant->getKey())
|
|
->where('type', 'provider.connection.check')
|
|
->count())->toBe(1);
|
|
|
|
Queue::assertPushed(ProviderConnectionHealthCheckJob::class, 1);
|
|
});
|