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
164 lines
4.9 KiB
PHP
164 lines
4.9 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\PolicySyncService;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
class FakeGraphClientForSync implements GraphClientInterface
|
|
{
|
|
/**
|
|
* @param array<string, GraphResponse> $responses
|
|
*/
|
|
public function __construct(private array $responses = []) {}
|
|
|
|
public function listPolicies(string $policyType, array $options = []): GraphResponse
|
|
{
|
|
return $this->responses[$policyType] ?? new GraphResponse(true, []);
|
|
}
|
|
|
|
public function getPolicy(string $policyType, string $policyId, array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
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
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
}
|
|
|
|
test('sync revives ignored policies when they exist in Intune', function () {
|
|
$tenant = Tenant::create([
|
|
'tenant_id' => 'test-tenant',
|
|
'name' => 'Test Tenant',
|
|
'metadata' => [],
|
|
'is_current' => true,
|
|
]);
|
|
|
|
ensureDefaultProviderConnection($tenant);
|
|
|
|
// Create an ignored policy
|
|
$policy = Policy::create([
|
|
'tenant_id' => $tenant->id,
|
|
'external_id' => 'policy-123',
|
|
'policy_type' => 'deviceConfiguration',
|
|
'display_name' => 'Test Policy',
|
|
'platform' => 'windows',
|
|
'ignored_at' => now(),
|
|
]);
|
|
|
|
expect($policy->ignored_at)->not->toBeNull();
|
|
|
|
// Mock Graph response with the same policy
|
|
$responses = [
|
|
'deviceConfiguration' => new GraphResponse(true, [
|
|
[
|
|
'id' => 'policy-123',
|
|
'displayName' => 'Test Policy (Updated)',
|
|
'platform' => 'windows',
|
|
],
|
|
]),
|
|
];
|
|
|
|
app()->instance(GraphClientInterface::class, new FakeGraphClientForSync($responses));
|
|
|
|
// Sync policies
|
|
app(PolicySyncService::class)->syncPolicies($tenant);
|
|
|
|
// Refresh the policy
|
|
$policy->refresh();
|
|
|
|
// Policy should no longer be ignored
|
|
expect($policy->ignored_at)->toBeNull();
|
|
expect($policy->display_name)->toBe('Test Policy (Updated)');
|
|
expect($policy->last_synced_at)->not->toBeNull();
|
|
});
|
|
|
|
test('sync creates new policies even if ignored ones exist with same external_id', function () {
|
|
$tenant = Tenant::create([
|
|
'tenant_id' => 'test-tenant-2',
|
|
'name' => 'Test Tenant 2',
|
|
'metadata' => [],
|
|
'is_current' => true,
|
|
]);
|
|
|
|
ensureDefaultProviderConnection($tenant);
|
|
|
|
// Create multiple ignored policies
|
|
Policy::create([
|
|
'tenant_id' => $tenant->id,
|
|
'external_id' => 'policy-abc',
|
|
'policy_type' => 'deviceConfiguration',
|
|
'display_name' => 'Old Policy ABC',
|
|
'platform' => 'windows',
|
|
'ignored_at' => now()->subDay(),
|
|
]);
|
|
|
|
Policy::create([
|
|
'tenant_id' => $tenant->id,
|
|
'external_id' => 'policy-def',
|
|
'policy_type' => 'deviceCompliancePolicy',
|
|
'display_name' => 'Old Policy DEF',
|
|
'platform' => 'android',
|
|
'ignored_at' => now()->subDay(),
|
|
]);
|
|
|
|
expect(Policy::active()->count())->toBe(0);
|
|
expect(Policy::ignored()->count())->toBe(2);
|
|
|
|
// Mock Graph response with same policy IDs but potentially different data
|
|
$responses = [
|
|
'deviceConfiguration' => new GraphResponse(true, [
|
|
[
|
|
'id' => 'policy-abc',
|
|
'displayName' => 'Restored Policy ABC',
|
|
'platform' => 'windows',
|
|
],
|
|
]),
|
|
'deviceCompliancePolicy' => new GraphResponse(true, [
|
|
[
|
|
'id' => 'policy-def',
|
|
'displayName' => 'Restored Policy DEF',
|
|
'platform' => 'android',
|
|
],
|
|
]),
|
|
];
|
|
|
|
app()->instance(GraphClientInterface::class, new FakeGraphClientForSync($responses));
|
|
|
|
// Sync policies
|
|
app(PolicySyncService::class)->syncPolicies($tenant);
|
|
|
|
// All policies should now be active
|
|
expect(Policy::active()->count())->toBe(2);
|
|
expect(Policy::ignored()->count())->toBe(0);
|
|
|
|
$policyAbc = Policy::where('external_id', 'policy-abc')->first();
|
|
expect($policyAbc->display_name)->toBe('Restored Policy ABC');
|
|
expect($policyAbc->ignored_at)->toBeNull();
|
|
|
|
$policyDef = Policy::where('external_id', 'policy-def')->first();
|
|
expect($policyDef->display_name)->toBe('Restored Policy DEF');
|
|
expect($policyDef->ignored_at)->toBeNull();
|
|
});
|