Save workspace changes

app/Http/Middleware/EnsureAdminOrModerator.php

@@ -13,9 +13,8 @@ final class EnsureAdminOrModerator
     public function handle(Request $request, Closure $next): Response
     {
         $user = $request->user();
-        $role = strtolower((string) ($user->role ?? ''));
 
-        if (! in_array($role, ['admin', 'moderator'], true)) {
+        if (! $user || (! $user->isAdmin() && ! $user->isModerator())) {
             abort(Response::HTTP_FORBIDDEN, 'Forbidden.');
         }
 

app/Http/Middleware/EnsureEmailLoginUpgradeComplete.php

@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+final class EnsureEmailLoginUpgradeComplete
+{
+    private const SESSION_KEY = 'username_login_upgrade';
+
+    private const ALWAYS_ALLOW = [
+        'logout',
+        'setup/*',
+        'up',
+    ];
+
+    public function handle(Request $request, Closure $next): Response
+    {
+        $user = $request->user();
+        if (! $user) {
+            return $next($request);
+        }
+
+        if (! $request->hasSession()) {
+            return $next($request);
+        }
+
+        if ($user->hasCompletedOnboarding()) {
+            $request->session()->forget(self::SESSION_KEY);
+
+            return $next($request);
+        }
+
+        if (! $request->session()->get(self::SESSION_KEY, false)) {
+            return $next($request);
+        }
+
+        if ($request->is(self::ALWAYS_ALLOW)) {
+            return $next($request);
+        }
+
+        $step = strtolower(trim((string) ($user->onboarding_step ?? '')));
+        $route = match ($step) {
+            'verified' => route('setup.password.create'),
+            'password' => route('setup.username.create'),
+            default => route('setup.email.create'),
+        };
+
+        return redirect($route)
+            ->with('status', 'Continue onboarding to finish switching this account to email-based login.');
+    }
+}

app/Http/Middleware/EnsureOnboardingComplete.php

@@ -28,7 +28,7 @@ class EnsureOnboardingComplete
         }
 
         $step = strtolower((string) ($user->onboarding_step ?? ''));
-        if ($step === 'complete') {
+        if ($step === '' || $step === 'complete') {
             return $next($request);
         }