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
62 lines
2.1 KiB
PHP
62 lines
2.1 KiB
PHP
<?php
|
|
|
|
use App\Filament\Resources\TenantResource;
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\ProviderCredential;
|
|
use App\Models\Tenant;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
it('includes scope parameter in admin consent url', function () {
|
|
// The adminConsentUrl builds scopes from intune_permissions config, not graph.scope
|
|
$tenant = Tenant::create([
|
|
'tenant_id' => 'b0091e5d-944f-4a34-bcd9-12cbfb7b75cf',
|
|
'name' => 'Test Tenant',
|
|
'app_client_id' => 'client-id',
|
|
]);
|
|
|
|
$url = TenantResource::adminConsentUrl($tenant);
|
|
|
|
expect($url)->toContain('scope=');
|
|
|
|
// Should contain permissions from intune_permissions config
|
|
$requiredPermissions = config('intune_permissions.permissions', []);
|
|
if (! empty($requiredPermissions)) {
|
|
$firstPermission = $requiredPermissions[0]['key'];
|
|
expect($url)->toContain(urlencode("https://graph.microsoft.com/{$firstPermission}"));
|
|
} else {
|
|
// Fallback to .default if no permissions configured
|
|
expect($url)->toContain(urlencode('https://graph.microsoft.com/.default'));
|
|
}
|
|
});
|
|
|
|
it('can derive admin consent url from provider connection credentials when tenant app_client_id is missing', function () {
|
|
$tenant = Tenant::factory()->create([
|
|
'app_client_id' => null,
|
|
]);
|
|
|
|
$connection = ProviderConnection::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $tenant->workspace_id,
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => (string) $tenant->graphTenantId(),
|
|
'is_default' => true,
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'payload' => [
|
|
'client_id' => 'derived-client-id',
|
|
'client_secret' => 'derived-client-secret',
|
|
],
|
|
]);
|
|
|
|
$url = TenantResource::adminConsentUrl($tenant);
|
|
|
|
expect($url)
|
|
->not->toBeNull()
|
|
->and($url)->toContain('login.microsoftonline.com')
|
|
->and($url)->toContain('adminconsent')
|
|
->and($url)->toContain(urlencode('derived-client-id'));
|
|
});
|