## Summary - replace the legacy Tenant and TenantMembership core models with ManagedEnvironment and ManagedEnvironmentMembership - propagate the managed environment naming and key changes across Filament resources, pages, controllers, jobs, models, and supporting runtime paths - add feature 279 spec artifacts and focused managed-environment test coverage for model behavior, route binding, panel context, authorization, and legacy guardrails ## Validation - `cd apps/platform && ./vendor/bin/sail artisan test --compact tests/Feature/ManagedEnvironment/LegacyTenantCoreGuardTest.php tests/Feature/ManagedEnvironment/ManagedEnvironmentAuthorizationTest.php tests/Feature/ManagedEnvironment/ManagedEnvironmentPanelContextTest.php tests/Feature/ManagedEnvironment/ManagedEnvironmentRouteBindingTest.php tests/Unit/ManagedEnvironment/ManagedEnvironmentContextResolverTest.php tests/Unit/ManagedEnvironment/ManagedEnvironmentModelTest.php` - `cd apps/platform && ./vendor/bin/sail bin pint --dirty --format agent` ## Notes - branch pushed from commit `1123b122` - browser smoke test file was added but not run in this pass Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #335
119 lines
4.8 KiB
PHP
119 lines
4.8 KiB
PHP
<?php
|
|
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\ProviderCredential;
|
|
use App\Models\ManagedEnvironment;
|
|
use App\Services\Providers\ProviderIdentityResolver;
|
|
use App\Support\Providers\ProviderConnectionType;
|
|
use App\Support\Providers\ProviderReasonCodes;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
it('resolves platform connections from the central platform identity and ignores dedicated credentials', function (): void {
|
|
config()->set('graph.client_id', 'platform-client-id');
|
|
config()->set('graph.client_secret', 'platform-client-secret');
|
|
|
|
$tenant = ManagedEnvironment::factory()->create([
|
|
'managed_environment_id' => 'platform-target-tenant-id',
|
|
'app_client_id' => 'legacy-tenant-client-id',
|
|
]);
|
|
|
|
$connection = ProviderConnection::factory()->platform()->create([
|
|
'managed_environment_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => 'platform-target-tenant-id',
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'payload' => [
|
|
'client_id' => 'dedicated-fallback-client-id',
|
|
'client_secret' => 'dedicated-fallback-client-secret',
|
|
],
|
|
]);
|
|
|
|
$resolution = app(ProviderIdentityResolver::class)->resolve($connection);
|
|
|
|
expect($resolution->resolved)->toBeTrue()
|
|
->and($resolution->connectionType)->toBe(ProviderConnectionType::Platform)
|
|
->and($resolution->effectiveClientId)->toBe('platform-client-id')
|
|
->and($resolution->effectiveClientId)->not->toBe('legacy-tenant-client-id')
|
|
->and($resolution->effectiveClientId)->not->toBe('dedicated-fallback-client-id')
|
|
->and($resolution->credentialSource)->toBe('platform_config');
|
|
});
|
|
|
|
it('resolves dedicated connections from dedicated credentials only', function (): void {
|
|
$tenant = ManagedEnvironment::factory()->create([
|
|
'managed_environment_id' => 'dedicated-target-tenant-id',
|
|
]);
|
|
|
|
$connection = ProviderConnection::factory()->dedicated()->create([
|
|
'managed_environment_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => 'dedicated-target-tenant-id',
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'payload' => [
|
|
'client_id' => 'dedicated-client-id',
|
|
'client_secret' => 'dedicated-client-secret',
|
|
],
|
|
]);
|
|
|
|
$resolution = app(ProviderIdentityResolver::class)->resolve($connection);
|
|
|
|
expect($resolution->resolved)->toBeTrue()
|
|
->and($resolution->connectionType)->toBe(ProviderConnectionType::Dedicated)
|
|
->and($resolution->effectiveClientId)->toBe('dedicated-client-id')
|
|
->and($resolution->credentialSource)->toBe('dedicated_manual');
|
|
});
|
|
|
|
it('keeps graph request option shaping out of identity resolution results', function (): void {
|
|
$connection = ProviderConnection::factory()->dedicated()->create([
|
|
'entra_tenant_id' => 'dedicated-target-tenant-id',
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'payload' => [
|
|
'client_id' => 'dedicated-client-id',
|
|
'client_secret' => 'dedicated-client-secret',
|
|
],
|
|
]);
|
|
|
|
$resolution = app(ProviderIdentityResolver::class)->resolve($connection);
|
|
|
|
expect($resolution->resolved)->toBeTrue()
|
|
->and($resolution->tenantContext)->toBe('dedicated-target-tenant-id')
|
|
->and($resolution->effectiveClientId)->toBe('dedicated-client-id')
|
|
->and(method_exists($resolution, 'graphOptions'))->toBeFalse();
|
|
});
|
|
|
|
it('blocks dedicated connections when dedicated credentials are missing', function (): void {
|
|
$connection = ProviderConnection::factory()->dedicated()->create([
|
|
'entra_tenant_id' => 'dedicated-target-tenant-id',
|
|
]);
|
|
|
|
$resolution = app(ProviderIdentityResolver::class)->resolve($connection);
|
|
|
|
expect($resolution->resolved)->toBeFalse()
|
|
->and($resolution->connectionType)->toBe(ProviderConnectionType::Dedicated)
|
|
->and($resolution->effectiveReasonCode())->toBe(ProviderReasonCodes::DedicatedCredentialMissing);
|
|
});
|
|
|
|
it('blocks connections that require migration review before runtime use', function (): void {
|
|
$connection = ProviderConnection::factory()->platform()->create([
|
|
'entra_tenant_id' => 'platform-target-tenant-id',
|
|
'migration_review_required' => true,
|
|
]);
|
|
|
|
$resolution = app(ProviderIdentityResolver::class)->resolve($connection);
|
|
|
|
expect($resolution->resolved)->toBeFalse()
|
|
->and($resolution->effectiveReasonCode())->toBe(ProviderReasonCodes::ProviderConnectionReviewRequired);
|
|
});
|