Summary Consolidates the “Tenant Operate Hub” work (Spec 085) and the follow-up adjustments from the 086 session merge into a single branch ready to merge into dev. Primary focus: stabilize Ops/Operate Hub UX flows, tighten/align authorization semantics, and make the full Sail test suite green. Key Changes Ops UX / Verification Readonly members can view verification operation runs (reports) while starting verification remains restricted. Normalized failure reason-code handling and aligned UX expectations with the provider reason-code taxonomy. Onboarding wizard UX “Start verification” CTA is hidden while a verification run is active; “Refresh” is shown during in-progress runs. Treats provider_permission_denied as a blocking reason (while keeping legacy compatibility). Test + fixture hardening Standardized use of default provider connection fixtures in tests where sync/restore flows require it. Fixed multiple Filament URL/tenant-context test cases to avoid 404s and reduce tenancy routing brittleness. Policy sync / restore safety Enrollment configuration type collision classification tests now exercise the real sync path (with required provider connection present). Restore edge-case safety tests updated to reflect current provider-connection requirements. Testing vendor/bin/sail artisan test --compact (green) vendor/bin/sail bin pint --dirty (green) Notes Includes merged 086 session work already (no separate PR needed). Co-authored-by: Ahmed Darrazi <ahmeddarrazi@ebc83aaa-d947-4a08-b88e-bd72ac9645f7.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.fritz.box> Reviewed-on: #103
160 lines
5.1 KiB
PHP
160 lines
5.1 KiB
PHP
<?php
|
|
|
|
use App\Models\Policy;
|
|
use App\Models\Tenant;
|
|
use App\Services\Graph\GraphClientInterface;
|
|
use App\Services\Graph\GraphResponse;
|
|
use App\Services\Intune\BackupService;
|
|
use App\Services\Intune\VersionService;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
class SettingsCatalogHydrationGraphClient implements GraphClientInterface
|
|
{
|
|
public array $requests = [];
|
|
|
|
public function listPolicies(string $policyType, array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function getPolicy(string $policyType, string $policyId, array $options = []): GraphResponse
|
|
{
|
|
$this->requests[] = ['getPolicy', $policyType, $policyId];
|
|
|
|
return new GraphResponse(true, ['payload' => [
|
|
'id' => $policyId,
|
|
'displayName' => 'Settings Catalog Alpha',
|
|
'@odata.type' => '#microsoft.graph.deviceManagementConfigurationPolicy',
|
|
]]);
|
|
}
|
|
|
|
public function getOrganization(array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function applyPolicy(string $policyType, string $policyId, array $payload, array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function getServicePrincipalPermissions(array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function request(string $method, string $path, array $options = []): GraphResponse
|
|
{
|
|
$this->requests[] = [$method, $path];
|
|
|
|
if (str_contains($path, '/settings')) {
|
|
return new GraphResponse(true, [
|
|
'value' => [
|
|
['displayName' => 'Setting A', 'value' => 'on'],
|
|
['displayName' => 'Setting B', 'value' => 'off'],
|
|
],
|
|
]);
|
|
}
|
|
|
|
return new GraphResponse(true, []);
|
|
}
|
|
}
|
|
|
|
test('settings catalog snapshot hydrates configuration settings and renders in policy detail', function () {
|
|
$client = new SettingsCatalogHydrationGraphClient;
|
|
app()->instance(GraphClientInterface::class, $client);
|
|
|
|
$tenant = Tenant::create([
|
|
'tenant_id' => 'tenant-hydration',
|
|
'name' => 'Tenant One',
|
|
'metadata' => [],
|
|
'is_current' => true,
|
|
]);
|
|
|
|
ensureDefaultProviderConnection($tenant);
|
|
|
|
putenv('INTUNE_TENANT_ID='.$tenant->tenant_id);
|
|
$_ENV['INTUNE_TENANT_ID'] = $tenant->tenant_id;
|
|
$_SERVER['INTUNE_TENANT_ID'] = $tenant->tenant_id;
|
|
$tenant->makeCurrent();
|
|
|
|
$policy = Policy::create([
|
|
'tenant_id' => $tenant->id,
|
|
'external_id' => 'scp-hydrate',
|
|
'policy_type' => 'settingsCatalogPolicy',
|
|
'display_name' => 'Settings Catalog Alpha',
|
|
'platform' => 'windows',
|
|
]);
|
|
|
|
/** @var BackupService $backupService */
|
|
$backupService = app(BackupService::class);
|
|
$backupSet = $backupService->createBackupSet($tenant, [$policy->id], actorEmail: 'tester@example.com');
|
|
|
|
$item = $backupSet->items()->first();
|
|
expect($item->payload)->toHaveKey('settings');
|
|
expect(count($item->payload['settings']))->toBe(2);
|
|
|
|
/** @var VersionService $versions */
|
|
$versions = app(VersionService::class);
|
|
$versions->captureVersion(
|
|
policy: $policy,
|
|
payload: $item->payload,
|
|
createdBy: 'tester@example.com',
|
|
metadata: ['source' => 'test', 'backup_set_id' => $backupSet->id],
|
|
);
|
|
|
|
[$user, $tenant] = createUserWithTenant($tenant, role: 'owner');
|
|
|
|
$response = $this
|
|
->actingAs($user)
|
|
->get(route('filament.admin.resources.policies.view', array_merge(filamentTenantRouteParams($tenant), ['record' => $policy])));
|
|
|
|
$response->assertOk();
|
|
$response->assertSee('Setting A');
|
|
$response->assertSee('on');
|
|
$response->assertSee('Settings');
|
|
});
|
|
|
|
test('settings catalog version capture hydrates settings from graph', function () {
|
|
$client = new SettingsCatalogHydrationGraphClient;
|
|
app()->instance(GraphClientInterface::class, $client);
|
|
|
|
$tenant = Tenant::create([
|
|
'tenant_id' => 'tenant-hydration-version',
|
|
'name' => 'Tenant One',
|
|
'metadata' => [],
|
|
'is_current' => true,
|
|
]);
|
|
|
|
ensureDefaultProviderConnection($tenant);
|
|
|
|
putenv('INTUNE_TENANT_ID='.$tenant->tenant_id);
|
|
$_ENV['INTUNE_TENANT_ID'] = $tenant->tenant_id;
|
|
$_SERVER['INTUNE_TENANT_ID'] = $tenant->tenant_id;
|
|
$tenant->makeCurrent();
|
|
|
|
$policy = Policy::create([
|
|
'tenant_id' => $tenant->id,
|
|
'external_id' => 'scp-version',
|
|
'policy_type' => 'settingsCatalogPolicy',
|
|
'display_name' => 'Settings Catalog Beta',
|
|
'platform' => 'windows',
|
|
]);
|
|
|
|
/** @var VersionService $versions */
|
|
$versions = app(VersionService::class);
|
|
$versions->captureFromGraph($tenant, $policy, createdBy: 'tester@example.com');
|
|
|
|
[$user, $tenant] = createUserWithTenant($tenant, role: 'owner');
|
|
|
|
$response = $this
|
|
->actingAs($user)
|
|
->get(route('filament.admin.resources.policies.view', array_merge(filamentTenantRouteParams($tenant), ['record' => $policy])));
|
|
|
|
$response->assertOk();
|
|
$response->assertSee('Setting A');
|
|
$response->assertSee('Setting B');
|
|
});
|