From ce4e21220f7828d60146b62e8c42072469f6a823 Mon Sep 17 00:00:00 2001
From: Vasyka <vasyka.moraru@gmail.com>
Date: Thu, 7 May 2026 19:15:43 +0000
Subject: [PATCH] fix: SetLocale tolerant to early-pipeline missing session

---
 app/Http/Middleware/SetLocale.php              | 9 ++++++---
 app/Providers/Filament/TenantPanelProvider.php | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Http/Middleware/SetLocale.php b/app/Http/Middleware/SetLocale.php
index 5a42721..d886ab0 100644
--- a/app/Http/Middleware/SetLocale.php
+++ b/app/Http/Middleware/SetLocale.php
@@ -25,9 +25,12 @@ class SetLocale
 
     private function resolve(Request $request): string
     {
-        $session = $request->session()->get('locale');
-        if ($session && in_array($session, self::SUPPORTED, true)) {
-            return $session;
+        // Session may not be started yet on early-stage middleware paths.
+        if ($request->hasSession()) {
+            $session = $request->session()->get('locale');
+            if ($session && in_array($session, self::SUPPORTED, true)) {
+                return $session;
+            }
         }
 
         $user = Auth::user();
diff --git a/app/Providers/Filament/TenantPanelProvider.php b/app/Providers/Filament/TenantPanelProvider.php
index 374d66d..5c98b27 100644
--- a/app/Providers/Filament/TenantPanelProvider.php
+++ b/app/Providers/Filament/TenantPanelProvider.php
@@ -61,10 +61,10 @@ class TenantPanelProvider extends PanelProvider
                 // unauthenticated → endless redirect to /app/login.
                 ResolveTenant::class,
                 CheckTenantStatus::class,
-                \App\Http\Middleware\SetLocale::class,
                 EncryptCookies::class,
                 AddQueuedCookiesToResponse::class,
                 StartSession::class,
+                \App\Http\Middleware\SetLocale::class,
                 AuthenticateSession::class,
                 ShareErrorsFromSession::class,
                 VerifyCsrfToken::class,