ahmido
1acbf8cc54
## Summary - remove tenant-based Graph options access from runtime service paths and enforce provider-only resolution - add `MicrosoftGraphOptionsResolver` and `ProviderConfigurationRequiredException` for centralized, actionable provider-config errors - turn `Tenant::graphOptions()` into a fail-fast kill switch to prevent legacy runtime usage - add and update tests (including guardrail) to enforce no reintroduction in `app/` - update Spec 088 artifacts (`spec`, `plan`, `research`, `tasks`, checklist) ## Validation - `vendor/bin/sail bin pint --dirty` - `vendor/bin/sail artisan test --compact --filter=NoLegacyTenantGraphOptions` - `vendor/bin/sail artisan test --compact tests/Feature/Filament` - `CI=1 vendor/bin/sail artisan test --compact` ## Notes - Branch includes the guardrail test for legacy callsite detection in `app/`. - Full suite currently green: 1227 passed, 5 skipped. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Reviewed-on: #105
94 lines
3.2 KiB
PHP
94 lines
3.2 KiB
PHP
<?php
|
|
|
|
use App\Models\BackupItem;
|
|
use App\Models\Tenant;
|
|
use App\Services\AssignmentBackupService;
|
|
use App\Services\Graph\AssignmentFetcher;
|
|
use App\Services\Graph\AssignmentFilterResolver;
|
|
use App\Services\Graph\GroupResolver;
|
|
use App\Services\Graph\ScopeTagResolver;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Mockery\MockInterface;
|
|
|
|
uses(RefreshDatabase::class);
|
|
it('enriches assignment filter names when filter data is stored at root', function () {
|
|
$tenant = Tenant::factory()->create([
|
|
'tenant_id' => 'tenant-123',
|
|
'external_id' => 'tenant-123',
|
|
]);
|
|
|
|
ensureDefaultProviderConnection($tenant, 'microsoft');
|
|
|
|
$backupItem = BackupItem::factory()->create([
|
|
'tenant_id' => $tenant->id,
|
|
'metadata' => [],
|
|
'assignments' => null,
|
|
]);
|
|
|
|
$policyPayload = [
|
|
'roleScopeTagIds' => ['0'],
|
|
];
|
|
|
|
$this->mock(AssignmentFetcher::class, function (MockInterface $mock) {
|
|
$mock->shouldReceive('fetch')
|
|
->once()
|
|
->andReturn([
|
|
[
|
|
'id' => 'assignment-1',
|
|
'intent' => 'apply',
|
|
'deviceAndAppManagementAssignmentFilterId' => 'filter-123',
|
|
'deviceAndAppManagementAssignmentFilterType' => 'include',
|
|
'target' => [
|
|
'@odata.type' => '#microsoft.graph.groupAssignmentTarget',
|
|
'groupId' => 'group-123',
|
|
],
|
|
],
|
|
]);
|
|
});
|
|
|
|
$this->mock(GroupResolver::class, function (MockInterface $mock) {
|
|
$mock->shouldReceive('resolveGroupIds')
|
|
->once()
|
|
->andReturn([
|
|
'group-123' => [
|
|
'id' => 'group-123',
|
|
'displayName' => 'Test Group',
|
|
'orphaned' => false,
|
|
],
|
|
]);
|
|
});
|
|
|
|
$this->mock(AssignmentFilterResolver::class, function (MockInterface $mock) use ($tenant) {
|
|
$mock->shouldReceive('resolve')
|
|
->once()
|
|
->with(['filter-123'], $tenant)
|
|
->andReturn([
|
|
['id' => 'filter-123', 'displayName' => 'Targeted Devices'],
|
|
]);
|
|
});
|
|
|
|
$this->mock(ScopeTagResolver::class, function (MockInterface $mock) use ($tenant) {
|
|
$mock->shouldReceive('resolve')
|
|
->once()
|
|
->with(['0'], $tenant)
|
|
->andReturn([
|
|
['id' => '0', 'displayName' => 'Default'],
|
|
]);
|
|
});
|
|
|
|
$service = app(AssignmentBackupService::class);
|
|
$updated = $service->enrichWithAssignments(
|
|
backupItem: $backupItem,
|
|
tenant: $tenant,
|
|
policyType: 'settingsCatalogPolicy',
|
|
policyId: 'policy-123',
|
|
policyPayload: $policyPayload,
|
|
includeAssignments: true
|
|
);
|
|
|
|
expect($updated->assignments)->toHaveCount(1)
|
|
->and($updated->assignments[0]['target']['deviceAndAppManagementAssignmentFilterId'])->toBe('filter-123')
|
|
->and($updated->assignments[0]['target']['deviceAndAppManagementAssignmentFilterType'])->toBe('include')
|
|
->and($updated->assignments[0]['target']['assignment_filter_name'])->toBe('Targeted Devices');
|
|
});
|