## 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
140 lines
4.8 KiB
PHP
140 lines
4.8 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Filament\Pages\TenantRequiredPermissions;
|
|
use App\Models\ManagedEnvironment;
|
|
use App\Models\TenantPermission;
|
|
use App\Models\User;
|
|
use App\Models\Workspace;
|
|
use App\Models\WorkspaceMembership;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use Livewire\Livewire;
|
|
|
|
it('keeps the route tenant authoritative when tenant-like query values are present', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'readonly');
|
|
|
|
$otherTenant = ManagedEnvironment::factory()->create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'name' => 'Foreign Query ManagedEnvironment',
|
|
'external_id' => 'foreign-query-tenant',
|
|
]);
|
|
|
|
$response = $this->actingAs($user)
|
|
->get("/admin/tenants/{$tenant->external_id}/required-permissions?tenant={$otherTenant->external_id}&managed_environment_id={$otherTenant->getKey()}&status=all")
|
|
->assertSuccessful();
|
|
|
|
$response
|
|
->assertSee($tenant->getFilamentName())
|
|
->assertDontSee($otherTenant->name);
|
|
});
|
|
|
|
it('keeps filter state usable without redefining tenant scope', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'readonly');
|
|
|
|
config()->set('intune_permissions.permissions', [
|
|
[
|
|
'key' => 'ManagedEnvironment.Read.All',
|
|
'type' => 'application',
|
|
'description' => 'ManagedEnvironment read permission',
|
|
'features' => ['backup'],
|
|
],
|
|
]);
|
|
config()->set('entra_permissions.permissions', []);
|
|
|
|
TenantPermission::create([
|
|
'managed_environment_id' => (int) $tenant->getKey(),
|
|
'permission_key' => 'ManagedEnvironment.Read.All',
|
|
'status' => 'granted',
|
|
'details' => ['source' => 'db'],
|
|
'last_checked_at' => now(),
|
|
]);
|
|
|
|
$response = $this->actingAs($user)
|
|
->get("/admin/tenants/{$tenant->external_id}/required-permissions?status=present&type=application&search=ManagedEnvironment")
|
|
->assertSuccessful();
|
|
|
|
$response
|
|
->assertSee($tenant->getFilamentName())
|
|
->assertSee('ManagedEnvironment.Read.All');
|
|
});
|
|
|
|
it('returns 404 when the current workspace no longer matches the tenant route scope', function (): void {
|
|
$workspaceA = Workspace::factory()->create();
|
|
$workspaceB = Workspace::factory()->create();
|
|
$user = User::factory()->create();
|
|
|
|
$tenant = ManagedEnvironment::factory()->create([
|
|
'workspace_id' => (int) $workspaceA->getKey(),
|
|
'external_id' => 'tenant-required-permissions-404',
|
|
]);
|
|
|
|
createUserWithTenant(
|
|
tenant: $tenant,
|
|
user: $user,
|
|
role: 'readonly',
|
|
workspaceRole: 'readonly',
|
|
);
|
|
|
|
WorkspaceMembership::factory()->create([
|
|
'workspace_id' => (int) $workspaceB->getKey(),
|
|
'user_id' => (int) $user->getKey(),
|
|
'role' => 'readonly',
|
|
]);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, (int) $workspaceB->getKey());
|
|
|
|
$this->actingAs($user)
|
|
->get('/admin/tenants/'.$tenant->external_id.'/required-permissions')
|
|
->assertNotFound();
|
|
});
|
|
|
|
it('seeds native table state from deeplink filters without letting query values redefine the route tenant', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'readonly');
|
|
|
|
$otherTenant = ManagedEnvironment::factory()->create([
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'name' => 'Ignored Query ManagedEnvironment',
|
|
'external_id' => 'ignored-query-tenant',
|
|
]);
|
|
|
|
config()->set('intune_permissions.permissions', [
|
|
[
|
|
'key' => 'ManagedEnvironment.Read.All',
|
|
'type' => 'application',
|
|
'description' => 'ManagedEnvironment read permission',
|
|
'features' => ['backup'],
|
|
],
|
|
]);
|
|
config()->set('entra_permissions.permissions', []);
|
|
|
|
TenantPermission::query()->create([
|
|
'managed_environment_id' => (int) $tenant->getKey(),
|
|
'permission_key' => 'ManagedEnvironment.Read.All',
|
|
'status' => 'granted',
|
|
'details' => ['source' => 'db'],
|
|
'last_checked_at' => now(),
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
setAdminPanelContext();
|
|
session()->put(WorkspaceContext::SESSION_KEY, (int) $tenant->workspace_id);
|
|
|
|
$component = Livewire::withQueryParams([
|
|
'tenant' => $tenant->external_id,
|
|
'managed_environment_id' => (string) $otherTenant->getKey(),
|
|
'status' => 'present',
|
|
'type' => 'application',
|
|
'features' => ['backup'],
|
|
'search' => 'ManagedEnvironment',
|
|
])->test(TenantRequiredPermissions::class);
|
|
|
|
$component
|
|
->assertSet('tableFilters.status.value', 'present')
|
|
->assertSet('tableFilters.type.value', 'application')
|
|
->assertSet('tableFilters.features.values', ['backup'])
|
|
->assertSet('tableSearch', 'ManagedEnvironment');
|
|
|
|
expect($component->instance()->currentTenant()?->is($tenant))->toBeTrue();
|
|
});
|