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
147 lines
4.8 KiB
PHP
147 lines
4.8 KiB
PHP
<?php
|
|
|
|
use App\Models\Policy;
|
|
use App\Models\PolicyVersion;
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\ProviderCredential;
|
|
use App\Models\Tenant;
|
|
use App\Models\Workspace;
|
|
use App\Services\Graph\GraphClientInterface;
|
|
use App\Services\Graph\GraphResponse;
|
|
use App\Services\Intune\PolicySyncService;
|
|
use Carbon\CarbonImmutable;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
class SettingsCatalogFakeGraphClient implements GraphClientInterface
|
|
{
|
|
/**
|
|
* @param array<string, GraphResponse> $responses
|
|
*/
|
|
public function __construct(private array $responses = []) {}
|
|
|
|
public function listPolicies(string $policyType, array $options = []): GraphResponse
|
|
{
|
|
return $this->responses[$policyType] ?? new GraphResponse(true, []);
|
|
}
|
|
|
|
public function getPolicy(string $policyType, string $policyId, array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function getOrganization(array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function applyPolicy(string $policyType, string $policyId, array $payload, array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function getServicePrincipalPermissions(array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
|
|
public function request(string $method, string $path, array $options = []): GraphResponse
|
|
{
|
|
return new GraphResponse(true, []);
|
|
}
|
|
}
|
|
|
|
test('settings catalog policies sync as their own type and render in the list', function () {
|
|
$responses = [
|
|
'deviceConfiguration' => new GraphResponse(true, [
|
|
[
|
|
'id' => 'config-1',
|
|
'displayName' => 'Device Config 1',
|
|
'platform' => 'windows',
|
|
],
|
|
]),
|
|
'settingsCatalogPolicy' => new GraphResponse(true, [
|
|
[
|
|
'id' => 'scp-1',
|
|
'name' => 'Settings Catalog Alpha',
|
|
'platform' => 'windows',
|
|
'@odata.type' => '#microsoft.graph.deviceManagementConfigurationPolicy',
|
|
'settings' => [
|
|
['displayName' => 'Setting A', 'value' => 'on'],
|
|
],
|
|
],
|
|
]),
|
|
];
|
|
|
|
app()->instance(GraphClientInterface::class, new SettingsCatalogFakeGraphClient($responses));
|
|
|
|
$tenant = Tenant::create([
|
|
'tenant_id' => 'local-tenant',
|
|
'name' => 'Tenant One',
|
|
'metadata' => [],
|
|
'is_current' => true,
|
|
]);
|
|
$tenant->makeCurrent();
|
|
expect(Tenant::current()->id)->toBe($tenant->id);
|
|
|
|
$workspace = Workspace::factory()->create();
|
|
$tenant->forceFill(['workspace_id' => (int) $workspace->getKey()])->save();
|
|
|
|
$connection = ProviderConnection::factory()->create([
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'workspace_id' => (int) $workspace->getKey(),
|
|
'provider' => 'microsoft',
|
|
'entra_tenant_id' => $tenant->tenant_id,
|
|
'is_default' => true,
|
|
'status' => 'connected',
|
|
]);
|
|
|
|
ProviderCredential::factory()->create([
|
|
'provider_connection_id' => (int) $connection->getKey(),
|
|
'type' => 'client_secret',
|
|
'payload' => [
|
|
'client_id' => 'test-client-id',
|
|
'client_secret' => 'test-client-secret',
|
|
],
|
|
]);
|
|
|
|
app(PolicySyncService::class)->syncPolicies($tenant);
|
|
|
|
$settingsPolicy = Policy::where('policy_type', 'settingsCatalogPolicy')->first();
|
|
|
|
expect($settingsPolicy)->not->toBeNull();
|
|
expect($settingsPolicy->display_name)->toBe('Settings Catalog Alpha');
|
|
expect($settingsPolicy->platform)->toBe('windows');
|
|
|
|
expect(Policy::where('policy_type', 'deviceConfiguration')->count())->toBe(1);
|
|
expect(Policy::where('policy_type', 'deviceConfiguration')->where('external_id', 'scp-1')->exists())->toBeFalse();
|
|
|
|
PolicyVersion::create([
|
|
'tenant_id' => $tenant->id,
|
|
'policy_id' => $settingsPolicy->id,
|
|
'version_number' => 1,
|
|
'policy_type' => $settingsPolicy->policy_type,
|
|
'platform' => $settingsPolicy->platform,
|
|
'created_by' => 'tester@example.com',
|
|
'captured_at' => CarbonImmutable::now(),
|
|
'snapshot' => [
|
|
'@odata.type' => '#microsoft.graph.deviceManagementConfigurationPolicy',
|
|
'settings' => [
|
|
['displayName' => 'Setting A', 'value' => 'on'],
|
|
],
|
|
],
|
|
]);
|
|
|
|
[$user, $tenant] = createUserWithTenant($tenant, role: 'owner');
|
|
|
|
$response = $this
|
|
->actingAs($user)
|
|
->get(route('filament.tenant.resources.policies.index', filamentTenantRouteParams($tenant)));
|
|
|
|
$response->assertOk();
|
|
$response->assertSee('Settings Catalog Policy');
|
|
$response->assertSee('Settings Catalog Alpha');
|
|
$response->assertSee('Available');
|
|
});
|