ahmido
bc846d7c5c
Summary Adds a tenant-scoped Entra Groups “Directory Cache” to enable DB-only group name resolution across the app (no render-time Graph calls), plus sync runs + observability. What’s included • Entra Groups cache • New entra_groups storage (tenant-scoped) for group metadata (no memberships). • Retention semantics: groups become stale / retained per spec (no hard delete on first miss). • Group Sync Runs • New “Group Sync Runs” UI (list + detail) with tenant isolation (403 on cross-tenant access). • Manual “Sync Groups” action: creates/reuses a run, dispatches job, DB notification with “View run” link. • Scheduled dispatcher command wired in console.php. • DB-only label resolution (US3) • Shared EntraGroupLabelResolver with safe fallback Unresolved (…last8) and UUID guarding. • Refactors to prefer cached names (no typeahead / no live Graph) in: • Tenant RBAC group selects • Policy version assignments widget • Restore results + restore wizard group mapping labels Safety / Guardrails • No render-time Graph calls: fail-hard guard test verifies UI paths don’t call GraphClientInterface during page render. • Tenant isolation & authorization: policies + scoped queries enforced (cross-tenant access returns 403, not 404). • Data minimization: only group metadata is cached (no membership/owners). Tests / Verification • Added/updated tests under tests/Feature/DirectoryGroups and tests/Unit/DirectoryGroups: • Start sync → run record + job dispatch + upserts • Retention purge semantics • Scheduled dispatch wiring • Render-time Graph guard • UI/resource access isolation • Ran: • ./vendor/bin/pint --dirty • ./vendor/bin/sail artisan test tests/Feature/DirectoryGroups • ./vendor/bin/sail artisan test tests/Unit/DirectoryGroups Notes / Follow-ups • UI polish remains (picker/lookup UX, consistent progress widget/toasts across modules, navigation grouping). • pr-gate checklist still has non-blocking open items (mostly UX/ops polish); requirements gate is green. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #57
89 lines
3.0 KiB
PHP
89 lines
3.0 KiB
PHP
<?php
|
|
|
|
use App\Jobs\EntraGroupSyncJob;
|
|
use App\Models\EntraGroup;
|
|
use App\Models\EntraGroupSyncRun;
|
|
use App\Services\Directory\EntraGroupSyncService;
|
|
use App\Services\Graph\GraphClientInterface;
|
|
use App\Services\Graph\GraphResponse;
|
|
use App\Services\Intune\AuditLogger;
|
|
|
|
it('sync job upserts groups and updates run counters', function () {
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$run = EntraGroupSyncRun::factory()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'selection_key' => 'groups-v1:all',
|
|
'status' => EntraGroupSyncRun::STATUS_PENDING,
|
|
'initiator_user_id' => $user->getKey(),
|
|
]);
|
|
|
|
EntraGroup::factory()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'entra_id' => '11111111-1111-1111-1111-111111111111',
|
|
'display_name' => 'Old Name',
|
|
'last_seen_at' => now('UTC')->subDays(10),
|
|
]);
|
|
|
|
$mock = \Mockery::mock(GraphClientInterface::class);
|
|
$mock->shouldReceive('request')
|
|
->twice()
|
|
->andReturn(
|
|
new GraphResponse(success: true, data: [
|
|
'value' => [
|
|
[
|
|
'id' => '11111111-1111-1111-1111-111111111111',
|
|
'displayName' => 'New Name',
|
|
'groupTypes' => ['Unified'],
|
|
'securityEnabled' => false,
|
|
'mailEnabled' => true,
|
|
],
|
|
],
|
|
'@odata.nextLink' => 'https://graph.microsoft.com/v1.0/groups?$skiptoken=abc',
|
|
], status: 200),
|
|
new GraphResponse(success: true, data: [
|
|
'value' => [
|
|
[
|
|
'id' => '22222222-2222-2222-2222-222222222222',
|
|
'displayName' => 'Second Group',
|
|
'groupTypes' => [],
|
|
'securityEnabled' => true,
|
|
'mailEnabled' => false,
|
|
],
|
|
],
|
|
], status: 200),
|
|
);
|
|
|
|
app()->instance(GraphClientInterface::class, $mock);
|
|
|
|
$job = new EntraGroupSyncJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
selectionKey: 'groups-v1:all',
|
|
slotKey: null,
|
|
runId: (int) $run->getKey(),
|
|
);
|
|
|
|
$job->handle(app(EntraGroupSyncService::class), app(AuditLogger::class));
|
|
|
|
$run->refresh();
|
|
|
|
expect($run->status)->toBe(EntraGroupSyncRun::STATUS_SUCCEEDED)
|
|
->and($run->pages_fetched)->toBe(2)
|
|
->and($run->items_observed_count)->toBe(2)
|
|
->and($run->items_upserted_count)->toBe(2)
|
|
->and($run->error_count)->toBe(0)
|
|
->and($run->finished_at)->not->toBeNull();
|
|
|
|
expect(EntraGroup::query()->where('tenant_id', $tenant->getKey())->count())->toBe(2);
|
|
|
|
$updated = EntraGroup::query()
|
|
->where('tenant_id', $tenant->getKey())
|
|
->where('entra_id', '11111111-1111-1111-1111-111111111111')
|
|
->first();
|
|
|
|
expect($updated)->not->toBeNull()
|
|
->and($updated->display_name)->toBe('New Name')
|
|
->and($updated->mail_enabled)->toBeTrue();
|
|
});
|