## 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
80 lines
2.9 KiB
PHP
80 lines
2.9 KiB
PHP
<?php
|
|
|
|
use App\Filament\Resources\TenantResource;
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\ProviderCredential;
|
|
use App\Models\ManagedEnvironment;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
it('builds platform admin consent urls from the canonical platform identity', 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' => 'b0091e5d-944f-4a34-bcd9-12cbfb7b75cf',
|
|
'name' => 'Test ManagedEnvironment',
|
|
'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' => 'b0091e5d-944f-4a34-bcd9-12cbfb7b75cf',
|
|
'is_default' => true,
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'payload' => [
|
|
'client_id' => 'dedicated-fallback-client-id',
|
|
'client_secret' => 'dedicated-fallback-client-secret',
|
|
],
|
|
]);
|
|
|
|
$url = TenantResource::adminConsentUrl($tenant);
|
|
|
|
parse_str((string) parse_url((string) $url, PHP_URL_QUERY), $query);
|
|
|
|
expect($url)
|
|
->toContain('scope=')
|
|
->toContain(urlencode('https://graph.microsoft.com/.default'))
|
|
->and($query['client_id'] ?? null)->toBe('platform-client-id')
|
|
->and($query['client_id'] ?? null)->not->toBe('legacy-tenant-client-id')
|
|
->and($query['client_id'] ?? null)->not->toBe('dedicated-fallback-client-id');
|
|
});
|
|
|
|
it('builds dedicated admin consent urls from dedicated provider connection credentials', function (): void {
|
|
$tenant = ManagedEnvironment::factory()->create([
|
|
'app_client_id' => null,
|
|
]);
|
|
|
|
$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',
|
|
'is_default' => true,
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'payload' => [
|
|
'client_id' => 'derived-client-id',
|
|
'client_secret' => 'derived-client-secret',
|
|
],
|
|
]);
|
|
|
|
$url = TenantResource::adminConsentUrl($tenant);
|
|
|
|
parse_str((string) parse_url((string) $url, PHP_URL_QUERY), $query);
|
|
|
|
expect($url)
|
|
->not->toBeNull()
|
|
->and($url)->toContain('login.microsoftonline.com')
|
|
->and($url)->toContain('adminconsent')
|
|
->and($url)->toContain(urlencode('derived-client-id'))
|
|
->and($query['client_id'] ?? null)->toBe('derived-client-id');
|
|
});
|