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
98 lines
2.6 KiB
PHP
98 lines
2.6 KiB
PHP
<?php
|
|
|
|
namespace App\Services\Directory;
|
|
|
|
use App\Models\EntraGroup;
|
|
use App\Models\Tenant;
|
|
use Illuminate\Support\Str;
|
|
|
|
class EntraGroupLabelResolver
|
|
{
|
|
public function resolveOne(Tenant $tenant, string $groupId): string
|
|
{
|
|
$labels = $this->resolveMany($tenant, [$groupId]);
|
|
|
|
return $labels[$groupId] ?? self::formatLabel(null, $groupId);
|
|
}
|
|
|
|
/**
|
|
* @param array<int, string> $groupIds
|
|
* @return array<string, string>
|
|
*/
|
|
public function resolveMany(Tenant $tenant, array $groupIds): array
|
|
{
|
|
$groupIds = array_values(array_unique(array_filter($groupIds, fn ($id) => is_string($id) && $id !== '')));
|
|
|
|
if ($groupIds === []) {
|
|
return [];
|
|
}
|
|
|
|
$displayNames = $this->lookupMany($tenant, $groupIds);
|
|
|
|
$labels = [];
|
|
|
|
foreach ($groupIds as $groupId) {
|
|
$lookupId = Str::isUuid($groupId) ? strtolower($groupId) : $groupId;
|
|
$labels[$groupId] = self::formatLabel($displayNames[$lookupId] ?? null, $groupId);
|
|
}
|
|
|
|
return $labels;
|
|
}
|
|
|
|
/**
|
|
* @param array<int, string> $groupIds
|
|
* @return array<string, string> Map of groupId (lowercased UUID) => display_name
|
|
*/
|
|
public function lookupMany(Tenant $tenant, array $groupIds): array
|
|
{
|
|
$uuids = [];
|
|
|
|
foreach ($groupIds as $groupId) {
|
|
if (! is_string($groupId) || $groupId === '') {
|
|
continue;
|
|
}
|
|
|
|
if (! Str::isUuid($groupId)) {
|
|
continue;
|
|
}
|
|
|
|
$uuids[] = strtolower($groupId);
|
|
}
|
|
|
|
$uuids = array_values(array_unique($uuids));
|
|
|
|
if ($uuids === []) {
|
|
return [];
|
|
}
|
|
|
|
return EntraGroup::query()
|
|
->where('tenant_id', $tenant->getKey())
|
|
->whereIn('entra_id', $uuids)
|
|
->pluck('display_name', 'entra_id')
|
|
->mapWithKeys(fn (string $displayName, string $entraId) => [strtolower($entraId) => $displayName])
|
|
->all();
|
|
}
|
|
|
|
public static function formatLabel(?string $displayName, string $id): string
|
|
{
|
|
$name = filled($displayName) ? $displayName : 'Unresolved';
|
|
|
|
return sprintf('%s (%s)', trim($name), self::shortToken($id));
|
|
}
|
|
|
|
private static function shortToken(string $id): string
|
|
{
|
|
$normalized = preg_replace('/[^a-zA-Z0-9]/', '', $id);
|
|
|
|
if (! is_string($normalized) || $normalized === '') {
|
|
return 'unknown';
|
|
}
|
|
|
|
if (mb_strlen($normalized) <= 8) {
|
|
return $normalized;
|
|
}
|
|
|
|
return '…'.mb_substr($normalized, -8);
|
|
}
|
|
}
|