Spec 107: Workspace Chooser v1 (Enterprise) + In-App Switch Entry Point ## Core changes - Refactor EnsureWorkspaceSelected middleware: 7-step algorithm with auto-resume (single membership + last_workspace_id), stale session detection, ?choose=1 forced chooser, workspace-optional path bypass - Create WorkspaceRedirectResolver for DRY tenant-count branching (0→managed-tenants, 1→tenant-dashboard, >1→choose-tenant) - Add WorkspaceAutoSelected + WorkspaceSelected audit enum cases - Rewrite ChooseWorkspace page: role badges, tenant counts, wire:click selection, audit logging, WorkspaceRedirectResolver - Add 'Switch workspace' user menu item in AdminPanelProvider - Rewrite SwitchWorkspaceController with audit + resolver - Replace inline tenant branching in routes/web.php with resolver ## New test files (6) - WorkspaceRedirectResolverTest (5 tests Spec 107: Workspace Chooser v1 (Enterprise) + In-App Switch Entry Point ## Core changes - Refactor EnsureWorkspaceSelected middleware: 7-step algorithmst ## Core changes - Refactor EnsureWorkspaceSelected middleware: 7-stepes - Refactor Ensng auto-resume (single membership + last_workspace_id), stale sessioid detection, ?choose=1 forced chooser, w (security invariant preserve- Create WorkspaceRedirectResolver for DRY tenant-count branching (0→managed-tenants, 1→tenant-dashboapped (8163 assertions)
219 lines
7.7 KiB
PHP
219 lines
7.7 KiB
PHP
<?php
|
|
|
|
use App\Http\Controllers\AdminConsentCallbackController;
|
|
use App\Http\Controllers\Auth\EntraController;
|
|
use App\Http\Controllers\ClearTenantContextController;
|
|
use App\Http\Controllers\RbacDelegatedAuthController;
|
|
use App\Http\Controllers\SelectTenantController;
|
|
use App\Http\Controllers\SwitchWorkspaceController;
|
|
use App\Http\Controllers\TenantOnboardingController;
|
|
use App\Models\ProviderConnection;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use App\Models\Workspace;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use App\Support\Workspaces\WorkspaceRedirectResolver;
|
|
use App\Support\Workspaces\WorkspaceResolver;
|
|
use Filament\Http\Middleware\Authenticate as FilamentAuthenticate;
|
|
use Filament\Http\Middleware\DisableBladeIconComponents;
|
|
use Filament\Http\Middleware\DispatchServingFilamentEvent;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Route;
|
|
|
|
Route::get('/', function () {
|
|
return view('welcome');
|
|
});
|
|
|
|
Route::get('/admin/consent/callback', AdminConsentCallbackController::class)
|
|
->name('admin.consent.callback');
|
|
|
|
Route::get('/admin/consent/start', TenantOnboardingController::class)
|
|
->name('admin.consent.start');
|
|
|
|
// Avoid Filament's tenancy root redirect which otherwise sends users into legacy flows.
|
|
// when no default tenant can be resolved.
|
|
Route::middleware([
|
|
'web',
|
|
'panel:admin',
|
|
'ensure-correct-guard:web',
|
|
DisableBladeIconComponents::class,
|
|
DispatchServingFilamentEvent::class,
|
|
FilamentAuthenticate::class,
|
|
'ensure-workspace-selected',
|
|
])
|
|
->get('/admin', function (Request $request) {
|
|
$workspaceId = app(WorkspaceContext::class)->currentWorkspaceId($request);
|
|
|
|
$user = $request->user();
|
|
|
|
if (! $user instanceof User) {
|
|
return redirect()->to('/admin/choose-workspace');
|
|
}
|
|
|
|
if ($workspaceId === null) {
|
|
return redirect()->to('/admin/choose-workspace');
|
|
}
|
|
|
|
$workspace = Workspace::query()->whereKey($workspaceId)->first();
|
|
|
|
if (! $workspace instanceof Workspace) {
|
|
return redirect()->to('/admin/choose-workspace');
|
|
}
|
|
|
|
/** @var WorkspaceRedirectResolver $resolver */
|
|
$resolver = app(WorkspaceRedirectResolver::class);
|
|
|
|
return redirect()->to($resolver->resolve($workspace, $user));
|
|
})
|
|
->name('admin.home');
|
|
|
|
Route::get('/admin/rbac/start', [RbacDelegatedAuthController::class, 'start'])
|
|
->name('admin.rbac.start');
|
|
|
|
Route::get('/admin/rbac/callback', [RbacDelegatedAuthController::class, 'callback'])
|
|
->name('admin.rbac.callback');
|
|
|
|
Route::get('/auth/entra/redirect', [EntraController::class, 'redirect'])
|
|
->name('auth.entra.redirect');
|
|
|
|
Route::get('/auth/entra/callback', [EntraController::class, 'callback'])
|
|
->middleware('throttle:entra-callback')
|
|
->name('auth.entra.callback');
|
|
|
|
Route::middleware(['web', 'auth', 'ensure-correct-guard:web'])
|
|
->post('/admin/switch-workspace', SwitchWorkspaceController::class)
|
|
->name('admin.switch-workspace');
|
|
|
|
Route::middleware(['web', 'auth', 'ensure-correct-guard:web', 'ensure-workspace-selected'])
|
|
->post('/admin/select-tenant', SelectTenantController::class)
|
|
->name('admin.select-tenant');
|
|
|
|
Route::middleware(['web', 'auth', 'ensure-correct-guard:web', 'ensure-workspace-selected'])
|
|
->post('/admin/clear-tenant-context', ClearTenantContextController::class)
|
|
->name('admin.clear-tenant-context');
|
|
Route::bind('workspace', function (string $value): Workspace {
|
|
/** @var WorkspaceResolver $resolver */
|
|
$resolver = app(WorkspaceResolver::class);
|
|
|
|
$workspace = $resolver->resolve($value);
|
|
|
|
abort_unless($workspace instanceof Workspace, 404);
|
|
|
|
return $workspace;
|
|
});
|
|
|
|
Route::middleware(['web', 'auth', 'ensure-correct-guard:web', 'ensure-workspace-member'])
|
|
->prefix('/admin/w/{workspace}')
|
|
->group(function (): void {
|
|
Route::get('/', fn () => redirect()->route('admin.workspace.managed-tenants.index', ['workspace' => request()->route('workspace')]))
|
|
->name('admin.workspace.home');
|
|
|
|
Route::get('/ping', fn () => response()->noContent())->name('admin.workspace.ping');
|
|
});
|
|
|
|
Route::middleware([
|
|
'web',
|
|
'panel:admin',
|
|
'ensure-correct-guard:web',
|
|
DisableBladeIconComponents::class,
|
|
DispatchServingFilamentEvent::class,
|
|
FilamentAuthenticate::class,
|
|
])
|
|
->get('/admin/onboarding', \App\Filament\Pages\Workspaces\ManagedTenantOnboardingWizard::class)
|
|
->name('admin.onboarding');
|
|
|
|
Route::middleware([
|
|
'web',
|
|
'panel:admin',
|
|
'ensure-correct-guard:web',
|
|
DisableBladeIconComponents::class,
|
|
DispatchServingFilamentEvent::class,
|
|
FilamentAuthenticate::class,
|
|
'ensure-workspace-selected',
|
|
'ensure-filament-tenant-selected',
|
|
])
|
|
->get('/admin/operations', \App\Filament\Pages\Monitoring\Operations::class)
|
|
->name('admin.operations.index');
|
|
|
|
Route::middleware([
|
|
'web',
|
|
'panel:admin',
|
|
'ensure-correct-guard:web',
|
|
DisableBladeIconComponents::class,
|
|
DispatchServingFilamentEvent::class,
|
|
FilamentAuthenticate::class,
|
|
'ensure-workspace-selected',
|
|
'ensure-filament-tenant-selected',
|
|
])
|
|
->prefix('/admin/tenants/{tenant:external_id}/provider-connections')
|
|
->group(function (): void {
|
|
Route::get('/', function (Tenant $tenant) {
|
|
return redirect()->to('/admin/provider-connections?tenant_id='.$tenant->external_id);
|
|
})->name('admin.provider-connections.legacy-index');
|
|
|
|
Route::get('/create', function (Tenant $tenant) {
|
|
return redirect()->to('/admin/provider-connections/create?tenant_id='.$tenant->external_id);
|
|
})->name('admin.provider-connections.legacy-create');
|
|
|
|
Route::get('/{record}/edit', function (Tenant $tenant, mixed $record) {
|
|
$connection = ProviderConnection::query()
|
|
->whereKey((int) $record)
|
|
->where('tenant_id', (int) $tenant->getKey())
|
|
->where('workspace_id', (int) $tenant->workspace_id)
|
|
->first();
|
|
|
|
abort_unless($connection instanceof ProviderConnection, 404);
|
|
|
|
return redirect()->to('/admin/provider-connections/'.$connection->getKey().'/edit?tenant_id='.$tenant->external_id);
|
|
})->name('admin.provider-connections.legacy-edit');
|
|
});
|
|
|
|
Route::middleware([
|
|
'web',
|
|
'panel:admin',
|
|
'ensure-correct-guard:web',
|
|
DisableBladeIconComponents::class,
|
|
DispatchServingFilamentEvent::class,
|
|
FilamentAuthenticate::class,
|
|
'ensure-workspace-selected',
|
|
'ensure-filament-tenant-selected',
|
|
])
|
|
->get('/admin/audit-log', \App\Filament\Pages\Monitoring\AuditLog::class)
|
|
->name('admin.monitoring.audit-log');
|
|
|
|
Route::middleware([
|
|
'web',
|
|
'panel:admin',
|
|
'ensure-correct-guard:web',
|
|
DisableBladeIconComponents::class,
|
|
DispatchServingFilamentEvent::class,
|
|
FilamentAuthenticate::class,
|
|
'ensure-workspace-selected',
|
|
'ensure-filament-tenant-selected',
|
|
])
|
|
->get('/admin/operations/{run}', \App\Filament\Pages\Operations\TenantlessOperationRunViewer::class)
|
|
->name('admin.operations.view');
|
|
|
|
Route::middleware([
|
|
'web',
|
|
'panel:admin',
|
|
'ensure-correct-guard:web',
|
|
DisableBladeIconComponents::class,
|
|
DispatchServingFilamentEvent::class,
|
|
FilamentAuthenticate::class,
|
|
'ensure-workspace-member',
|
|
])
|
|
->get('/admin/w/{workspace}/managed-tenants', \App\Filament\Pages\Workspaces\ManagedTenantsLanding::class)
|
|
->name('admin.workspace.managed-tenants.index');
|
|
|
|
if (app()->runningUnitTests()) {
|
|
Route::middleware(['web', 'auth', 'ensure-workspace-selected'])
|
|
->get('/admin/_test/workspace-context', function (Request $request) {
|
|
$workspaceId = app(\App\Support\Workspaces\WorkspaceContext::class)->currentWorkspaceId($request);
|
|
|
|
return response()->json([
|
|
'workspace_id' => $workspaceId,
|
|
]);
|
|
});
|
|
}
|