ahmido
c5fbcaa692
Key changes Adds Entra OIDC redirect + callback endpoints under /auth/entra/* (token exchange only there). Upserts tenant users keyed by (entra_tenant_id = tid, entra_object_id = oid); regenerates session; never stores tokens. Blocks disabled / soft-deleted users with a generic error and safe logging. Membership-based post-login routing: 0 memberships → /admin/no-access 1 membership → tenant dashboard (via Filament URL helpers) >1 memberships → /admin/choose-tenant Adds Filament pages: /admin/choose-tenant (tenant selection + redirect) /admin/no-access (tenantless-safe) Both use simple layout to avoid tenant-required UI. Guards / tests Adds DbOnlyPagesDoNotMakeHttpRequestsTest to enforce DB-only render/hydration for: /admin/login, /admin/no-access, /admin/choose-tenant with Http::preventStrayRequests() Adds session separation smoke coverage to ensure tenant session doesn’t access system and vice versa. Runs: vendor/bin/sail artisan test --compact tests/Feature/Auth Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Reviewed-on: #76
55 lines
1.6 KiB
PHP
55 lines
1.6 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Filament\Pages\ChooseTenant;
|
|
use App\Filament\Pages\TenantDashboard;
|
|
use App\Models\Tenant;
|
|
use App\Models\TenantMembership;
|
|
use App\Models\User;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\Schema;
|
|
use Livewire\Livewire;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
it('redirects to the chosen tenant dashboard and persists the last-used tenant', function () {
|
|
$user = User::factory()->create();
|
|
$this->actingAs($user);
|
|
|
|
$tenant = Tenant::factory()->create(['status' => 'active']);
|
|
$otherTenant = Tenant::factory()->create(['status' => 'active']);
|
|
|
|
foreach ([$tenant, $otherTenant] as $memberTenant) {
|
|
TenantMembership::query()->create([
|
|
'tenant_id' => $memberTenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'role' => 'owner',
|
|
'source' => 'manual',
|
|
'source_ref' => null,
|
|
'created_by_user_id' => null,
|
|
]);
|
|
}
|
|
|
|
Livewire::test(ChooseTenant::class)
|
|
->call('selectTenant', (int) $tenant->getKey())
|
|
->assertRedirect(TenantDashboard::getUrl(tenant: $tenant));
|
|
|
|
$user->refresh();
|
|
|
|
if (Schema::hasColumn('users', 'last_tenant_id')) {
|
|
expect($user->last_tenant_id)->toBe($tenant->getKey());
|
|
|
|
return;
|
|
}
|
|
|
|
if (Schema::hasTable('user_tenant_preferences')) {
|
|
$preference = $user->tenantPreferences()
|
|
->where('tenant_id', $tenant->getKey())
|
|
->first();
|
|
|
|
expect($preference)->not->toBeNull();
|
|
expect($preference?->last_used_at)->not->toBeNull();
|
|
}
|
|
});
|