ahmido
2bf5de4663
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
91 lines
3.1 KiB
PHP
91 lines
3.1 KiB
PHP
<?php
|
|
|
|
use App\Jobs\EntraGroupSyncJob;
|
|
use App\Models\EntraGroup;
|
|
use App\Services\Directory\EntraGroupSyncService;
|
|
use App\Services\Graph\GraphClientInterface;
|
|
use App\Services\Graph\GraphResponse;
|
|
use App\Services\Intune\AuditLogger;
|
|
use App\Services\OperationRunService;
|
|
|
|
it('sync job upserts groups and updates run counters', function () {
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
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);
|
|
|
|
/** @var OperationRunService $opService */
|
|
$opService = app(OperationRunService::class);
|
|
$opRun = $opService->ensureRun(
|
|
tenant: $tenant,
|
|
type: 'directory_groups.sync',
|
|
inputs: ['selection_key' => 'groups-v1:all'],
|
|
initiator: $user,
|
|
);
|
|
|
|
$job = new EntraGroupSyncJob(
|
|
tenantId: (int) $tenant->getKey(),
|
|
selectionKey: 'groups-v1:all',
|
|
slotKey: null,
|
|
runId: null,
|
|
operationRun: $opRun,
|
|
);
|
|
|
|
$job->handle(app(EntraGroupSyncService::class), app(AuditLogger::class));
|
|
|
|
$opRun->refresh();
|
|
|
|
expect($opRun->status)->toBe('completed')
|
|
->and($opRun->outcome)->toBe('succeeded')
|
|
->and($opRun->summary_counts['processed'] ?? null)->toBe(2)
|
|
->and($opRun->summary_counts['updated'] ?? null)->toBe(2)
|
|
->and($opRun->summary_counts['failed'] ?? null)->toBe(0);
|
|
|
|
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();
|
|
});
|