## 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
3.3 KiB
PHP
80 lines
3.3 KiB
PHP
<?php
|
|
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\ProviderCredential;
|
|
use App\Models\ManagedEnvironment;
|
|
use App\Services\Providers\AdminConsentUrlFactory;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
it('builds admin consent urls for platform connections from the central platform identity', function (): void {
|
|
config()->set('graph.client_id', 'platform-client-id');
|
|
config()->set('graph.client_secret', 'platform-client-secret');
|
|
config()->set('graph.managed_environment_id', 'organizations');
|
|
|
|
$tenant = ManagedEnvironment::factory()->create([
|
|
'managed_environment_id' => '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' => 'target-tenant-id',
|
|
'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 = app(AdminConsentUrlFactory::class)->make($connection, 'state-123');
|
|
|
|
parse_str((string) parse_url($url, PHP_URL_QUERY), $query);
|
|
|
|
expect($url)->toStartWith('https://login.microsoftonline.com/target-tenant-id/v2.0/adminconsent?')
|
|
->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')
|
|
->and($query['redirect_uri'] ?? null)->toBe(route('admin.consent.callback'))
|
|
->and($query['scope'] ?? null)->toBe('https://graph.microsoft.com/.default')
|
|
->and($query['state'] ?? null)->toBe('state-123');
|
|
});
|
|
|
|
it('builds admin consent urls for dedicated connections from the dedicated credential identity', 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',
|
|
'is_default' => true,
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'payload' => [
|
|
'client_id' => 'dedicated-client-id',
|
|
'client_secret' => 'dedicated-client-secret',
|
|
],
|
|
]);
|
|
|
|
$url = app(AdminConsentUrlFactory::class)->make($connection, 'state-456');
|
|
|
|
parse_str((string) parse_url($url, PHP_URL_QUERY), $query);
|
|
|
|
expect($url)->toStartWith('https://login.microsoftonline.com/dedicated-target-tenant-id/v2.0/adminconsent?')
|
|
->and($query['client_id'] ?? null)->toBe('dedicated-client-id')
|
|
->and($query['redirect_uri'] ?? null)->toBe(route('admin.consent.callback'))
|
|
->and($query['state'] ?? null)->toBe('state-456');
|
|
});
|